From 414a60fffc3cfd2a0965bbb0ceeba95349b65de0 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 31 Aug 2016 16:23:19 +0200
Subject: [PATCH] Moving the reactor API to the separate project. Switch to
 java_stub models for the reactor api.

---
 build.xml                                     |   12 +
 .../generator/template/main@generator.mps     |    6 +-
 .../lang/typesystem2/samplechecker/runner.mps |  102 +-
 .../typesystem2/sampleplugin/jchr/plugin.mps  |  196 +-
 .../jetbrains/mps/logic/jchr/predicate.mps    |  200 +-
 .../jetbrains/mps/logic/jchr/program.mps      |  128 +-
 .../generator/template/main@generator.mps     |   28 +-
 .../jetbrains.mps.logic.mpl                   |    2 -
 .../languageModels/intentions.mps             |  163 +-
 .../languageModels/typesystem.mps             |   14 +-
 .../models/jetbrains/mps/logic/builtin.mps    |  110 +-
 .../jetbrains/mps/logic/builtin/predicate.mps |  132 +-
 .../jetbrains/mps/logic/builtin/program.mps   |  200 +-
 .../jetbrains/mps/logic/builtin/solver.mps    |  438 ++--
 .../mps/logic/builtin/unification.mps         |   50 +-
 .../jetbrains.mps.logic.reactor.msd           |    4 +-
 .../mps/logic/reactor/evaluation.mps          | 2040 -----------------
 .../jetbrains/mps/logic/reactor/logical.mps   | 1138 ---------
 .../jetbrains/mps/logic/reactor/program.mps   | 1348 -----------
 .../mps/logic/test/logical@tests.mps          |   60 +-
 .../jetbrains/mps/logic/test/unification.mps  |   70 +-
 .../mps/logic/test/unification@tests.mps      |  330 +--
 test.xml                                      |   17 +
 .../models/types.mps                          |   10 +-
 .../lang/typesystem2/samplechecker/build.mps  |   54 +-
 .../samplechecker/handle/test/util@tests.mps  |  106 +-
 .../typesystem2/samplechecker/handle/util.mps |   62 +-
 .../lang/typesystem2/sampleplugin/plugin.mps  |  736 +++---
 .../generator/template/main@generator.mps     |   86 +-
 .../jetbrains.mps.lang.typesystem2.mpl        |    3 -
 .../languageModels/behavior.mps               |    2 +-
 .../languageModels/intentions.mps             |  148 +-
 .../mps/lang/typesystem2/generation.mps       |   10 +-
 .../mps/lang/typesystem2/program.mps          |  168 +-
 .../mps/lang/typesystem2/template.mps         |   12 +-
 35 files changed, 1849 insertions(+), 6336 deletions(-)
 delete mode 100644 logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/evaluation.mps
 delete mode 100644 logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/logical.mps
 delete mode 100644 logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/program.mps

diff --git a/build.xml b/build.xml
index cef46e0a..4e2746a8 100644
--- a/build.xml
+++ b/build.xml
@@ -368,6 +368,7 @@
         <library jar="../lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <library jar="../lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <library jar="../lib/unification-lib-1.0.2.jar" />
+        <library jar="../lib/memreactor-api-0.1.jar" />
         <sources jar="jetbrains.mps.logic.reactor-src.jar" descriptor="jetbrains.mps.logic.reactor.msd" />
       </module>
     </echoxml>
@@ -556,6 +557,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -610,6 +612,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -657,6 +660,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -695,6 +699,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -744,6 +749,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -811,6 +817,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -865,6 +872,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -917,6 +925,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -967,6 +976,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1026,6 +1036,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1074,6 +1085,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
diff --git a/jchr/languages/jetbrains.mps.logic_jchr/generator/template/main@generator.mps b/jchr/languages/jetbrains.mps.logic_jchr/generator/template/main@generator.mps
index 90dae224..bc6890e0 100644
--- a/jchr/languages/jetbrains.mps.logic_jchr/generator/template/main@generator.mps
+++ b/jchr/languages/jetbrains.mps.logic_jchr/generator/template/main@generator.mps
@@ -23,7 +23,7 @@
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
   </imports>
   <registry>
@@ -674,7 +674,7 @@
               <ref role="37wK5l" to="yg8f:7HUwyZb7chj" resolve="asTreeForm" />
               <node concept="2ShNRf" id="7nPD14NOHH4" role="37wK5m">
                 <node concept="1pGfFk" id="7nPD14NOHH5" role="2ShVmc">
-                  <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
+                  <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.Class)" resolve="MetaLogical" />
                   <node concept="3VsKOn" id="2Dg5bSg3QiY" role="37wK5m">
                     <ref role="3VsUkX" to="wyt6:~String" resolve="String" />
                   </node>
@@ -689,7 +689,7 @@
             <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
             <node concept="2ShNRf" id="2Dg5bSg3RdY" role="37wK5m">
               <node concept="1pGfFk" id="2Dg5bSg3RdZ" role="2ShVmc">
-                <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
+                <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.Class)" resolve="MetaLogical" />
                 <node concept="3VsKOn" id="2Dg5bSg3Rjh" role="37wK5m">
                   <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
diff --git a/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
index 70a230f3..d7ee2ec0 100644
--- a/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
+++ b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
@@ -15,9 +15,9 @@
     <import index="stuq" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime.debug.graphical(jetbrains.mps.jchr.runtime/)" />
     <import index="iawt" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime.debug(jetbrains.mps.jchr.runtime/)" />
     <import index="q7tw" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:org.apache.log4j(MPS.Core/)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
-    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
-    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
+    <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="95zw" ref="r:f3ff7852-b9dd-4760-b213-a8a031c77d0e(jetbrains.mps.logic.jchr.predicate)" />
     <import index="stgg" ref="r:fcdb37a4-4602-4a05-8d91-e439430734b8(jetbrains.mps.logic.jchr.program)" />
     <import index="poio" ref="r:023e4571-f779-4131-9ae1-88b3dd330e93(jetbrains.mps.lang.typesystem2.samplechecker.util)" />
@@ -259,7 +259,7 @@
       <node concept="3Tm1VV" id="5mr7UHcbl_B" role="1B3o_S" />
       <node concept="10Q1$e" id="5mr7UHcbnc4" role="1tU5fm">
         <node concept="3uibUv" id="5mr7UHcbq0Z" role="10Q1$1">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
         </node>
       </node>
       <node concept="2ShNRf" id="5mr7UHcbowK" role="33vP2m">
@@ -285,23 +285,23 @@
             <ref role="3cqZAo" to="cxk7:5uFPQ7C279$" resolve="FREE_SYM" />
           </node>
           <node concept="10M0yZ" id="1ggxSI7vXEc" role="3g7hyw">
-            <ref role="3cqZAo" to="rchb:1ggxSI7vUYU" resolve="EXPRESSION0" />
-            <ref role="1PxDUh" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+            <ref role="1PxDUh" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
+            <ref role="3cqZAo" to="av0y:~JavaPredicateSymbol.EXPRESSION0" resolve="EXPRESSION0" />
           </node>
           <node concept="10M0yZ" id="1ggxSI7vXSW" role="3g7hyw">
-            <ref role="3cqZAo" to="rchb:1ggxSI7vV1O" resolve="EXPRESSION1" />
-            <ref role="1PxDUh" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+            <ref role="1PxDUh" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
+            <ref role="3cqZAo" to="av0y:~JavaPredicateSymbol.EXPRESSION1" resolve="EXPRESSION1" />
           </node>
           <node concept="10M0yZ" id="1ggxSI7vY7W" role="3g7hyw">
-            <ref role="3cqZAo" to="rchb:1ggxSI7vV3x" resolve="EXPRESSION2" />
-            <ref role="1PxDUh" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+            <ref role="1PxDUh" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
+            <ref role="3cqZAo" to="av0y:~JavaPredicateSymbol.EXPRESSION2" resolve="EXPRESSION2" />
           </node>
           <node concept="10M0yZ" id="1ggxSI7vYn6" role="3g7hyw">
-            <ref role="3cqZAo" to="rchb:1ggxSI7vV5$" resolve="EXPRESSION3" />
-            <ref role="1PxDUh" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+            <ref role="1PxDUh" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
+            <ref role="3cqZAo" to="av0y:~JavaPredicateSymbol.EXPRESSION3" resolve="EXPRESSION3" />
           </node>
           <node concept="3uibUv" id="5mr7UHcbqo2" role="3g7fb8">
-            <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+            <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
           </node>
         </node>
       </node>
@@ -472,7 +472,7 @@
           <node concept="3cpWsn" id="7FFmDVAIsS6" role="3cpWs9">
             <property role="TrG5h" value="sessionSolver" />
             <node concept="3uibUv" id="7FFmDVAIt1W" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+              <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
             </node>
             <node concept="2ShNRf" id="7FFmDVAIsS7" role="33vP2m">
               <node concept="1pGfFk" id="7FFmDVAIsS8" role="2ShVmc">
@@ -495,14 +495,14 @@
           <node concept="3cpWsn" id="5mr7UHcbsDS" role="3cpWs9">
             <property role="TrG5h" value="evaluationSession" />
             <node concept="3uibUv" id="5mr7UHcbsDe" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+              <ref role="3uigEE" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
             </node>
             <node concept="2OqwBi" id="5mr7UHcbsDT" role="33vP2m">
               <node concept="2OqwBi" id="5mr7UHcbsDV" role="2Oq$k0">
                 <node concept="2OqwBi" id="5mr7UHcbsDW" role="2Oq$k0">
                   <node concept="2YIFZM" id="5mr7UHcbsDX" role="2Oq$k0">
-                    <ref role="37wK5l" to="qrld:7ISVfSIwfH" resolve="newSession" />
-                    <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+                    <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                    <ref role="37wK5l" to="w7la:~EvaluationSession.newSession(jetbrains.mps.logic.reactor.program.Program):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="newSession" />
                     <node concept="2ShNRf" id="7FFmDVAI9Ky" role="37wK5m">
                       <node concept="1pGfFk" id="7FFmDVAIa8C" role="2ShVmc">
                         <ref role="37wK5l" node="7FFmDVAI8Mx" resolve="MockProgram" />
@@ -513,7 +513,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="5mr7UHcbsDY" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:5mr7UHcbbR2" resolve="withParam" />
+                    <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withParam(java.lang.String,java.lang.Object):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withParam" />
                     <node concept="Xl_RD" id="5mr7UHcbsDZ" role="37wK5m">
                       <property role="Xl_RC" value="jchr.handler.class" />
                     </node>
@@ -523,14 +523,14 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mr7UHcbsE1" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwu9Q" resolve="withPredicates" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withPredicates(jetbrains.mps.logic.reactor.program.PredicateSymbol...):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withPredicates" />
                   <node concept="37vLTw" id="5mr7UHcdeDp" role="37wK5m">
                     <ref role="3cqZAo" node="5mr7UHcbnci" resolve="PREDICATE_SYMBOLS" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="5mr7UHcbsE5" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:2UGjFq4L12E" resolve="start" />
+                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.start(jetbrains.mps.logic.reactor.evaluation.SessionSolver):jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="start" />
                 <node concept="10Nm6u" id="2UGjFq4LaeM" role="37wK5m" />
               </node>
             </node>
@@ -561,7 +561,7 @@
           <node concept="3cpWsn" id="5mr7UHcdjPO" role="1Duv9x">
             <property role="TrG5h" value="co" />
             <node concept="3uibUv" id="5mr7UHcdk5B" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+              <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
             </node>
           </node>
           <node concept="2OqwBi" id="5mr7UHcdkj8" role="1DdaDG">
@@ -569,7 +569,7 @@
               <ref role="3cqZAo" node="5mr7UHcbsDS" resolve="evaluationSession" />
             </node>
             <node concept="liA8E" id="5mr7UHcdksH" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:5uFPQ7BvQxv" resolve="constraintOccurrences" />
+              <ref role="37wK5l" to="w7la:~EvaluationSession.constraintOccurrences():java.lang.Iterable" resolve="constraintOccurrences" />
             </node>
           </node>
         </node>
@@ -738,7 +738,7 @@
       <node concept="37vLTG" id="1H8E3iB4zRr" role="3clF46">
         <property role="TrG5h" value="cocc" />
         <node concept="3uibUv" id="5mr7UHcdeYc" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3clFbS" id="1H8E3iB4zQI" role="3clF47">
@@ -769,11 +769,11 @@
                       <ref role="3cqZAo" node="1H8E3iB4zRr" resolve="cocc" />
                     </node>
                     <node concept="liA8E" id="5mr7UHcdfz7" role="2OqNvi">
-                      <ref role="37wK5l" to="qrld:5uFPQ7BZacZ" resolve="constraint" />
+                      <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint():jetbrains.mps.logic.reactor.program.Constraint" resolve="constraint" />
                     </node>
                   </node>
                   <node concept="liA8E" id="5mr7UHcdfCa" role="2OqNvi">
-                    <ref role="37wK5l" to="rchb:5uFPQ7B_aTC" resolve="symbol" />
+                    <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
                   </node>
                 </node>
               </node>
@@ -799,7 +799,7 @@
                 <ref role="3cqZAo" node="1H8E3iB4zRr" resolve="cocc" />
               </node>
               <node concept="liA8E" id="5mr7UHcdg1L" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:5uFPQ7BZafw" resolve="arguments" />
+                <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments():java.util.List" resolve="arguments" />
               </node>
             </node>
           </node>
@@ -881,8 +881,8 @@
                     <node concept="2OqwBi" id="4ef1vBgB5Ox" role="37vLTx">
                       <node concept="1eOMI4" id="4ef1vBgB5In" role="2Oq$k0">
                         <node concept="10QFUN" id="4ef1vBgB5Ik" role="1eOMHV">
-                          <node concept="3uibUv" id="4ef1vBgB5JC" role="10QFUM">
-                            <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                          <node concept="3uibUv" id="1HG00HG2a0B" role="10QFUM">
+                            <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                           </node>
                           <node concept="37vLTw" id="4ef1vBgB5L8" role="10QFUP">
                             <ref role="3cqZAo" node="4ef1vBgAG$q" resolve="arg" />
@@ -890,7 +890,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="4ef1vBgB5Uu" role="2OqNvi">
-                        <ref role="37wK5l" to="45ys:677NV56hh2k" resolve="name" />
+                        <ref role="37wK5l" to="bj13:~Logical.name():java.lang.String" resolve="name" />
                       </node>
                     </node>
                     <node concept="37vLTw" id="4ef1vBgB5MV" role="37vLTJ">
@@ -904,8 +904,8 @@
                       <node concept="2OqwBi" id="4ef1vBgAHIc" role="2Oq$k0">
                         <node concept="1eOMI4" id="4ef1vBgAHGw" role="2Oq$k0">
                           <node concept="10QFUN" id="4ef1vBgAHGt" role="1eOMHV">
-                            <node concept="3uibUv" id="4ef1vBgAHGy" role="10QFUM">
-                              <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                            <node concept="3uibUv" id="1HG00HG2a2y" role="10QFUM">
+                              <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                             </node>
                             <node concept="37vLTw" id="4ef1vBgAHGz" role="10QFUP">
                               <ref role="3cqZAo" node="4ef1vBgAG$q" resolve="arg" />
@@ -913,11 +913,11 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="4ef1vBgAQ$R" role="2OqNvi">
-                          <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                          <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                         </node>
                       </node>
                       <node concept="liA8E" id="4ef1vBgB1UB" role="2OqNvi">
-                        <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                        <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
                       </node>
                     </node>
                     <node concept="37vLTw" id="4ef1vBgB8Nk" role="37vLTJ">
@@ -927,8 +927,8 @@
                 </node>
               </node>
               <node concept="2ZW3vV" id="4ef1vBgAH_X" role="3clFbw">
-                <node concept="3uibUv" id="2s5CcPapNE_" role="2ZW6by">
-                  <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <node concept="3uibUv" id="1HG00HG1PjR" role="2ZW6by">
+                  <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 </node>
                 <node concept="37vLTw" id="4ef1vBgAHxE" role="2ZW6bz">
                   <ref role="3cqZAo" node="4ef1vBgAG$q" resolve="arg" />
@@ -1328,7 +1328,7 @@
                 <node concept="3cpWsn" id="3gJBs5s_7If" role="3cpWs9">
                   <property role="TrG5h" value="logical" />
                   <node concept="3uibUv" id="3gJBs5s_7I4" role="1tU5fm">
-                    <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                    <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                     <node concept="3qTvmN" id="3gJBs5s_7I7" role="11_B2D" />
                   </node>
                   <node concept="2OqwBi" id="5kEUewdDk6_" role="33vP2m">
@@ -1336,7 +1336,7 @@
                       <node concept="1eOMI4" id="3gJBs5s_7Ih" role="2Oq$k0">
                         <node concept="10QFUN" id="3gJBs5s_7Ii" role="1eOMHV">
                           <node concept="3uibUv" id="3gJBs5s_7Ij" role="10QFUM">
-                            <ref role="3uigEE" to="45ys:46l0wJhtOD_" resolve="LogicalOwner" />
+                            <ref role="3uigEE" to="bj13:~LogicalOwner" resolve="LogicalOwner" />
                           </node>
                           <node concept="37vLTw" id="3gJBs5s_7Ik" role="10QFUP">
                             <ref role="3cqZAo" node="3gJBs5s_6z0" resolve="variable" />
@@ -1344,11 +1344,11 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="3gJBs5s_7Il" role="2OqNvi">
-                        <ref role="37wK5l" to="45ys:46l0wJhtXlr" resolve="logical" />
+                        <ref role="37wK5l" to="bj13:~LogicalOwner.logical():jetbrains.mps.logic.reactor.logical.Logical" resolve="logical" />
                       </node>
                     </node>
                     <node concept="liA8E" id="5kEUewdDkka" role="2OqNvi">
-                      <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                      <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                     </node>
                   </node>
                 </node>
@@ -1371,7 +1371,7 @@
                             <ref role="3cqZAo" node="3gJBs5s_7If" resolve="logical" />
                           </node>
                           <node concept="liA8E" id="5kEUewdDoh_" role="2OqNvi">
-                            <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                            <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
                           </node>
                         </node>
                       </node>
@@ -1393,7 +1393,7 @@
             </node>
             <node concept="2ZW3vV" id="3gJBs5s_6UT" role="3clFbw">
               <node concept="3uibUv" id="3gJBs5s_78A" role="2ZW6by">
-                <ref role="3uigEE" to="45ys:46l0wJhtOD_" resolve="LogicalOwner" />
+                <ref role="3uigEE" to="bj13:~LogicalOwner" resolve="LogicalOwner" />
               </node>
               <node concept="37vLTw" id="3gJBs5s_6FT" role="2ZW6bz">
                 <ref role="3cqZAo" node="3gJBs5s_6z0" resolve="variable" />
@@ -1436,7 +1436,7 @@
     <property role="TrG5h" value="MockProgram" />
     <node concept="3Tm1VV" id="7FFmDVAI5jt" role="1B3o_S" />
     <node concept="3uibUv" id="7FFmDVAI5rF" role="1zkMxy">
-      <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+      <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
     </node>
     <node concept="2tJIrI" id="7FFmDVAI8rr" role="jymVt" />
     <node concept="3clFbW" id="7FFmDVAI8Mx" role="jymVt">
@@ -1460,7 +1460,7 @@
       <node concept="37vLTG" id="7FFmDVAI8TK" role="3clF46">
         <property role="TrG5h" value="sessionSolver" />
         <node concept="3uibUv" id="7FFmDVAI8TJ" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
       </node>
     </node>
@@ -1485,7 +1485,7 @@
       <property role="2aFKle" value="false" />
       <node concept="3Tm1VV" id="7FFmDVAI5vF" role="1B3o_S" />
       <node concept="3uibUv" id="7FFmDVAI5vG" role="3clF45">
-        <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
       </node>
       <node concept="3clFbS" id="7FFmDVAI5vH" role="3clF47">
         <node concept="3clFbF" id="7FFmDVAI9ba" role="3cqZAp">
@@ -1501,7 +1501,7 @@
       <node concept="3uibUv" id="7FFmDVAI5vL" role="3clF45">
         <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
         <node concept="3uibUv" id="7FFmDVAI5vM" role="11_B2D">
-          <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
         </node>
       </node>
       <node concept="3Tm1VV" id="7FFmDVAI5vN" role="1B3o_S" />
@@ -1517,7 +1517,7 @@
       <node concept="37vLTG" id="7FFmDVAI5vT" role="3clF46">
         <property role="TrG5h" value="constraintSymbol" />
         <node concept="3uibUv" id="7FFmDVAI5vU" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
         </node>
       </node>
       <node concept="3uibUv" id="7FFmDVAI5vV" role="3clF45">
@@ -1540,7 +1540,7 @@
       <node concept="3uibUv" id="7FFmDVAI5w4" role="3clF45">
         <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
         <node concept="3uibUv" id="7FFmDVAI5w5" role="11_B2D">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
         </node>
       </node>
       <node concept="3Tm1VV" id="7FFmDVAI5w6" role="1B3o_S" />
@@ -1556,7 +1556,7 @@
       <node concept="3uibUv" id="7FFmDVAI5wn" role="3clF45">
         <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
         <node concept="3uibUv" id="7FFmDVAI5wo" role="11_B2D">
-          <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
         </node>
       </node>
       <node concept="3Tm1VV" id="7FFmDVAI5wp" role="1B3o_S" />
@@ -1572,13 +1572,13 @@
       <node concept="37vLTG" id="7FFmDVAI5wv" role="3clF46">
         <property role="TrG5h" value="rule" />
         <node concept="3uibUv" id="7FFmDVAI5ww" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
         </node>
       </node>
       <node concept="3cqZAl" id="7FFmDVAI5wx" role="3clF45" />
       <node concept="3Tm1VV" id="7FFmDVAI5wy" role="1B3o_S" />
       <node concept="3uibUv" id="7FFmDVAI5w$" role="Sfmx6">
-        <ref role="3uigEE" to="rchb:7Oc59RS$wKP" resolve="InvalidRuleException" />
+        <ref role="3uigEE" to="av0y:~InvalidRuleException" resolve="InvalidRuleException" />
       </node>
       <node concept="3clFbS" id="7FFmDVAI5w_" role="3clF47" />
     </node>
@@ -1586,7 +1586,7 @@
       <property role="TrG5h" value="sessionSolver" />
       <node concept="3Tm6S6" id="7FFmDVAI923" role="1B3o_S" />
       <node concept="3uibUv" id="7FFmDVAI925" role="1tU5fm">
-        <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
       </node>
     </node>
   </node>
diff --git a/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/models/jetbrains/mps/lang/typesystem2/sampleplugin/jchr/plugin.mps b/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/models/jetbrains/mps/lang/typesystem2/sampleplugin/jchr/plugin.mps
index 6ebcb839..9b9c6e6f 100644
--- a/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/models/jetbrains/mps/lang/typesystem2/sampleplugin/jchr/plugin.mps
+++ b/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/models/jetbrains/mps/lang/typesystem2/sampleplugin/jchr/plugin.mps
@@ -22,14 +22,14 @@
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="vgt0" ref="r:f36c95e5-e428-4945-91ae-1005e20c7971(jetbrains.mps.jchr.structure)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
-    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
-    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
+    <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.builtin.program)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="eifs" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime(jetbrains.mps.jchr.runtime/)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
@@ -2512,13 +2512,13 @@
       <node concept="37vLTG" id="78CwJJcTKEU" role="3clF46">
         <property role="TrG5h" value="program" />
         <node concept="3uibUv" id="78CwJJcTKEV" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+          <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
         </node>
       </node>
       <node concept="37vLTG" id="2UGjFq4PcMy" role="3clF46">
         <property role="TrG5h" value="sessionSolver" />
         <node concept="3uibUv" id="2UGjFq4PgJD" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
       </node>
       <node concept="3cqZAl" id="ZqZbw4Qjv9" role="3clF45" />
@@ -2843,7 +2843,7 @@
                     <ref role="3cqZAo" node="ZqZbw4S7uo" resolve="sym" />
                   </node>
                   <node concept="liA8E" id="3ec9Qj4PhBb" role="2OqNvi">
-                    <ref role="37wK5l" to="rchb:54i3FxcZMvt" resolve="id" />
+                    <ref role="37wK5l" to="av0y:~Symbol.id():java.lang.String" resolve="id" />
                   </node>
                 </node>
               </node>
@@ -2976,7 +2976,7 @@
           <node concept="3cpWsn" id="ZqZbw4S7uo" role="1Duv9x">
             <property role="TrG5h" value="sym" />
             <node concept="3uibUv" id="30XHGaP5aIv" role="1tU5fm">
-              <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+              <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
             </node>
           </node>
           <node concept="2OqwBi" id="ZqZbw4S7ut" role="1DdaDG">
@@ -3013,8 +3013,8 @@
               <node concept="3uibUv" id="1ggxSI7pkBn" role="2hN53Y">
                 <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
                 <node concept="3qUE_q" id="1ggxSI7pkHz" role="11_B2D">
-                  <node concept="3uibUv" id="1ggxSI7pkJn" role="3qUE_r">
-                    <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+                  <node concept="3uibUv" id="1HG00HG2yZw" role="3qUE_r">
+                    <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
                   </node>
                 </node>
               </node>
@@ -3024,8 +3024,8 @@
                 <node concept="3uibUv" id="1ggxSI7pkS8" role="HW$YZ">
                   <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
                   <node concept="3qUE_q" id="1ggxSI7pkS9" role="11_B2D">
-                    <node concept="3uibUv" id="1ggxSI7pkSa" role="3qUE_r">
-                      <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+                    <node concept="3uibUv" id="1HG00HG2zfA" role="3qUE_r">
+                      <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
                     </node>
                   </node>
                 </node>
@@ -3043,8 +3043,8 @@
                 <node concept="3uibUv" id="78CwJJcPfJc" role="1tU5fm">
                   <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
                   <node concept="3qUE_q" id="78CwJJcPfJj" role="11_B2D">
-                    <node concept="3uibUv" id="78CwJJcPfJk" role="3qUE_r">
-                      <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+                    <node concept="3uibUv" id="1HG00HG2zrV" role="3qUE_r">
+                      <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
                     </node>
                   </node>
                 </node>
@@ -3053,7 +3053,7 @@
                     <ref role="3cqZAo" node="2UGjFq4PgJO" resolve="sessionSolver" />
                   </node>
                   <node concept="liA8E" id="78CwJJcPfJB" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:2tcGHBEqJAf" resolve="solverClass" />
+                    <ref role="37wK5l" to="w7la:~SessionSolver.solverClass(jetbrains.mps.logic.reactor.program.PredicateSymbol):java.lang.Class" resolve="solverClass" />
                     <node concept="37vLTw" id="78CwJJcXv6d" role="37wK5m">
                       <ref role="3cqZAo" node="2pvEdquv_2Y" resolve="predicateSymbol" />
                     </node>
@@ -3262,7 +3262,7 @@
           <node concept="3cpWsn" id="2pvEdquv_2Y" role="1Duv9x">
             <property role="TrG5h" value="predicateSymbol" />
             <node concept="3uibUv" id="78CwJJcPeEl" role="1tU5fm">
-              <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+              <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
             </node>
           </node>
           <node concept="2OqwBi" id="2pvEdquv_33" role="1DdaDG">
@@ -3400,7 +3400,7 @@
                     <ref role="3cqZAo" node="aFQeb4k98f" resolve="metaLogical" />
                   </node>
                   <node concept="liA8E" id="7HUwyZaOBB1" role="2OqNvi">
-                    <ref role="37wK5l" to="45ys:7HUwyZaC3Q7" resolve="type" />
+                    <ref role="37wK5l" to="bj13:~MetaLogical.type():java.lang.Class" resolve="type" />
                   </node>
                 </node>
               </node>
@@ -3637,7 +3637,7 @@
           <node concept="3cpWsn" id="aFQeb4k98f" role="1Duv9x">
             <property role="TrG5h" value="metaLogical" />
             <node concept="3uibUv" id="7nPD14NOVLc" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+              <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
             </node>
           </node>
           <node concept="2OqwBi" id="aFQeb4k98k" role="1DdaDG">
@@ -3686,8 +3686,8 @@
               <node concept="3cpWsn" id="4sVJFklIUce" role="3cpWs9">
                 <property role="TrG5h" value="headKept" />
                 <node concept="A3Dl8" id="4sVJFklIUcf" role="1tU5fm">
-                  <node concept="3uibUv" id="5uFPQ7BM3er" role="A3Ik2">
-                    <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+                  <node concept="3uibUv" id="1HG00HG2FmW" role="A3Ik2">
+                    <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
                   </node>
                 </node>
                 <node concept="2OqwBi" id="4sVJFklIUch" role="33vP2m">
@@ -3695,7 +3695,7 @@
                     <ref role="3cqZAo" node="4sVJFklIUd2" resolve="rule" />
                   </node>
                   <node concept="liA8E" id="4sVJFklIUcj" role="2OqNvi">
-                    <ref role="37wK5l" to="rchb:7eGEHDlc$9D" resolve="headKept" />
+                    <ref role="37wK5l" to="av0y:~Rule.headKept():java.lang.Iterable" resolve="headKept" />
                   </node>
                 </node>
               </node>
@@ -3704,8 +3704,8 @@
               <node concept="3cpWsn" id="4sVJFklIUcl" role="3cpWs9">
                 <property role="TrG5h" value="headReplaced" />
                 <node concept="A3Dl8" id="4sVJFklIUcm" role="1tU5fm">
-                  <node concept="3uibUv" id="5uFPQ7BM3h5" role="A3Ik2">
-                    <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+                  <node concept="3uibUv" id="1HG00HG2Ftg" role="A3Ik2">
+                    <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
                   </node>
                 </node>
                 <node concept="2OqwBi" id="4sVJFklIUco" role="33vP2m">
@@ -3713,7 +3713,7 @@
                     <ref role="3cqZAo" node="4sVJFklIUd2" resolve="rule" />
                   </node>
                   <node concept="liA8E" id="4sVJFklIUcq" role="2OqNvi">
-                    <ref role="37wK5l" to="rchb:7eGEHDlc$9J" resolve="headReplaced" />
+                    <ref role="37wK5l" to="av0y:~Rule.headReplaced():java.lang.Iterable" resolve="headReplaced" />
                   </node>
                 </node>
               </node>
@@ -3923,7 +3923,7 @@
                   <node concept="3cpWsn" id="16gGH0V$_vo" role="1Duv9x">
                     <property role="TrG5h" value="pred" />
                     <node concept="3uibUv" id="5uFPQ7BM3k9" role="1tU5fm">
-                      <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+                      <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
                     </node>
                   </node>
                   <node concept="2OqwBi" id="16gGH0V$_vt" role="1DdaDG">
@@ -3931,7 +3931,7 @@
                       <ref role="3cqZAo" node="4sVJFklIUd2" resolve="rule" />
                     </node>
                     <node concept="liA8E" id="16gGH0V$_vv" role="2OqNvi">
-                      <ref role="37wK5l" to="rchb:7eGEHDlc$9P" resolve="guard" />
+                      <ref role="37wK5l" to="av0y:~Rule.guard():java.lang.Iterable" resolve="guard" />
                     </node>
                   </node>
                 </node>
@@ -3943,7 +3943,7 @@
                       <ref role="3cqZAo" node="4sVJFklIUd2" resolve="rule" />
                     </node>
                     <node concept="liA8E" id="2q_78a8nn6t" role="2OqNvi">
-                      <ref role="37wK5l" to="rchb:7eGEHDlc$9P" resolve="guard" />
+                      <ref role="37wK5l" to="av0y:~Rule.guard():java.lang.Iterable" resolve="guard" />
                     </node>
                   </node>
                   <node concept="liA8E" id="2q_78a8nrHi" role="2OqNvi">
@@ -3997,8 +3997,8 @@
                               <ref role="3cqZAo" node="6z_Bjup8UzB" resolve="targetModel" />
                             </node>
                             <node concept="10QFUN" id="5uFPQ7BRI3O" role="37wK5m">
-                              <node concept="3uibUv" id="5uFPQ7BRI3M" role="10QFUM">
-                                <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+                              <node concept="3uibUv" id="1HG00HG2FBr" role="10QFUM">
+                                <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
                               </node>
                               <node concept="37vLTw" id="5uFPQ7BRI3N" role="10QFUP">
                                 <ref role="3cqZAo" node="16gGH0V$Cdl" resolve="item" />
@@ -4022,8 +4022,8 @@
                     <node concept="3clFbH" id="5uFPQ7BRHp0" role="3cqZAp" />
                   </node>
                   <node concept="2ZW3vV" id="5uFPQ7BRHEL" role="3clFbw">
-                    <node concept="3uibUv" id="5uFPQ7BRHI1" role="2ZW6by">
-                      <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+                    <node concept="3uibUv" id="1HG00HG2Fz$" role="2ZW6by">
+                      <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
                     </node>
                     <node concept="37vLTw" id="5uFPQ7BRHxK" role="2ZW6bz">
                       <ref role="3cqZAo" node="16gGH0V$Cdl" resolve="item" />
@@ -4032,7 +4032,7 @@
                   <node concept="3eNFk2" id="5uFPQ7BRIpy" role="3eNLev">
                     <node concept="2ZW3vV" id="5uFPQ7BRIHl" role="3eO9$A">
                       <node concept="3uibUv" id="5uFPQ7BRIJA" role="2ZW6by">
-                        <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+                        <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
                       </node>
                       <node concept="37vLTw" id="5uFPQ7BRICN" role="2ZW6bz">
                         <ref role="3cqZAo" node="16gGH0V$Cdl" resolve="item" />
@@ -4057,7 +4057,7 @@
                               </node>
                               <node concept="10QFUN" id="5uFPQ7BRIbj" role="37wK5m">
                                 <node concept="3uibUv" id="5uFPQ7BRJ9y" role="10QFUM">
-                                  <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+                                  <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
                                 </node>
                                 <node concept="37vLTw" id="5uFPQ7BRIbl" role="10QFUP">
                                   <ref role="3cqZAo" node="16gGH0V$Cdl" resolve="item" />
@@ -4105,7 +4105,7 @@
               <node concept="3cpWsn" id="16gGH0V$Cdl" role="1Duv9x">
                 <property role="TrG5h" value="item" />
                 <node concept="3uibUv" id="5uFPQ7BRGWO" role="1tU5fm">
-                  <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+                  <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
                 </node>
               </node>
               <node concept="2OqwBi" id="16gGH0V$Cdq" role="1DdaDG">
@@ -4113,7 +4113,7 @@
                   <ref role="3cqZAo" node="4sVJFklIUd2" resolve="rule" />
                 </node>
                 <node concept="liA8E" id="16gGH0V$Cds" role="2OqNvi">
-                  <ref role="37wK5l" to="rchb:7eGEHDlc$9V" resolve="body" />
+                  <ref role="37wK5l" to="av0y:~Rule.body():java.lang.Iterable" resolve="body" />
                 </node>
               </node>
             </node>
@@ -4121,7 +4121,7 @@
           <node concept="3cpWsn" id="4sVJFklIUd2" role="1Duv9x">
             <property role="TrG5h" value="rule" />
             <node concept="3uibUv" id="4sVJFklIUd3" role="1tU5fm">
-              <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+              <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
             </node>
           </node>
           <node concept="2OqwBi" id="4sVJFklIUd4" role="1DdaDG">
@@ -4151,7 +4151,7 @@
       <node concept="37vLTG" id="ZqZbw4R6WI" role="3clF46">
         <property role="TrG5h" value="rule" />
         <node concept="3uibUv" id="ZqZbw4R6WJ" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
         </node>
       </node>
       <node concept="37vLTG" id="2$F5Qpuv031" role="3clF46">
@@ -4193,7 +4193,7 @@
                 <ref role="3cqZAo" node="ZqZbw4R6WI" resolve="rule" />
               </node>
               <node concept="liA8E" id="6lpwCiZjVTV" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:6lpwCiZj$RR" resolve="tag" />
+                <ref role="37wK5l" to="av0y:~Rule.tag():java.lang.String" resolve="tag" />
               </node>
             </node>
             <node concept="2OqwBi" id="6lpwCiZiBo6" role="37vLTJ">
@@ -4275,8 +4275,8 @@
           </node>
           <node concept="3cpWsn" id="ZqZbw4Rtys" role="1Duv9x">
             <property role="TrG5h" value="cst" />
-            <node concept="3uibUv" id="5uFPQ7BRRhC" role="1tU5fm">
-              <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+            <node concept="3uibUv" id="1HG00HG2LF1" role="1tU5fm">
+              <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
             </node>
           </node>
           <node concept="2OqwBi" id="5dz6b540hpd" role="1DdaDG">
@@ -4284,7 +4284,7 @@
               <ref role="3cqZAo" node="ZqZbw4R6WI" resolve="rule" />
             </node>
             <node concept="liA8E" id="5dz6b540hpf" role="2OqNvi">
-              <ref role="37wK5l" to="rchb:7eGEHDlc$9D" resolve="headKept" />
+              <ref role="37wK5l" to="av0y:~Rule.headKept():java.lang.Iterable" resolve="headKept" />
             </node>
           </node>
         </node>
@@ -4319,8 +4319,8 @@
           </node>
           <node concept="3cpWsn" id="ZqZbw4Rryz" role="1Duv9x">
             <property role="TrG5h" value="cst" />
-            <node concept="3uibUv" id="5uFPQ7BRRqG" role="1tU5fm">
-              <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+            <node concept="3uibUv" id="1HG00HG2LKW" role="1tU5fm">
+              <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
             </node>
           </node>
           <node concept="2OqwBi" id="5dz6b540gPg" role="1DdaDG">
@@ -4328,7 +4328,7 @@
               <ref role="3cqZAo" node="ZqZbw4R6WI" resolve="rule" />
             </node>
             <node concept="liA8E" id="5dz6b540gPi" role="2OqNvi">
-              <ref role="37wK5l" to="rchb:7eGEHDlc$9J" resolve="headReplaced" />
+              <ref role="37wK5l" to="av0y:~Rule.headReplaced():java.lang.Iterable" resolve="headReplaced" />
             </node>
           </node>
         </node>
@@ -4356,7 +4356,7 @@
       <node concept="37vLTG" id="ZqZbw4R6yu" role="3clF46">
         <property role="TrG5h" value="rule" />
         <node concept="3uibUv" id="ZqZbw4R6Ap" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
         </node>
       </node>
       <node concept="37vLTG" id="2$F5Qpuv1vX" role="3clF46">
@@ -4398,7 +4398,7 @@
                 <ref role="3cqZAo" node="ZqZbw4R6yu" resolve="rule" />
               </node>
               <node concept="liA8E" id="6lpwCiZjWyM" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:6lpwCiZj$RR" resolve="tag" />
+                <ref role="37wK5l" to="av0y:~Rule.tag():java.lang.String" resolve="tag" />
               </node>
             </node>
             <node concept="2OqwBi" id="6lpwCiZjWyN" role="37vLTJ">
@@ -4461,8 +4461,8 @@
           </node>
           <node concept="3cpWsn" id="ZqZbw4RpXh" role="1Duv9x">
             <property role="TrG5h" value="cst" />
-            <node concept="3uibUv" id="5uFPQ7BRMy8" role="1tU5fm">
-              <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+            <node concept="3uibUv" id="1HG00HG2LQS" role="1tU5fm">
+              <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
             </node>
           </node>
           <node concept="2OqwBi" id="5dz6b540fmO" role="1DdaDG">
@@ -4470,7 +4470,7 @@
               <ref role="3cqZAo" node="ZqZbw4R6yu" resolve="rule" />
             </node>
             <node concept="liA8E" id="5dz6b540fmQ" role="2OqNvi">
-              <ref role="37wK5l" to="rchb:7eGEHDlc$9J" resolve="headReplaced" />
+              <ref role="37wK5l" to="av0y:~Rule.headReplaced():java.lang.Iterable" resolve="headReplaced" />
             </node>
           </node>
         </node>
@@ -4498,7 +4498,7 @@
       <node concept="37vLTG" id="ZqZbw4R6BG" role="3clF46">
         <property role="TrG5h" value="rule" />
         <node concept="3uibUv" id="ZqZbw4R6BH" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
         </node>
       </node>
       <node concept="37vLTG" id="2$F5Qpuv2v_" role="3clF46">
@@ -4540,7 +4540,7 @@
                 <ref role="3cqZAo" node="ZqZbw4R6BG" resolve="rule" />
               </node>
               <node concept="liA8E" id="6lpwCiZjXoM" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:6lpwCiZj$RR" resolve="tag" />
+                <ref role="37wK5l" to="av0y:~Rule.tag():java.lang.String" resolve="tag" />
               </node>
             </node>
             <node concept="2OqwBi" id="6lpwCiZjXoN" role="37vLTJ">
@@ -4603,8 +4603,8 @@
           </node>
           <node concept="3cpWsn" id="ZqZbw4RoTd" role="1Duv9x">
             <property role="TrG5h" value="cst" />
-            <node concept="3uibUv" id="5uFPQ7BRSjj" role="1tU5fm">
-              <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+            <node concept="3uibUv" id="1HG00HG2LWP" role="1tU5fm">
+              <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
             </node>
           </node>
           <node concept="2OqwBi" id="5dz6b540gaJ" role="1DdaDG">
@@ -4612,7 +4612,7 @@
               <ref role="3cqZAo" node="ZqZbw4R6BG" resolve="rule" />
             </node>
             <node concept="liA8E" id="5dz6b540gaL" role="2OqNvi">
-              <ref role="37wK5l" to="rchb:7eGEHDlc$9D" resolve="headKept" />
+              <ref role="37wK5l" to="av0y:~Rule.headKept():java.lang.Iterable" resolve="headKept" />
             </node>
           </node>
         </node>
@@ -4641,8 +4641,8 @@
       </node>
       <node concept="37vLTG" id="4sVJFklUH4P" role="3clF46">
         <property role="TrG5h" value="cst" />
-        <node concept="3uibUv" id="5uFPQ7BRMEa" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+        <node concept="3uibUv" id="1HG00HG2M2N" role="1tU5fm">
+          <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
         </node>
       </node>
       <node concept="37vLTG" id="2$F5Qpuu6te" role="3clF46">
@@ -4688,7 +4688,7 @@
                     <ref role="3cqZAo" node="4sVJFklUH4P" resolve="cst" />
                   </node>
                   <node concept="liA8E" id="4sVJFklUH4_" role="2OqNvi">
-                    <ref role="37wK5l" to="rchb:5uFPQ7B_aTC" resolve="symbol" />
+                    <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="4sVJFklUH4A" role="3ElQJh">
@@ -4730,7 +4730,7 @@
               <ref role="3cqZAo" node="4sVJFklUH4P" resolve="cst" />
             </node>
             <node concept="liA8E" id="4sVJFklUH4M" role="2OqNvi">
-              <ref role="37wK5l" to="rchb:5uFPQ7B_b06" resolve="arguments" />
+              <ref role="37wK5l" to="av0y:~AndItem.arguments():java.util.Collection" resolve="arguments" />
             </node>
           </node>
         </node>
@@ -4745,8 +4745,8 @@
       </node>
       <node concept="37vLTG" id="5uFPQ7BMco8" role="3clF46">
         <property role="TrG5h" value="cst" />
-        <node concept="3uibUv" id="5uFPQ7BMfYV" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+        <node concept="3uibUv" id="1HG00HG2Mvc" role="1tU5fm">
+          <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
         </node>
       </node>
       <node concept="37vLTG" id="5uFPQ7BMcoa" role="3clF46">
@@ -4805,7 +4805,7 @@
                     <ref role="3cqZAo" node="5uFPQ7BMco8" resolve="cst" />
                   </node>
                   <node concept="liA8E" id="5uFPQ7BMgkt" role="2OqNvi">
-                    <ref role="37wK5l" to="rchb:5uFPQ7B_aTC" resolve="symbol" />
+                    <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="5uFPQ7BMgku" role="3ElQJh">
@@ -4850,7 +4850,7 @@
               <ref role="3cqZAo" node="5uFPQ7BMco8" resolve="cst" />
             </node>
             <node concept="liA8E" id="5uFPQ7BMkL0" role="2OqNvi">
-              <ref role="37wK5l" to="rchb:5uFPQ7B_b06" resolve="arguments" />
+              <ref role="37wK5l" to="av0y:~AndItem.arguments():java.util.Collection" resolve="arguments" />
             </node>
           </node>
         </node>
@@ -4872,7 +4872,7 @@
       <node concept="37vLTG" id="5uFPQ7BMz7a" role="3clF46">
         <property role="TrG5h" value="pred" />
         <node concept="3uibUv" id="5uFPQ7BMzLm" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+          <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
         </node>
       </node>
       <node concept="37vLTG" id="5uFPQ7BMz7c" role="3clF46">
@@ -4911,7 +4911,7 @@
                     <ref role="3cqZAo" node="5uFPQ7BMz7a" resolve="pred" />
                   </node>
                   <node concept="liA8E" id="7K4Mb_JrlNm" role="2OqNvi">
-                    <ref role="37wK5l" to="rchb:5uFPQ7B_b06" resolve="arguments" />
+                    <ref role="37wK5l" to="av0y:~AndItem.arguments():java.util.Collection" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="3uibUv" id="7K4Mb_Jrykl" role="1pMfVU">
@@ -4991,7 +4991,7 @@
                     <ref role="37wK5l" to="nz6g:7HUwyZaPiEo" resolve="uniqueName" />
                     <node concept="10QFUN" id="7nPD14NO_v7" role="37wK5m">
                       <node concept="3uibUv" id="7nPD14NO_$5" role="10QFUM">
-                        <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                        <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                       </node>
                       <node concept="2OqwBi" id="7nPD14NO_v9" role="10QFUP">
                         <node concept="2OqwBi" id="7nPD14NO_va" role="2Oq$k0">
@@ -5084,11 +5084,11 @@
                                     <ref role="3cqZAo" node="5uFPQ7BMz7a" resolve="pred" />
                                   </node>
                                   <node concept="liA8E" id="5uFPQ7BM_qH" role="2OqNvi">
-                                    <ref role="37wK5l" to="rchb:6Kcfpq7Bjgi" resolve="symbol" />
+                                    <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="3ec9Qj4KItp" role="2OqNvi">
-                                  <ref role="37wK5l" to="rchb:54i3FxcZMvt" resolve="id" />
+                                  <ref role="37wK5l" to="av0y:~Symbol.id():java.lang.String" resolve="id" />
                                 </node>
                               </node>
                             </node>
@@ -5172,7 +5172,7 @@
                   <ref role="3cqZAo" node="5uFPQ7BMz7a" resolve="pred" />
                 </node>
                 <node concept="liA8E" id="5uFPQ7BM_0N" role="2OqNvi">
-                  <ref role="37wK5l" to="rchb:6Kcfpq7Bjgi" resolve="symbol" />
+                  <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
                 </node>
               </node>
             </node>
@@ -5182,7 +5182,7 @@
                   <ref role="3cqZAo" node="5uFPQ7BMz7a" resolve="pred" />
                 </node>
                 <node concept="liA8E" id="5uFPQ7BM$E5" role="2OqNvi">
-                  <ref role="37wK5l" to="rchb:6Kcfpq7Bjgi" resolve="symbol" />
+                  <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
                 </node>
               </node>
               <node concept="10M0yZ" id="5uFPQ7BM$Lq" role="3uHU7w">
@@ -5265,14 +5265,14 @@
             </node>
             <node concept="2ZW3vV" id="2KSgAgVcb7F" role="3eO9$A">
               <node concept="3uibUv" id="2KSgAgVcb7G" role="2ZW6by">
-                <ref role="3uigEE" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+                <ref role="3uigEE" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
               </node>
               <node concept="2OqwBi" id="2KSgAgVcb7H" role="2ZW6bz">
                 <node concept="37vLTw" id="2KSgAgVcb7I" role="2Oq$k0">
                   <ref role="3cqZAo" node="5uFPQ7BMz7a" resolve="pred" />
                 </node>
                 <node concept="liA8E" id="2KSgAgVcb7J" role="2OqNvi">
-                  <ref role="37wK5l" to="rchb:6Kcfpq7Bjgi" resolve="symbol" />
+                  <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
                 </node>
               </node>
             </node>
@@ -5314,13 +5314,13 @@
                           <ref role="3cqZAo" node="2UGjFq4PgJO" resolve="sessionSolver" />
                         </node>
                         <node concept="liA8E" id="7ISVfSJI4X" role="2OqNvi">
-                          <ref role="37wK5l" to="qrld:2tcGHBEqJAf" resolve="solverClass" />
+                          <ref role="37wK5l" to="w7la:~SessionSolver.solverClass(jetbrains.mps.logic.reactor.program.PredicateSymbol):java.lang.Class" resolve="solverClass" />
                           <node concept="2OqwBi" id="2tcGHBEqWsP" role="37wK5m">
                             <node concept="37vLTw" id="2tcGHBEqWlH" role="2Oq$k0">
                               <ref role="3cqZAo" node="5uFPQ7BMz7a" resolve="pred" />
                             </node>
                             <node concept="liA8E" id="2tcGHBEqW_3" role="2OqNvi">
-                              <ref role="37wK5l" to="rchb:6Kcfpq7Bjgi" resolve="symbol" />
+                              <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
                             </node>
                           </node>
                         </node>
@@ -5591,7 +5591,7 @@
                 <ref role="3cqZAo" node="4sVJFklUwdY" resolve="arg" />
               </node>
               <node concept="3uibUv" id="7HUwyZaNMPL" role="2ZW6by">
-                <ref role="3uigEE" to="45ys:7HUwyZaNIC5" resolve="MultiMetaLogical" />
+                <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
               </node>
             </node>
             <node concept="3clFbS" id="16gGH0V$gsZ" role="3eOfB_">
@@ -5634,7 +5634,7 @@
                           <ref role="37wK5l" to="nz6g:7HUwyZaPiEo" resolve="uniqueName" />
                           <node concept="10QFUN" id="7nPD14NOxtN" role="37wK5m">
                             <node concept="3uibUv" id="7nPD14NOxtL" role="10QFUM">
-                              <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                              <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                             </node>
                             <node concept="37vLTw" id="7nPD14NOxtM" role="10QFUP">
                               <ref role="3cqZAo" node="4sVJFklUwdY" resolve="arg" />
@@ -5668,7 +5668,7 @@
                     <node concept="1eOMI4" id="7HUwyZaC6_7" role="2Oq$k0">
                       <node concept="10QFUN" id="7HUwyZaC6_8" role="1eOMHV">
                         <node concept="3uibUv" id="7HUwyZaNMWK" role="10QFUM">
-                          <ref role="3uigEE" to="45ys:7HUwyZaNIC5" resolve="MultiMetaLogical" />
+                          <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
                         </node>
                         <node concept="37vLTw" id="7HUwyZaC6_a" role="10QFUP">
                           <ref role="3cqZAo" node="4sVJFklUwdY" resolve="arg" />
@@ -5676,7 +5676,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="7HUwyZaC6_b" role="2OqNvi">
-                      <ref role="37wK5l" to="45ys:7HUwyZaC4ZZ" resolve="cardinality" />
+                      <ref role="37wK5l" to="bj13:~MultiMetaLogical.cardinality():int" resolve="cardinality" />
                     </node>
                   </node>
                 </node>
@@ -5692,7 +5692,7 @@
           <node concept="3eNFk2" id="3x8pcoFoYts" role="3eNLev">
             <node concept="2ZW3vV" id="3x8pcoFoZ60" role="3eO9$A">
               <node concept="3uibUv" id="7HUwyZaC6Y0" role="2ZW6by">
-                <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
               </node>
               <node concept="37vLTw" id="3x8pcoFoZ3t" role="2ZW6bz">
                 <ref role="3cqZAo" node="4sVJFklUwdY" resolve="arg" />
@@ -5736,7 +5736,7 @@
                       <ref role="37wK5l" to="nz6g:7HUwyZaPiEo" resolve="uniqueName" />
                       <node concept="10QFUN" id="7nPD14NOzA$" role="37wK5m">
                         <node concept="3uibUv" id="7nPD14NOzAy" role="10QFUM">
-                          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                         </node>
                         <node concept="37vLTw" id="7nPD14NOzAz" role="10QFUP">
                           <ref role="3cqZAo" node="4sVJFklUwdY" resolve="arg" />
@@ -5832,7 +5832,7 @@
         <node concept="37vLTG" id="2$F5QpuuPRE" role="3clF46">
           <property role="TrG5h" value="rule" />
           <node concept="3uibUv" id="2$F5QpuuPTP" role="1tU5fm">
-            <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+            <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
           </node>
         </node>
         <node concept="3uibUv" id="2$F5QpuuPLR" role="3clF45">
@@ -5896,14 +5896,14 @@
             <ref role="3uigEE" to="nz6g:2$F5QputikM" resolve="NamingContext" />
           </node>
           <node concept="3uibUv" id="2$F5QpuuRMT" role="3rvQeY">
-            <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+            <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
           </node>
         </node>
         <node concept="3Tm6S6" id="2$F5QpuuRTS" role="1B3o_S" />
         <node concept="2ShNRf" id="2$F5QpuuS0f" role="33vP2m">
           <node concept="3rGOSV" id="2$F5QpuuS04" role="2ShVmc">
             <node concept="3uibUv" id="2$F5QpuuS05" role="3rHrn6">
-              <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+              <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
             </node>
             <node concept="3uibUv" id="2$F5QpuuS06" role="3rHtpV">
               <ref role="3uigEE" to="nz6g:2$F5QputikM" resolve="NamingContext" />
@@ -5920,7 +5920,7 @@
       <node concept="3Tm6S6" id="4sVJFklJd6Y" role="1B3o_S" />
       <node concept="3rvAFt" id="4sVJFklJdvR" role="1tU5fm">
         <node concept="3uibUv" id="5uFPQ7BMgwv" role="3rvQeY">
-          <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
         </node>
         <node concept="3Tqbb2" id="4sVJFklJdwT" role="3rvSg0">
           <ref role="ehGHo" to="vgt0:pmDhvH6MQk" resolve="ConstraintDeclaration" />
@@ -5929,7 +5929,7 @@
       <node concept="2ShNRf" id="4sVJFklJfXc" role="33vP2m">
         <node concept="3rGOSV" id="4sVJFklJfX3" role="2ShVmc">
           <node concept="3uibUv" id="5uFPQ7BMgEe" role="3rHrn6">
-            <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+            <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
           </node>
           <node concept="3Tqbb2" id="4sVJFklJfX5" role="3rHtpV">
             <ref role="ehGHo" to="vgt0:pmDhvH6MQk" resolve="ConstraintDeclaration" />
@@ -5945,8 +5945,8 @@
         <node concept="3uibUv" id="7ISVfSJGK_" role="3rvQeY">
           <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
           <node concept="3qUE_q" id="7ISVfSJGX5" role="11_B2D">
-            <node concept="3uibUv" id="7ISVfSJH5o" role="3qUE_r">
-              <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+            <node concept="3uibUv" id="1HG00HG2Ega" role="3qUE_r">
+              <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
             </node>
           </node>
         </node>
@@ -5959,8 +5959,8 @@
           <node concept="3uibUv" id="7ISVfSJHdx" role="3rHrn6">
             <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
             <node concept="3qUE_q" id="7ISVfSJH$P" role="11_B2D">
-              <node concept="3uibUv" id="7ISVfSJHHO" role="3qUE_r">
-                <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+              <node concept="3uibUv" id="1HG00HG2Eyb" role="3qUE_r">
+                <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
               </node>
             </node>
           </node>
@@ -5983,7 +5983,7 @@
       <property role="TrG5h" value="sessionSolver" />
       <node concept="3Tm6S6" id="2UGjFq4PgJP" role="1B3o_S" />
       <node concept="3uibUv" id="2UGjFq4PgJR" role="1tU5fm">
-        <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
       </node>
     </node>
   </node>
@@ -6676,8 +6676,8 @@
             <node concept="3clFbH" id="3F6vMxqxA8j" role="3cqZAp" />
           </node>
           <node concept="2ZW3vV" id="3F6vMxqxA8k" role="3clFbw">
-            <node concept="3uibUv" id="3F6vMxqxA8l" role="2ZW6by">
-              <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+            <node concept="3uibUv" id="1HG00HG2OBo" role="2ZW6by">
+              <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
             </node>
             <node concept="37vLTw" id="3F6vMxqxA8m" role="2ZW6bz">
               <ref role="3cqZAo" node="3F6vMxqxA85" resolve="o" />
@@ -7309,12 +7309,12 @@
         <property role="1EzhhJ" value="false" />
         <node concept="37vLTG" id="3F6vMxqmXma" role="3clF46">
           <property role="TrG5h" value="expressionSolver" />
-          <node concept="3uibUv" id="3F6vMxqmXmb" role="1tU5fm">
-            <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+          <node concept="3uibUv" id="1HG00HG2RhZ" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
           </node>
         </node>
         <node concept="3uibUv" id="3F6vMxqmXmc" role="3clF45">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
         <node concept="3Tmbuc" id="3F6vMxqmXmd" role="1B3o_S" />
         <node concept="3clFbS" id="3F6vMxqmXmk" role="3clF47">
@@ -7343,12 +7343,12 @@
         <property role="1EzhhJ" value="false" />
         <node concept="3Tmbuc" id="3F6vMxqjPSf" role="1B3o_S" />
         <node concept="3uibUv" id="3F6vMxqjPSg" role="3clF45">
-          <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
+          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
         </node>
         <node concept="37vLTG" id="3F6vMxqjPSh" role="3clF46">
           <property role="TrG5h" value="program" />
           <node concept="3uibUv" id="3F6vMxqjPSi" role="1tU5fm">
-            <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+            <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
           </node>
         </node>
         <node concept="37vLTG" id="3F6vMxqjPSl" role="3clF46">
@@ -7362,7 +7362,7 @@
             <node concept="3cpWsn" id="3F6vMxqjRXv" role="3cpWs9">
               <property role="TrG5h" value="config" />
               <node concept="3uibUv" id="3F6vMxqjRXq" role="1tU5fm">
-                <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
+                <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
               </node>
               <node concept="3nyPlj" id="3F6vMxqjRXw" role="33vP2m">
                 <ref role="37wK5l" to="t5kh:3F6vMxqjkf6" resolve="createConfig" />
@@ -7382,7 +7382,7 @@
                   <ref role="3cqZAo" node="3F6vMxqjRXv" resolve="config" />
                 </node>
                 <node concept="liA8E" id="3F6vMxqjSQ_" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5mr7UHcbbR2" resolve="withParam" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withParam(java.lang.String,java.lang.Object):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withParam" />
                   <node concept="Xl_RD" id="3F6vMxqjSQA" role="37wK5m">
                     <property role="Xl_RC" value="jchr.handler.class" />
                   </node>
@@ -7416,7 +7416,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3F6vMxqvyt$" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:5mr7UHcbbR2" resolve="withParam" />
+                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withParam(java.lang.String,java.lang.Object):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withParam" />
                 <node concept="Xl_RD" id="3F6vMxqvz2b" role="37wK5m">
                   <property role="Xl_RC" value="jchr.tracer" />
                 </node>
diff --git a/jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps b/jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps
index 75169ed3..a526a1fb 100644
--- a/jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps
+++ b/jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps
@@ -10,11 +10,11 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="f8dg" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:annotations(jetbrains.mps.jchr.runtime/)" />
     <import index="eifs" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime(jetbrains.mps.jchr.runtime/)" />
-    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="9js4" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime.hash(jetbrains.mps.jchr.runtime/)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
+    <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="omn0" ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
@@ -300,7 +300,7 @@
       <node concept="37vLTG" id="6infEALADHH" role="3clF46">
         <property role="TrG5h" value="logical" />
         <node concept="3uibUv" id="6infEALADVW" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="3uibUv" id="6infEALAEo5" role="11_B2D">
             <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
           </node>
@@ -351,7 +351,7 @@
       <node concept="37vLTG" id="6infEALAFgO" role="3clF46">
         <property role="TrG5h" value="logical" />
         <node concept="3uibUv" id="6infEALAFw7" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="3uibUv" id="6infEALAFXw" role="11_B2D">
             <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
           </node>
@@ -405,7 +405,7 @@
       </node>
     </node>
     <node concept="3uibUv" id="4xBopTzrR7K" role="3HQHJm">
-      <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+      <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
     </node>
   </node>
   <node concept="3HP615" id="6njqcfQVO0n">
@@ -690,7 +690,7 @@
       </node>
     </node>
     <node concept="3uibUv" id="4xBopTzmsJi" role="3HQHJm">
-      <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+      <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
     </node>
   </node>
   <node concept="3HP615" id="3HJTsBn4mEA">
@@ -976,13 +976,13 @@
       </node>
     </node>
     <node concept="3uibUv" id="6MYr6JwUFHB" role="3HQHJm">
-      <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+      <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
     </node>
   </node>
   <node concept="3HP615" id="60B5zVEZP8W">
     <property role="TrG5h" value="JchrLogicalSolver" />
     <node concept="3uibUv" id="4xBopTzrcyn" role="3HQHJm">
-      <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+      <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
     </node>
     <node concept="2tJIrI" id="5i7izgNdC6s" role="jymVt" />
     <node concept="Wx3nA" id="5i7izgNdCcB" role="jymVt">
@@ -1263,7 +1263,7 @@
       <node concept="37vLTG" id="20WMLipwaQe" role="3clF46">
         <property role="TrG5h" value="other" />
         <node concept="3uibUv" id="20WMLipwaQf" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="20WMLipwaQz" role="11_B2D">
             <ref role="16sUi3" node="3HJTsBmBSUN" resolve="T" />
           </node>
@@ -1272,7 +1272,7 @@
       <node concept="37vLTG" id="20WMLipwvci" role="3clF46">
         <property role="TrG5h" value="reconciler" />
         <node concept="3uibUv" id="20WMLipwvPf" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:20WMLipwnLy" resolve="SolverLogical.ValueReconciler" />
+          <ref role="3uigEE" to="bj13:~SolverLogical$ValueReconciler" resolve="SolverLogical.ValueReconciler" />
           <node concept="16syzq" id="20WMLipwwCe" role="11_B2D">
             <ref role="16sUi3" node="3HJTsBmBSUN" resolve="T" />
           </node>
@@ -1320,7 +1320,7 @@
                   <ref role="3cqZAo" node="20WMLipwaQe" resolve="other" />
                 </node>
                 <node concept="liA8E" id="20WMLipwNtc" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:429xoyqB1jp" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~SolverLogical.findRoot():jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -1604,7 +1604,7 @@
                     <ref role="3cqZAo" node="20WMLipwvci" resolve="reconciler" />
                   </node>
                   <node concept="liA8E" id="20WMLipxfoW" role="2OqNvi">
-                    <ref role="37wK5l" to="45ys:20WMLipwqq1" resolve="reconcile" />
+                    <ref role="37wK5l" to="bj13:~SolverLogical$ValueReconciler.reconcile(java.lang.Object,java.lang.Object):void" resolve="reconcile" />
                     <node concept="37vLTw" id="6SkxsMzEWnb" role="37wK5m">
                       <ref role="3cqZAo" node="1bm7a6ESoe0" resolve="leftVal" />
                     </node>
@@ -1632,7 +1632,7 @@
       <node concept="37vLTG" id="20WMLipxFk5" role="3clF46">
         <property role="TrG5h" value="other" />
         <node concept="3uibUv" id="20WMLipxFk6" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="20WMLipxFkt" role="11_B2D">
             <ref role="16sUi3" node="3HJTsBmBSUN" resolve="T" />
           </node>
@@ -1709,7 +1709,7 @@
       <property role="TrG5h" value="metaLogical" />
       <node concept="3Tm1VV" id="7HUwyZaOeBJ" role="1B3o_S" />
       <node concept="3uibUv" id="7HUwyZaOeBK" role="3clF45">
-        <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+        <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
         <node concept="16syzq" id="20WMLipvJNV" role="11_B2D">
           <ref role="16sUi3" node="3HJTsBmBSUN" resolve="T" />
         </node>
@@ -1936,13 +1936,13 @@
       <property role="TrG5h" value="T" />
     </node>
     <node concept="3uibUv" id="3HJTsBmBTqG" role="EKbjA">
-      <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+      <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
       <node concept="16syzq" id="3HJTsBmBTr8" role="11_B2D">
         <ref role="16sUi3" node="3HJTsBmBSUN" resolve="T" />
       </node>
     </node>
     <node concept="3uibUv" id="6MYr6Jwygwh" role="EKbjA">
-      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
       <node concept="16syzq" id="6MYr6JwyhSo" role="11_B2D">
         <ref role="16sUi3" node="3HJTsBmBSUN" resolve="T" />
       </node>
@@ -1980,7 +1980,7 @@
       <node concept="37vLTG" id="3HJTsBmD3ec" role="3clF46">
         <property role="TrG5h" value="parent" />
         <node concept="3uibUv" id="3HJTsBmD5To" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="3HJTsBmD6H5" role="11_B2D">
             <ref role="16sUi3" node="3HJTsBmBSUN" resolve="T" />
           </node>
@@ -2301,7 +2301,7 @@
       <node concept="37vLTG" id="6MYr6JwyOfn" role="3clF46">
         <property role="TrG5h" value="from" />
         <node concept="3uibUv" id="6MYr6JwyOfm" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="6MYr6JwyPEp" role="11_B2D">
             <ref role="16sUi3" node="3HJTsBmBSUN" resolve="T" />
           </node>
@@ -2537,7 +2537,7 @@
     <property role="2bfB8j" value="false" />
     <property role="TrG5h" value="JchrSessionSolver" />
     <node concept="3uibUv" id="2tcGHBEec09" role="1zkMxy">
-      <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+      <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
     </node>
     <node concept="2tJIrI" id="1ggxSI7xhTW" role="jymVt" />
     <node concept="3clFbW" id="1ggxSI7xi4I" role="jymVt">
@@ -2622,7 +2622,7 @@
       <node concept="37vLTG" id="1ggxSI7xM_Y" role="3clF46">
         <property role="TrG5h" value="javaExpressionSolver" />
         <node concept="3uibUv" id="1ggxSI7xM_Z" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+          <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
         </node>
       </node>
     </node>
@@ -2661,7 +2661,7 @@
       <node concept="37vLTG" id="6MYr6Jwp7cU" role="3clF46">
         <property role="TrG5h" value="javaExpressionSolver" />
         <node concept="3uibUv" id="6MYr6Jwp7cV" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+          <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6Jwp7cW" role="3clF46">
@@ -2734,7 +2734,7 @@
         <node concept="YS8fn" id="3eLgHzX3On1" role="3cqZAp">
           <node concept="2ShNRf" id="3eLgHzX3OnK" role="YScLw">
             <node concept="1pGfFk" id="3eLgHzX3PBQ" role="2ShVmc">
-              <ref role="37wK5l" to="qrld:7vxJ_H4qql2" resolve="EvaluationFailureException" />
+              <ref role="37wK5l" to="w7la:~EvaluationFailureException.&lt;init&gt;(java.lang.String)" resolve="EvaluationFailureException" />
               <node concept="37vLTw" id="3eLgHzX3PF4" role="37wK5m">
                 <ref role="3cqZAo" node="3eLgHzX3NPe" resolve="message" />
               </node>
@@ -2752,13 +2752,13 @@
       <node concept="37vLTG" id="7ISVfSIJee" role="3clF46">
         <property role="TrG5h" value="symbol" />
         <node concept="3uibUv" id="2tcGHBEei$8" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
         </node>
       </node>
       <node concept="37vLTG" id="2tcGHBEisRf" role="3clF46">
         <property role="TrG5h" value="computingTracer" />
         <node concept="3uibUv" id="2tcGHBEisZb" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:24Vro6cQnrj" resolve="EvaluationTrace" />
+          <ref role="3uigEE" to="w7la:~EvaluationTrace" resolve="EvaluationTrace" />
         </node>
       </node>
       <node concept="3cqZAl" id="7ISVfSIy6c" role="3clF45" />
@@ -2771,10 +2771,10 @@
               <node concept="2OqwBi" id="7ISVfSIVrQ" role="3clFbG">
                 <node concept="Xjq3P" id="2tcGHBEecgK" role="2Oq$k0" />
                 <node concept="liA8E" id="7ISVfSIVsU" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                  <ref role="37wK5l" to="w7la:~SessionSolver.registerSolver(jetbrains.mps.logic.reactor.program.PredicateSymbol,jetbrains.mps.logic.reactor.evaluation.Solver):void" resolve="registerSolver" />
                   <node concept="10QFUN" id="7ISVfSIYFl" role="37wK5m">
                     <node concept="3uibUv" id="7ISVfSIYFj" role="10QFUM">
-                      <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                      <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
                     </node>
                     <node concept="37vLTw" id="7ISVfSIYFk" role="10QFUP">
                       <ref role="3cqZAo" node="7ISVfSIJee" resolve="symbol" />
@@ -2800,7 +2800,7 @@
               <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
             </node>
             <node concept="liA8E" id="7ISVfSIJyd" role="2OqNvi">
-              <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+              <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
               <node concept="37vLTw" id="7ISVfSIJzc" role="37wK5m">
                 <ref role="3cqZAo" node="7ISVfSIJee" resolve="symbol" />
               </node>
@@ -2813,7 +2813,7 @@
                 <ref role="3cqZAo" to="cxk7:5uFPQ7C23RV" resolve="EQ_SYM" />
               </node>
               <node concept="liA8E" id="7ISVfSIJAs" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
                 <node concept="37vLTw" id="7ISVfSIJBV" role="37wK5m">
                   <ref role="3cqZAo" node="7ISVfSIJee" resolve="symbol" />
                 </node>
@@ -2824,10 +2824,10 @@
                 <node concept="2OqwBi" id="7ISVfSIYOw" role="3clFbG">
                   <node concept="Xjq3P" id="2tcGHBEecj3" role="2Oq$k0" />
                   <node concept="liA8E" id="7ISVfSIYOy" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                    <ref role="37wK5l" to="w7la:~SessionSolver.registerSolver(jetbrains.mps.logic.reactor.program.PredicateSymbol,jetbrains.mps.logic.reactor.evaluation.Solver):void" resolve="registerSolver" />
                     <node concept="10QFUN" id="7ISVfSIYOz" role="37wK5m">
                       <node concept="3uibUv" id="7ISVfSIYO$" role="10QFUM">
-                        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
                       </node>
                       <node concept="37vLTw" id="7ISVfSIYO_" role="10QFUP">
                         <ref role="3cqZAo" node="7ISVfSIJee" resolve="symbol" />
@@ -2852,7 +2852,7 @@
                 <ref role="3cqZAo" to="cxk7:5uFPQ7BZnLB" resolve="ASSERT_SYM" />
               </node>
               <node concept="liA8E" id="7ISVfSIJIa" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
                 <node concept="37vLTw" id="7ISVfSIJJb" role="37wK5m">
                   <ref role="3cqZAo" node="7ISVfSIJee" resolve="symbol" />
                 </node>
@@ -2863,10 +2863,10 @@
                 <node concept="2OqwBi" id="7ISVfSIZhn" role="3clFbG">
                   <node concept="Xjq3P" id="2tcGHBEeclc" role="2Oq$k0" />
                   <node concept="liA8E" id="7ISVfSIZhp" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                    <ref role="37wK5l" to="w7la:~SessionSolver.registerSolver(jetbrains.mps.logic.reactor.program.PredicateSymbol,jetbrains.mps.logic.reactor.evaluation.Solver):void" resolve="registerSolver" />
                     <node concept="10QFUN" id="7ISVfSIZhq" role="37wK5m">
                       <node concept="3uibUv" id="7ISVfSIZhr" role="10QFUM">
-                        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
                       </node>
                       <node concept="37vLTw" id="7ISVfSIZhs" role="10QFUP">
                         <ref role="3cqZAo" node="7ISVfSIJee" resolve="symbol" />
@@ -2891,7 +2891,7 @@
                 <ref role="1PxDUh" to="cxk7:5$WbtTOYoMb" resolve="LogicalPredicate" />
               </node>
               <node concept="liA8E" id="7ISVfSIJJH" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
                 <node concept="37vLTw" id="7ISVfSIJJI" role="37wK5m">
                   <ref role="3cqZAo" node="7ISVfSIJee" resolve="symbol" />
                 </node>
@@ -2902,10 +2902,10 @@
                 <node concept="2OqwBi" id="7ISVfSJ2P7" role="3clFbG">
                   <node concept="Xjq3P" id="2tcGHBEecmS" role="2Oq$k0" />
                   <node concept="liA8E" id="7ISVfSJ2P9" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                    <ref role="37wK5l" to="w7la:~SessionSolver.registerSolver(jetbrains.mps.logic.reactor.program.PredicateSymbol,jetbrains.mps.logic.reactor.evaluation.Solver):void" resolve="registerSolver" />
                     <node concept="10QFUN" id="7ISVfSJ2Pa" role="37wK5m">
                       <node concept="3uibUv" id="7ISVfSJ2Pb" role="10QFUM">
-                        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
                       </node>
                       <node concept="37vLTw" id="7ISVfSJ2Pc" role="10QFUP">
                         <ref role="3cqZAo" node="7ISVfSIJee" resolve="symbol" />
@@ -2929,7 +2929,7 @@
                 <ref role="1PxDUh" to="cxk7:5$WbtTOYoMb" resolve="LogicalPredicate" />
               </node>
               <node concept="liA8E" id="7ISVfSJ2Gg" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
                 <node concept="37vLTw" id="7ISVfSJ2Gh" role="37wK5m">
                   <ref role="3cqZAo" node="7ISVfSIJee" resolve="symbol" />
                 </node>
@@ -2940,10 +2940,10 @@
                 <node concept="2OqwBi" id="7ISVfSJ30o" role="3clFbG">
                   <node concept="Xjq3P" id="2tcGHBEecoN" role="2Oq$k0" />
                   <node concept="liA8E" id="7ISVfSJ30q" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                    <ref role="37wK5l" to="w7la:~SessionSolver.registerSolver(jetbrains.mps.logic.reactor.program.PredicateSymbol,jetbrains.mps.logic.reactor.evaluation.Solver):void" resolve="registerSolver" />
                     <node concept="10QFUN" id="7ISVfSJ30r" role="37wK5m">
                       <node concept="3uibUv" id="7ISVfSJ30s" role="10QFUM">
-                        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
                       </node>
                       <node concept="37vLTw" id="7ISVfSJ30t" role="10QFUP">
                         <ref role="3cqZAo" node="7ISVfSIJee" resolve="symbol" />
@@ -2987,10 +2987,10 @@
                 <node concept="2OqwBi" id="1ggxSI7qGPQ" role="3clFbG">
                   <node concept="Xjq3P" id="1ggxSI7qGPR" role="2Oq$k0" />
                   <node concept="liA8E" id="1ggxSI7qGPS" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                    <ref role="37wK5l" to="w7la:~SessionSolver.registerSolver(jetbrains.mps.logic.reactor.program.PredicateSymbol,jetbrains.mps.logic.reactor.evaluation.Solver):void" resolve="registerSolver" />
                     <node concept="10QFUN" id="1ggxSI7qGPT" role="37wK5m">
                       <node concept="3uibUv" id="1ggxSI7qGPU" role="10QFUM">
-                        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
                       </node>
                       <node concept="37vLTw" id="1ggxSI7qGPV" role="10QFUP">
                         <ref role="3cqZAo" node="7ISVfSIJee" resolve="symbol" />
@@ -3011,7 +3011,7 @@
             </node>
             <node concept="2ZW3vV" id="1ggxSI7qHdm" role="3eO9$A">
               <node concept="3uibUv" id="1ggxSI7qHiX" role="2ZW6by">
-                <ref role="3uigEE" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+                <ref role="3uigEE" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
               </node>
               <node concept="37vLTw" id="1ggxSI7qH82" role="2ZW6bz">
                 <ref role="3cqZAo" node="7ISVfSIJee" resolve="symbol" />
@@ -3047,14 +3047,14 @@
       <node concept="37vLTG" id="2tcGHBEvbMH" role="3clF46">
         <property role="TrG5h" value="symbol" />
         <node concept="3uibUv" id="2tcGHBEvbMI" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
         </node>
       </node>
       <node concept="3uibUv" id="2tcGHBEvcMg" role="3clF45">
         <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
         <node concept="3qUE_q" id="2tcGHBEvcY3" role="11_B2D">
           <node concept="3uibUv" id="2tcGHBEvcZz" role="3qUE_r">
-            <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+            <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
           </node>
         </node>
       </node>
@@ -3076,7 +3076,7 @@
               <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
             </node>
             <node concept="liA8E" id="2tcGHBEvbN5" role="2OqNvi">
-              <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+              <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
               <node concept="37vLTw" id="2tcGHBEvbN6" role="37wK5m">
                 <ref role="3cqZAo" node="2tcGHBEvbMH" resolve="symbol" />
               </node>
@@ -3089,7 +3089,7 @@
                 <ref role="3cqZAo" to="cxk7:5uFPQ7C23RV" resolve="EQ_SYM" />
               </node>
               <node concept="liA8E" id="2tcGHBEvbNa" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
                 <node concept="37vLTw" id="2tcGHBEvbNb" role="37wK5m">
                   <ref role="3cqZAo" node="2tcGHBEvbMH" resolve="symbol" />
                 </node>
@@ -3111,7 +3111,7 @@
                 <ref role="3cqZAo" to="cxk7:5uFPQ7BZnLB" resolve="ASSERT_SYM" />
               </node>
               <node concept="liA8E" id="2tcGHBEvbNr" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
                 <node concept="37vLTw" id="2tcGHBEvbNs" role="37wK5m">
                   <ref role="3cqZAo" node="2tcGHBEvbMH" resolve="symbol" />
                 </node>
@@ -3133,7 +3133,7 @@
                 <ref role="3cqZAo" to="cxk7:5uFPQ7C26$b" resolve="BOUND_SYM" />
               </node>
               <node concept="liA8E" id="2tcGHBEvbNF" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
                 <node concept="37vLTw" id="2tcGHBEvbNG" role="37wK5m">
                   <ref role="3cqZAo" node="2tcGHBEvbMH" resolve="symbol" />
                 </node>
@@ -3155,7 +3155,7 @@
                 <ref role="3cqZAo" to="cxk7:5uFPQ7C279$" resolve="FREE_SYM" />
               </node>
               <node concept="liA8E" id="2tcGHBEvbNV" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
                 <node concept="37vLTw" id="2tcGHBEvbNW" role="37wK5m">
                   <ref role="3cqZAo" node="2tcGHBEvbMH" resolve="symbol" />
                 </node>
@@ -3173,7 +3173,7 @@
           <node concept="3eNFk2" id="2tcGHBEBfnQ" role="3eNLev">
             <node concept="2ZW3vV" id="1ggxSI7oiK8" role="3eO9$A">
               <node concept="3uibUv" id="1ggxSI7oiW9" role="2ZW6by">
-                <ref role="3uigEE" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+                <ref role="3uigEE" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
               </node>
               <node concept="37vLTw" id="1ggxSI7oifj" role="2ZW6bz">
                 <ref role="3cqZAo" node="2tcGHBEvbMH" resolve="symbol" />
@@ -3220,7 +3220,7 @@
       <property role="TrG5h" value="javaExpressionSolver" />
       <node concept="3Tm6S6" id="1ggxSI7xiww" role="1B3o_S" />
       <node concept="3uibUv" id="1ggxSI7xiwy" role="1tU5fm">
-        <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+        <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
       </node>
     </node>
     <node concept="312cEg" id="6MYr6JwosqA" role="jymVt">
@@ -3238,7 +3238,7 @@
       <node concept="37vLTG" id="1ggxSI7x6Ge" role="3clF46">
         <property role="TrG5h" value="delegate" />
         <node concept="3uibUv" id="6H279bUVqKW" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+          <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
         </node>
       </node>
       <node concept="3cqZAl" id="1ggxSI7x65x" role="3clF45" />
@@ -3276,8 +3276,8 @@
           <node concept="1rXfSq" id="1ggxSI7qrKX" role="3clFbG">
             <ref role="37wK5l" to="omn0:6MYr6Jx1bRj" resolve="tell" />
             <node concept="10M0yZ" id="2UGjFq4gOlL" role="37wK5m">
-              <ref role="1PxDUh" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
-              <ref role="3cqZAo" to="rchb:1ggxSI7vUYU" resolve="EXPRESSION0" />
+              <ref role="1PxDUh" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
+              <ref role="3cqZAo" to="av0y:~JavaPredicateSymbol.EXPRESSION0" resolve="EXPRESSION0" />
             </node>
             <node concept="37vLTw" id="1ggxSI7qt5L" role="37wK5m">
               <ref role="3cqZAo" node="1ggxSI7qrey" resolve="id" />
@@ -3310,8 +3310,8 @@
           <node concept="1rXfSq" id="1ggxSI7qwkc" role="3clFbG">
             <ref role="37wK5l" to="omn0:6MYr6Jx1bRz" resolve="ask" />
             <node concept="10M0yZ" id="2UGjFq4gOq$" role="37wK5m">
-              <ref role="1PxDUh" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
-              <ref role="3cqZAo" to="rchb:1ggxSI7vUYU" resolve="EXPRESSION0" />
+              <ref role="1PxDUh" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
+              <ref role="3cqZAo" to="av0y:~JavaPredicateSymbol.EXPRESSION0" resolve="EXPRESSION0" />
             </node>
             <node concept="37vLTw" id="1ggxSI7qwkf" role="37wK5m">
               <ref role="3cqZAo" node="1ggxSI7qvQW" resolve="id" />
@@ -3350,8 +3350,8 @@
           <node concept="1rXfSq" id="1ggxSI7qtiu" role="3clFbG">
             <ref role="37wK5l" to="omn0:6MYr6Jx1bRj" resolve="tell" />
             <node concept="10M0yZ" id="2UGjFq4gOt1" role="37wK5m">
-              <ref role="1PxDUh" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
-              <ref role="3cqZAo" to="rchb:1ggxSI7vV1O" resolve="EXPRESSION1" />
+              <ref role="1PxDUh" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
+              <ref role="3cqZAo" to="av0y:~JavaPredicateSymbol.EXPRESSION1" resolve="EXPRESSION1" />
             </node>
             <node concept="37vLTw" id="1ggxSI7qtix" role="37wK5m">
               <ref role="3cqZAo" node="1ggxSI7qreS" resolve="id" />
@@ -3393,8 +3393,8 @@
           <node concept="1rXfSq" id="1ggxSI7qx0s" role="3clFbG">
             <ref role="37wK5l" to="omn0:6MYr6Jx1bRz" resolve="ask" />
             <node concept="10M0yZ" id="2UGjFq4gOwh" role="37wK5m">
-              <ref role="1PxDUh" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
-              <ref role="3cqZAo" to="rchb:1ggxSI7vV1O" resolve="EXPRESSION1" />
+              <ref role="1PxDUh" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
+              <ref role="3cqZAo" to="av0y:~JavaPredicateSymbol.EXPRESSION1" resolve="EXPRESSION1" />
             </node>
             <node concept="37vLTw" id="1ggxSI7qx0v" role="37wK5m">
               <ref role="3cqZAo" node="1ggxSI7qrf4" resolve="id" />
@@ -3442,8 +3442,8 @@
           <node concept="1rXfSq" id="1ggxSI7qy4k" role="3clFbG">
             <ref role="37wK5l" to="omn0:6MYr6Jx1bRj" resolve="tell" />
             <node concept="10M0yZ" id="2UGjFq4gOz9" role="37wK5m">
-              <ref role="1PxDUh" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
-              <ref role="3cqZAo" to="rchb:1ggxSI7vV3x" resolve="EXPRESSION2" />
+              <ref role="1PxDUh" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
+              <ref role="3cqZAo" to="av0y:~JavaPredicateSymbol.EXPRESSION2" resolve="EXPRESSION2" />
             </node>
             <node concept="37vLTw" id="1ggxSI7qy4n" role="37wK5m">
               <ref role="3cqZAo" node="1ggxSI7qrfi" resolve="id" />
@@ -3494,8 +3494,8 @@
           <node concept="1rXfSq" id="1ggxSI7qz19" role="3clFbG">
             <ref role="37wK5l" to="omn0:6MYr6Jx1bRz" resolve="ask" />
             <node concept="10M0yZ" id="2UGjFq4gOAA" role="37wK5m">
-              <ref role="1PxDUh" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
-              <ref role="3cqZAo" to="rchb:1ggxSI7vV3x" resolve="EXPRESSION2" />
+              <ref role="1PxDUh" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
+              <ref role="3cqZAo" to="av0y:~JavaPredicateSymbol.EXPRESSION2" resolve="EXPRESSION2" />
             </node>
             <node concept="37vLTw" id="1ggxSI7qz1c" role="37wK5m">
               <ref role="3cqZAo" node="1ggxSI7qrfw" resolve="id" />
@@ -3552,8 +3552,8 @@
           <node concept="1rXfSq" id="1ggxSI7q$4T" role="3clFbG">
             <ref role="37wK5l" to="omn0:6MYr6Jx1bRj" resolve="tell" />
             <node concept="10M0yZ" id="2UGjFq4gOQ_" role="37wK5m">
-              <ref role="1PxDUh" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
-              <ref role="3cqZAo" to="rchb:1ggxSI7vV5$" resolve="EXPRESSION3" />
+              <ref role="1PxDUh" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
+              <ref role="3cqZAo" to="av0y:~JavaPredicateSymbol.EXPRESSION3" resolve="EXPRESSION3" />
             </node>
             <node concept="37vLTw" id="1ggxSI7q$4W" role="37wK5m">
               <ref role="3cqZAo" node="1ggxSI7qrfK" resolve="id" />
@@ -3613,8 +3613,8 @@
           <node concept="1rXfSq" id="1ggxSI7q_qh" role="3clFbG">
             <ref role="37wK5l" to="omn0:6MYr6Jx1bRz" resolve="ask" />
             <node concept="10M0yZ" id="2UGjFq4gOUb" role="37wK5m">
-              <ref role="1PxDUh" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
-              <ref role="3cqZAo" to="rchb:1ggxSI7vV5$" resolve="EXPRESSION3" />
+              <ref role="1PxDUh" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
+              <ref role="3cqZAo" to="av0y:~JavaPredicateSymbol.EXPRESSION3" resolve="EXPRESSION3" />
             </node>
             <node concept="37vLTw" id="1ggxSI7q_qk" role="37wK5m">
               <ref role="3cqZAo" node="1ggxSI7qrg0" resolve="id" />
@@ -3955,10 +3955,10 @@
       </node>
     </node>
     <node concept="3uibUv" id="1ggxSI7ojA_" role="3HQHJm">
-      <ref role="3uigEE" to="qrld:6Kcfpq7AXVG" resolve="Instructible" />
+      <ref role="3uigEE" to="w7la:~Instructible" resolve="Instructible" />
     </node>
     <node concept="3uibUv" id="1ggxSI7ojCD" role="3HQHJm">
-      <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+      <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
     </node>
   </node>
   <node concept="312cEu" id="6MYr6JwUmKJ">
@@ -3978,7 +3978,7 @@
       <node concept="37vLTG" id="6MYr6JwUnUh" role="3clF46">
         <property role="TrG5h" value="sessionSolver" />
         <node concept="3uibUv" id="6MYr6JwUnUg" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
       </node>
     </node>
@@ -4064,7 +4064,7 @@
             </node>
             <node concept="10QFUN" id="6MYr6JxF0Tl" role="37wK5m">
               <node concept="3uibUv" id="6MYr6JxF0Ti" role="10QFUM">
-                <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 <node concept="3uibUv" id="6MYr6JxF1vb" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -4114,7 +4114,7 @@
             <ref role="37wK5l" to="omn0:3HJTsBn4V_B" resolve="_tellEq_var_val" />
             <node concept="10QFUN" id="6MYr6JxF49e" role="37wK5m">
               <node concept="3uibUv" id="6MYr6JxF49b" role="10QFUM">
-                <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 <node concept="3uibUv" id="6MYr6JxF4rn" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -4167,7 +4167,7 @@
             <ref role="37wK5l" to="omn0:3HJTsBn4V_Q" resolve="_tellEq_var_var" />
             <node concept="10QFUN" id="6MYr6JxCnib" role="37wK5m">
               <node concept="3uibUv" id="6MYr6JxCni8" role="10QFUM">
-                <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 <node concept="3uibUv" id="6MYr6JxF7jo" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -4178,7 +4178,7 @@
             </node>
             <node concept="10QFUN" id="6MYr6JxCnZ0" role="37wK5m">
               <node concept="3uibUv" id="6MYr6JxCnYX" role="10QFUM">
-                <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 <node concept="3uibUv" id="6MYr6JxF7H0" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -4276,7 +4276,7 @@
             </node>
             <node concept="10QFUN" id="6MYr6JxF8Gw" role="37wK5m">
               <node concept="3uibUv" id="6MYr6JxF8Gt" role="10QFUM">
-                <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 <node concept="3uibUv" id="6MYr6JxF8Xf" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -4326,7 +4326,7 @@
             <ref role="37wK5l" to="omn0:3HJTsBn4VAB" resolve="_askEq_var_val" />
             <node concept="10QFUN" id="6MYr6JxFaCU" role="37wK5m">
               <node concept="3uibUv" id="6MYr6JxFaCR" role="10QFUM">
-                <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 <node concept="3uibUv" id="6MYr6JxFaVd" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -4379,7 +4379,7 @@
             <ref role="37wK5l" to="omn0:3HJTsBn4VAS" resolve="_askEq_var_var" />
             <node concept="10QFUN" id="6MYr6JxCoP8" role="37wK5m">
               <node concept="3uibUv" id="6MYr6JxCoP5" role="10QFUM">
-                <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 <node concept="3uibUv" id="6MYr6JxFcZK" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -4390,7 +4390,7 @@
             </node>
             <node concept="10QFUN" id="6MYr6JxCpyA" role="37wK5m">
               <node concept="3uibUv" id="6MYr6JxCpyz" role="10QFUM">
-                <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 <node concept="3uibUv" id="6MYr6JxFdpM" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -4424,13 +4424,13 @@
       <node concept="37vLTG" id="6MYr6JwUNaP" role="3clF46">
         <property role="TrG5h" value="sessionSolver" />
         <node concept="3uibUv" id="6MYr6JwUNg6" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6JwUNln" role="3clF46">
         <property role="TrG5h" value="trace" />
         <node concept="3uibUv" id="6MYr6JwUNqE" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:24Vro6cQnrj" resolve="EvaluationTrace" />
+          <ref role="3uigEE" to="w7la:~EvaluationTrace" resolve="EvaluationTrace" />
         </node>
       </node>
       <node concept="3cqZAl" id="6MYr6JwUN9s" role="3clF45" />
@@ -4838,7 +4838,7 @@
       <node concept="37vLTG" id="6MYr6Jx03Dl" role="3clF46">
         <property role="TrG5h" value="sessionSolver" />
         <node concept="3uibUv" id="6MYr6Jx03Dk" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
       </node>
     </node>
@@ -4882,7 +4882,7 @@
       <node concept="37vLTG" id="6MYr6JwZYHr" role="3clF46">
         <property role="TrG5h" value="logical" />
         <node concept="3uibUv" id="6MYr6JwZYHs" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="3uibUv" id="6MYr6JwZYHt" role="11_B2D">
             <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
           </node>
@@ -4951,7 +4951,7 @@
       <node concept="37vLTG" id="6MYr6JwZYHO" role="3clF46">
         <property role="TrG5h" value="logical" />
         <node concept="3uibUv" id="6MYr6JwZYHP" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="3uibUv" id="6MYr6JwZYHQ" role="11_B2D">
             <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
           </node>
@@ -5022,7 +5022,7 @@
               <ref role="37wK5l" to="omn0:7ISVfSJ19r" resolve="_ask" />
               <node concept="10QFUN" id="3eLgHzX3Y22" role="37wK5m">
                 <node concept="3uibUv" id="3eLgHzX3Y1Z" role="10QFUM">
-                  <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                  <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                   <node concept="3qTvmN" id="3eLgHzX3Y20" role="11_B2D" />
                 </node>
                 <node concept="37vLTw" id="3eLgHzX3Y21" role="10QFUP">
@@ -5073,7 +5073,7 @@
               <ref role="37wK5l" to="omn0:7ISVfSJ1ok" resolve="_ask" />
               <node concept="10QFUN" id="3eLgHzX3Yeu" role="37wK5m">
                 <node concept="3uibUv" id="3eLgHzX3Yer" role="10QFUM">
-                  <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                  <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                   <node concept="3qTvmN" id="3eLgHzX3Yes" role="11_B2D" />
                 </node>
                 <node concept="37vLTw" id="3eLgHzX3Yet" role="10QFUP">
@@ -5153,7 +5153,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="3FIATxbQg$Q" role="3clF45">
-        <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+        <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
         <node concept="16syzq" id="3FIATxbQg$R" role="11_B2D">
           <ref role="16sUi3" node="3FIATxbQg$T" resolve="TERM" />
         </node>
@@ -5175,16 +5175,16 @@
                     <ref role="3cqZAo" node="3FIATxbQg$O" resolve="var" />
                   </node>
                   <node concept="3uibUv" id="3FIATxbQg_2" role="10QFUM">
-                    <ref role="3uigEE" to="45ys:46l0wJhtOD_" resolve="LogicalOwner" />
+                    <ref role="3uigEE" to="bj13:~LogicalOwner" resolve="LogicalOwner" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="3FIATxbQg_3" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:46l0wJhtXlr" resolve="logical" />
+                <ref role="37wK5l" to="bj13:~LogicalOwner.logical():jetbrains.mps.logic.reactor.logical.Logical" resolve="logical" />
               </node>
             </node>
             <node concept="3uibUv" id="3FIATxbQg_4" role="10QFUM">
-              <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+              <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               <node concept="16syzq" id="3FIATxbQg_5" role="11_B2D">
                 <ref role="16sUi3" node="3FIATxbQg$T" resolve="TERM" />
               </node>
@@ -5209,7 +5209,7 @@
         <node concept="3clFbF" id="3FIATxbQg_d" role="3cqZAp">
           <node concept="2ZW3vV" id="3FIATxbQg_e" role="3clFbG">
             <node concept="3uibUv" id="3FIATxbQg_f" role="2ZW6by">
-              <ref role="3uigEE" to="45ys:46l0wJhtOD_" resolve="LogicalOwner" />
+              <ref role="3uigEE" to="bj13:~LogicalOwner" resolve="LogicalOwner" />
             </node>
             <node concept="37vLTw" id="3FIATxbQg_g" role="2ZW6bz">
               <ref role="3cqZAo" node="3FIATxbQg_8" resolve="term" />
@@ -5221,7 +5221,7 @@
     <node concept="2tJIrI" id="3FIATxbQg$v" role="jymVt" />
     <node concept="3Tm1VV" id="3FIATxbQg8D" role="1B3o_S" />
     <node concept="3uibUv" id="3FIATxbQg97" role="EKbjA">
-      <ref role="3uigEE" to="45ys:6MYr6JwANOa" resolve="LogicalUnification" />
+      <ref role="3uigEE" to="bj13:~LogicalUnification" resolve="LogicalUnification" />
     </node>
   </node>
   <node concept="312cEu" id="4U_yxogAknZ">
@@ -5368,7 +5368,7 @@
       <node concept="37vLTG" id="3mz2_dYqKiz" role="3clF46">
         <property role="TrG5h" value="metaLogical" />
         <node concept="3uibUv" id="3mz2_dYqL9h" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
         </node>
       </node>
       <node concept="3clFbS" id="3mz2_dYqEdQ" role="3clF47">
@@ -5425,7 +5425,7 @@
       <property role="TrG5h" value="metaLogical" />
       <node concept="3Tm1VV" id="6yEjedmaeEw" role="1B3o_S" />
       <node concept="3uibUv" id="6yEjedmaeEx" role="3clF45">
-        <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+        <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
         <node concept="3uibUv" id="20WMLipvJgu" role="11_B2D">
           <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
@@ -5471,7 +5471,7 @@
           <node concept="3cpWsn" id="5NuEpF1xSwz" role="3cpWs9">
             <property role="TrG5h" value="repr" />
             <node concept="3uibUv" id="7HUwyZazx80" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+              <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
               <node concept="3uibUv" id="7HUwyZazx81" role="11_B2D">
                 <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
@@ -5492,7 +5492,7 @@
                 <ref role="3cqZAo" node="5NuEpF1xSwz" resolve="repr" />
               </node>
               <node concept="liA8E" id="3v$7B1Kczo4" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
           </node>
@@ -5517,7 +5517,7 @@
                     <ref role="3cqZAo" node="5NuEpF1xSwz" resolve="repr" />
                   </node>
                   <node concept="liA8E" id="2QE4RCGhZVn" role="2OqNvi">
-                    <ref role="37wK5l" to="45ys:677NV56hh2k" resolve="name" />
+                    <ref role="37wK5l" to="bj13:~Logical.name():java.lang.String" resolve="name" />
                   </node>
                 </node>
                 <node concept="3cpWs3" id="2QE4RCGhZVo" role="3uHU7B">
@@ -5576,7 +5576,7 @@
       </node>
     </node>
     <node concept="3uibUv" id="7HUwyZazx8k" role="EKbjA">
-      <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+      <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
       <node concept="3uibUv" id="7HUwyZazx8l" role="11_B2D">
         <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
@@ -5628,7 +5628,7 @@
       <property role="TrG5h" value="metaLogical" />
       <node concept="3Tm6S6" id="3mz2_dYqLkW" role="1B3o_S" />
       <node concept="3uibUv" id="3mz2_dYqLkY" role="1tU5fm">
-        <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+        <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
       </node>
     </node>
   </node>
diff --git a/jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/program.mps b/jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/program.mps
index 155f3abe..e618a619 100644
--- a/jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/program.mps
+++ b/jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/program.mps
@@ -9,15 +9,15 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
   </languages>
   <imports>
-    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
+    <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="eifs" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime(jetbrains.mps.jchr.runtime/)" />
     <import index="iawt" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime.debug(jetbrains.mps.jchr.runtime/)" />
     <import index="t6h5" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang.reflect(JDK/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -263,8 +263,8 @@
       <node concept="3clFbS" id="7ISVfSIf0n" role="3clF47">
         <node concept="3clFbF" id="7ISVfSIf2T" role="3cqZAp">
           <node concept="2YIFZM" id="7ISVfSIf4g" role="3clFbG">
-            <ref role="37wK5l" to="qrld:5uFPQ7Bwt$y" resolve="setBackend" />
-            <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+            <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+            <ref role="37wK5l" to="w7la:~EvaluationSession.setBackend(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Backend):void" resolve="setBackend" />
             <node concept="37vLTw" id="5jPBdKClOM" role="37wK5m">
               <ref role="3cqZAo" node="5jPBdKClOJ" resolve="ourBackend" />
             </node>
@@ -280,8 +280,8 @@
       <node concept="3clFbS" id="5jPBdKCn42" role="3clF47">
         <node concept="3clFbF" id="5jPBdKCn43" role="3cqZAp">
           <node concept="2YIFZM" id="5jPBdKCopj" role="3clFbG">
-            <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-            <ref role="37wK5l" to="qrld:5jPBdK_JeZ" resolve="clearBackend" />
+            <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+            <ref role="37wK5l" to="w7la:~EvaluationSession.clearBackend(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Backend):void" resolve="clearBackend" />
             <node concept="37vLTw" id="5jPBdKCopk" role="37wK5m">
               <ref role="3cqZAo" node="5jPBdKClOJ" resolve="ourBackend" />
             </node>
@@ -301,7 +301,7 @@
       <node concept="37vLTG" id="2UGjFq4L6qm" role="3clF46">
         <property role="TrG5h" value="sessionSolver" />
         <node concept="3uibUv" id="2UGjFq4L6FD" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
       </node>
       <node concept="3uibUv" id="7ISVfSIeJI" role="3clF45">
@@ -315,7 +315,7 @@
               <ref role="3cqZAo" node="2UGjFq4L6qm" resolve="sessionSolver" />
             </node>
             <node concept="liA8E" id="5jPBdK_Bhd" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:2tcGHBEix86" resolve="init" />
+              <ref role="37wK5l" to="w7la:~SessionSolver.init(jetbrains.mps.logic.reactor.evaluation.EvaluationTrace,jetbrains.mps.logic.reactor.program.PredicateSymbol...):void" resolve="init" />
               <node concept="2OqwBi" id="2tcGHBEeeWu" role="37wK5m">
                 <node concept="37vLTw" id="2tcGHBEeeWv" role="2Oq$k0">
                   <ref role="3cqZAo" node="7ISVfSIeK_" resolve="config" />
@@ -385,7 +385,7 @@
       <node concept="37vLTG" id="7ISVfSIkR3" role="3clF46">
         <property role="TrG5h" value="sessionSolver" />
         <node concept="3uibUv" id="7ISVfSIkVZ" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
       </node>
       <node concept="37vLTG" id="5mr7UHcaZSN" role="3clF46">
@@ -456,7 +456,7 @@
       <property role="TrG5h" value="sessionSolver" />
       <property role="1EzhhJ" value="false" />
       <node concept="3uibUv" id="7ISVfSIg2A" role="3clF45">
-        <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
       </node>
       <node concept="3Tm1VV" id="7ISVfSIg2B" role="1B3o_S" />
       <node concept="3clFbS" id="7ISVfSIg2D" role="3clF47">
@@ -477,7 +477,7 @@
       <node concept="3uibUv" id="7ISVfSIg38" role="3clF45">
         <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
         <node concept="3uibUv" id="7ISVfSIg39" role="11_B2D">
-          <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
         </node>
       </node>
       <node concept="3Tm1VV" id="7ISVfSIg3a" role="1B3o_S" />
@@ -488,14 +488,14 @@
             <node concept="3uibUv" id="5mr7UHcc3fF" role="1tU5fm">
               <ref role="3uigEE" to="33ny:~Set" resolve="Set" />
               <node concept="3uibUv" id="5mr7UHcc3k_" role="11_B2D">
-                <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+                <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
               </node>
             </node>
             <node concept="2ShNRf" id="5mr7UHcc3pl" role="33vP2m">
               <node concept="1pGfFk" id="5mr7UHcc3FZ" role="2ShVmc">
                 <ref role="37wK5l" to="33ny:~HashSet.&lt;init&gt;()" resolve="HashSet" />
                 <node concept="3uibUv" id="5mr7UHcc3MO" role="1pMfVU">
-                  <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+                  <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
                 </node>
               </node>
             </node>
@@ -512,7 +512,7 @@
                   <ref role="37wK5l" to="33ny:~Set.add(java.lang.Object):boolean" resolve="add" />
                   <node concept="2ShNRf" id="5mr7UHcc4ap" role="37wK5m">
                     <node concept="1pGfFk" id="5mr7UHcc4uk" role="2ShVmc">
-                      <ref role="37wK5l" to="rchb:54i3FxcZMv0" resolve="ConstraintSymbol" />
+                      <ref role="37wK5l" to="av0y:~ConstraintSymbol.&lt;init&gt;(java.lang.String,int)" resolve="ConstraintSymbol" />
                       <node concept="2OqwBi" id="5mr7UHcc4xf" role="37wK5m">
                         <node concept="37vLTw" id="5mr7UHcc4w8" role="2Oq$k0">
                           <ref role="3cqZAo" node="7FtwPOZH60R" resolve="c" />
@@ -562,7 +562,7 @@
       <node concept="3uibUv" id="5mr7UHccwFc" role="3clF45">
         <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
         <node concept="3uibUv" id="5mr7UHccwFd" role="11_B2D">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3Tm1VV" id="5mr7UHccwFe" role="1B3o_S" />
@@ -573,14 +573,14 @@
             <node concept="3uibUv" id="5mr7UHccyPi" role="1tU5fm">
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3uibUv" id="5mr7UHccyPj" role="11_B2D">
-                <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
               </node>
             </node>
             <node concept="2ShNRf" id="5mr7UHccyPk" role="33vP2m">
               <node concept="1pGfFk" id="5mr7UHccyPl" role="2ShVmc">
                 <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
                 <node concept="3uibUv" id="5mr7UHccyPm" role="1pMfVU">
-                  <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                  <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                 </node>
               </node>
             </node>
@@ -633,13 +633,13 @@
       <node concept="37vLTG" id="7ISVfSIg3g" role="3clF46">
         <property role="TrG5h" value="symbol" />
         <node concept="3uibUv" id="7ISVfSIg3h" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
         </node>
       </node>
       <node concept="3uibUv" id="7ISVfSIg3i" role="3clF45">
         <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
         <node concept="3uibUv" id="7ISVfSIg3j" role="11_B2D">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3Tm1VV" id="7ISVfSIg3k" role="1B3o_S" />
@@ -650,14 +650,14 @@
             <node concept="3uibUv" id="5mr7UHccnbd" role="1tU5fm">
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3uibUv" id="5mr7UHccnir" role="11_B2D">
-                <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
               </node>
             </node>
             <node concept="2ShNRf" id="5mr7UHccmS2" role="33vP2m">
               <node concept="1pGfFk" id="5mr7UHccnGp" role="2ShVmc">
                 <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
                 <node concept="3uibUv" id="5mr7UHccnRy" role="1pMfVU">
-                  <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                  <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                 </node>
               </node>
             </node>
@@ -691,7 +691,7 @@
                     <ref role="3cqZAo" node="7ISVfSIg3g" resolve="symbol" />
                   </node>
                   <node concept="liA8E" id="5mr7UHccrtw" role="2OqNvi">
-                    <ref role="37wK5l" to="rchb:54i3FxcZMvt" resolve="id" />
+                    <ref role="37wK5l" to="av0y:~Symbol.id():java.lang.String" resolve="id" />
                   </node>
                 </node>
                 <node concept="liA8E" id="5mr7UHccrSj" role="2OqNvi">
@@ -754,7 +754,7 @@
         <node concept="37vLTG" id="6X5F0NgIrCd" role="3clF46">
           <property role="TrG5h" value="program" />
           <node concept="3uibUv" id="6X5F0NgIrCc" role="1tU5fm">
-            <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+            <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
           </node>
         </node>
       </node>
@@ -765,11 +765,11 @@
         <node concept="37vLTG" id="2UGjFq4L1_C" role="3clF46">
           <property role="TrG5h" value="sessionSolver" />
           <node concept="3uibUv" id="2UGjFq4L1_D" role="1tU5fm">
-            <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+            <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
           </node>
         </node>
         <node concept="3uibUv" id="2UGjFq4L1_E" role="3clF45">
-          <ref role="3uigEE" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+          <ref role="3uigEE" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
         </node>
         <node concept="3Tm1VV" id="2UGjFq4L1_F" role="1B3o_S" />
         <node concept="3clFbS" id="2UGjFq4L1_H" role="3clF47">
@@ -777,7 +777,7 @@
             <node concept="3cpWsn" id="7ISVfSIfLp" role="3cpWs9">
               <property role="TrG5h" value="session" />
               <node concept="3uibUv" id="7ISVfSIfLq" role="1tU5fm">
-                <ref role="3uigEE" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+                <ref role="3uigEE" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
               </node>
               <node concept="2OqwBi" id="7ISVfSIfLr" role="33vP2m">
                 <node concept="10M0yZ" id="5mr7UHcbA$d" role="2Oq$k0">
@@ -886,12 +886,12 @@
           <property role="TrG5h" value="predicateSymbols" />
           <node concept="8X2XB" id="5uFPQ7BwuhP" role="1tU5fm">
             <node concept="3uibUv" id="5uFPQ7BZb0v" role="8Xvag">
-              <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+              <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
             </node>
           </node>
         </node>
         <node concept="3uibUv" id="5uFPQ7Bwub9" role="3clF45">
-          <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
+          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
         </node>
         <node concept="3Tm1VV" id="5uFPQ7Bwu9T" role="1B3o_S" />
         <node concept="3clFbS" id="5uFPQ7Bwu9U" role="3clF47">
@@ -922,11 +922,11 @@
         <node concept="37vLTG" id="5mr7UHcbrGT" role="3clF46">
           <property role="TrG5h" value="computingTracer" />
           <node concept="3uibUv" id="5mr7UHcbrPY" role="1tU5fm">
-            <ref role="3uigEE" to="qrld:24Vro6cQnrj" resolve="EvaluationTrace" />
+            <ref role="3uigEE" to="w7la:~EvaluationTrace" resolve="EvaluationTrace" />
           </node>
         </node>
         <node concept="3uibUv" id="5uFPQ7Bwvia" role="3clF45">
-          <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
+          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
         </node>
         <node concept="3Tm1VV" id="5uFPQ7BwvgC" role="1B3o_S" />
         <node concept="3clFbS" id="5uFPQ7BwvgD" role="3clF47">
@@ -965,7 +965,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="5mr7UHcbjuP" role="3clF45">
-          <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
+          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
         </node>
         <node concept="3Tm1VV" id="5mr7UHcbbR5" role="1B3o_S" />
         <node concept="3clFbS" id="5mr7UHcbbR6" role="3clF47">
@@ -1083,7 +1083,7 @@
         <node concept="3Tmbuc" id="5mr7UHcbtUi" role="1B3o_S" />
         <node concept="10Q1$e" id="7ISVfSIix5" role="1tU5fm">
           <node concept="3uibUv" id="7ISVfSIix7" role="10Q1$1">
-            <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+            <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
           </node>
         </node>
       </node>
@@ -1113,7 +1113,7 @@
         <property role="TrG5h" value="computingTracer" />
         <node concept="3Tmbuc" id="5mr7UHcbtYG" role="1B3o_S" />
         <node concept="3uibUv" id="5mr7UHcbs2D" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:24Vro6cQnrj" resolve="EvaluationTrace" />
+          <ref role="3uigEE" to="w7la:~EvaluationTrace" resolve="EvaluationTrace" />
         </node>
       </node>
       <node concept="2tJIrI" id="5mr7UHcbDBk" role="jymVt" />
@@ -1121,12 +1121,12 @@
         <property role="TrG5h" value="program" />
         <node concept="3Tmbuc" id="6X5F0NgMn8h" role="1B3o_S" />
         <node concept="3uibUv" id="6MYr6JxCh0r" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+          <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
         </node>
       </node>
       <node concept="3Tm1VV" id="5mr7UHcbv_2" role="1B3o_S" />
       <node concept="3uibUv" id="5mr7UHcbvZ3" role="1zkMxy">
-        <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
+        <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
       </node>
     </node>
     <node concept="2tJIrI" id="5mr7UHcbvhQ" role="jymVt" />
@@ -1135,7 +1135,7 @@
       <property role="TrG5h" value="Backend" />
       <node concept="3Tm6S6" id="7ISVfSIeVT" role="1B3o_S" />
       <node concept="3uibUv" id="7ISVfSIeul" role="EKbjA">
-        <ref role="3uigEE" to="qrld:5uFPQ7BwtoR" resolve="EvaluationSession.Backend" />
+        <ref role="3uigEE" to="w7la:~EvaluationSession$Backend" resolve="EvaluationSession.Backend" />
       </node>
       <node concept="2tJIrI" id="7ISVfSIewM" role="jymVt" />
       <node concept="Wx3nA" id="7ISVfSIeA4" role="jymVt">
@@ -1144,14 +1144,14 @@
         <node concept="3uibUv" id="7ISVfSIeBy" role="1tU5fm">
           <ref role="3uigEE" to="wyt6:~ThreadLocal" resolve="ThreadLocal" />
           <node concept="3uibUv" id="7ISVfSIeDf" role="11_B2D">
-            <ref role="3uigEE" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+            <ref role="3uigEE" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
           </node>
         </node>
         <node concept="2ShNRf" id="7ISVfSIeHb" role="33vP2m">
           <node concept="1pGfFk" id="7ISVfSIeH8" role="2ShVmc">
             <ref role="37wK5l" to="wyt6:~ThreadLocal.&lt;init&gt;()" resolve="ThreadLocal" />
             <node concept="3uibUv" id="7ISVfSIeH9" role="1pMfVU">
-              <ref role="3uigEE" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+              <ref role="3uigEE" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
             </node>
           </node>
         </node>
@@ -1161,7 +1161,7 @@
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="current" />
         <node concept="3uibUv" id="7ISVfSIeuD" role="3clF45">
-          <ref role="3uigEE" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+          <ref role="3uigEE" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
         </node>
         <node concept="3Tm1VV" id="7ISVfSIeuE" role="1B3o_S" />
         <node concept="3clFbS" id="7ISVfSIeuG" role="3clF47">
@@ -1169,7 +1169,7 @@
             <node concept="3cpWsn" id="7ISVfSIffT" role="3cpWs9">
               <property role="TrG5h" value="session" />
               <node concept="3uibUv" id="7ISVfSIffN" role="1tU5fm">
-                <ref role="3uigEE" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+                <ref role="3uigEE" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
               </node>
               <node concept="2OqwBi" id="7ISVfSIffU" role="33vP2m">
                 <node concept="37vLTw" id="7ISVfSIffV" role="2Oq$k0">
@@ -1215,11 +1215,11 @@
         <node concept="37vLTG" id="6X5F0NgIqD5" role="3clF46">
           <property role="TrG5h" value="program" />
           <node concept="3uibUv" id="6X5F0NgIqJ5" role="1tU5fm">
-            <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+            <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
           </node>
         </node>
         <node concept="3uibUv" id="5mr7UHcbuUR" role="3clF45">
-          <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
+          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
         </node>
         <node concept="3Tm1VV" id="5mr7UHcbuUS" role="1B3o_S" />
         <node concept="3clFbS" id="5mr7UHcbuUU" role="3clF47">
@@ -1242,7 +1242,7 @@
         <node concept="37vLTG" id="5jPBdKHxjt" role="3clF46">
           <property role="TrG5h" value="session" />
           <node concept="3uibUv" id="5jPBdKHxju" role="1tU5fm">
-            <ref role="3uigEE" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+            <ref role="3uigEE" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
           </node>
         </node>
         <node concept="3cqZAl" id="5jPBdKHxjv" role="3clF45" />
@@ -1295,7 +1295,7 @@
         <node concept="37vLTG" id="5jPBdKJwB8" role="3clF46">
           <property role="TrG5h" value="session" />
           <node concept="3uibUv" id="5jPBdKJwB9" role="1tU5fm">
-            <ref role="3uigEE" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+            <ref role="3uigEE" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
           </node>
         </node>
         <node concept="3cqZAl" id="5jPBdKJwBa" role="3clF45" />
@@ -1346,13 +1346,13 @@
     <node concept="2tJIrI" id="7ISVfSIeeE" role="jymVt" />
     <node concept="3Tm1VV" id="7ISVfSIedR" role="1B3o_S" />
     <node concept="3uibUv" id="7ISVfSIefW" role="1zkMxy">
-      <ref role="3uigEE" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+      <ref role="3uigEE" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
     </node>
     <node concept="312cEg" id="7ISVfSIlkQ" role="jymVt">
       <property role="TrG5h" value="sessionSolver" />
       <node concept="3Tm6S6" id="7ISVfSIlkR" role="1B3o_S" />
       <node concept="3uibUv" id="7ISVfSIlkT" role="1tU5fm">
-        <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
       </node>
     </node>
     <node concept="312cEg" id="5mr7UHcbWmK" role="jymVt">
@@ -1433,13 +1433,13 @@
       <node concept="37vLTG" id="5mr7UHcaVA5" role="3clF46">
         <property role="TrG5h" value="computingSession" />
         <node concept="3uibUv" id="5mr7UHcaVA4" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
       </node>
       <node concept="37vLTG" id="7feMCq_d4AN" role="3clF46">
         <property role="TrG5h" value="computingTracer" />
         <node concept="3uibUv" id="7feMCq_d4MB" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:24Vro6cQnrj" resolve="EvaluationTrace" />
+          <ref role="3uigEE" to="w7la:~EvaluationTrace" resolve="EvaluationTrace" />
         </node>
       </node>
       <node concept="37vLTG" id="5jPBdKDv53" role="3clF46">
@@ -1653,10 +1653,10 @@
                       <ref role="3cqZAo" node="7feMCq_d56g" resolve="computingTracer" />
                     </node>
                     <node concept="liA8E" id="7feMCq_d6Sw" role="2OqNvi">
-                      <ref role="37wK5l" to="qrld:7vxJ_H4th$o" resolve="failure" />
+                      <ref role="37wK5l" to="w7la:~EvaluationTrace.failure(jetbrains.mps.logic.reactor.evaluation.EvaluationFailureException):void" resolve="failure" />
                       <node concept="2ShNRf" id="7vxJ_H4u2Pw" role="37wK5m">
                         <node concept="1pGfFk" id="7vxJ_H4u2Pn" role="2ShVmc">
-                          <ref role="37wK5l" to="qrld:7vxJ_H4qqnq" resolve="EvaluationFailureException" />
+                          <ref role="37wK5l" to="w7la:~EvaluationFailureException.&lt;init&gt;(java.lang.Throwable)" resolve="EvaluationFailureException" />
                           <node concept="37vLTw" id="7vxJ_H4u2QX" role="37wK5m">
                             <ref role="3cqZAo" node="41ox5VneSgC" resolve="exception" />
                           </node>
@@ -1903,14 +1903,14 @@
               <node concept="3cpWsn" id="4XdxyAO8bB_" role="3cpWs9">
                 <property role="TrG5h" value="queryable" />
                 <node concept="3uibUv" id="5uFPQ7C2K5F" role="1tU5fm">
-                  <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+                  <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
                 </node>
                 <node concept="2OqwBi" id="4xBopTzsMVj" role="33vP2m">
                   <node concept="37vLTw" id="4xBopTzsMSX" role="2Oq$k0">
                     <ref role="3cqZAo" node="4xBopTzsgb1" resolve="sessionSolver" />
                   </node>
                   <node concept="liA8E" id="4xBopTzsN2B" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:4xBopTzsxxs" resolve="lookupQueryable" />
+                    <ref role="37wK5l" to="w7la:~SessionSolver.lookupQueryable(java.lang.Class):jetbrains.mps.logic.reactor.evaluation.Queryable" resolve="lookupQueryable" />
                     <node concept="AH0OO" id="4xBopTzsNgy" role="37wK5m">
                       <node concept="37vLTw" id="4xBopTzsNjV" role="AHEQo">
                         <ref role="3cqZAo" node="4XdxyAO7SVY" resolve="i" />
@@ -2007,7 +2007,7 @@
       <node concept="37vLTG" id="4xBopTzsgb1" role="3clF46">
         <property role="TrG5h" value="sessionSolver" />
         <node concept="3uibUv" id="4xBopTzsgXB" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
       </node>
       <node concept="3uibUv" id="41ox5VndY2j" role="3clF45">
@@ -2034,7 +2034,7 @@
       <property role="TrG5h" value="computingSession" />
       <node concept="3Tm6S6" id="5mr7UHcaVDp" role="1B3o_S" />
       <node concept="3uibUv" id="5mr7UHcaVDr" role="1tU5fm">
-        <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
       </node>
     </node>
     <node concept="312cEg" id="5jPBdKDvkn" role="jymVt">
@@ -2058,7 +2058,7 @@
       <property role="TrG5h" value="computingTracer" />
       <node concept="3Tm6S6" id="7feMCq_d56h" role="1B3o_S" />
       <node concept="3uibUv" id="7feMCq_d56j" role="1tU5fm">
-        <ref role="3uigEE" to="qrld:24Vro6cQnrj" resolve="EvaluationTrace" />
+        <ref role="3uigEE" to="w7la:~EvaluationTrace" resolve="EvaluationTrace" />
       </node>
     </node>
   </node>
@@ -2082,11 +2082,11 @@
           <node concept="3cpWsn" id="5mr7UHcchxh" role="3cpWs9">
             <property role="TrG5h" value="symbol" />
             <node concept="3uibUv" id="5mr7UHcchxd" role="1tU5fm">
-              <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+              <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
             </node>
             <node concept="2ShNRf" id="5mr7UHcchxi" role="33vP2m">
               <node concept="1pGfFk" id="5mr7UHcchxj" role="2ShVmc">
-                <ref role="37wK5l" to="rchb:54i3FxcZMv0" resolve="ConstraintSymbol" />
+                <ref role="37wK5l" to="av0y:~ConstraintSymbol.&lt;init&gt;(java.lang.String,int)" resolve="ConstraintSymbol" />
                 <node concept="2OqwBi" id="5mr7UHcchxk" role="37wK5m">
                   <node concept="37vLTw" id="5mr7UHcchxl" role="2Oq$k0">
                     <ref role="3cqZAo" node="5mr7UHcch4f" resolve="c" />
@@ -2132,7 +2132,7 @@
       <node concept="37vLTG" id="5mr7UHccgR4" role="3clF46">
         <property role="TrG5h" value="constraintSymbol" />
         <node concept="3uibUv" id="5mr7UHccgRZ" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
         </node>
       </node>
       <node concept="37vLTG" id="5mr7UHccgSi" role="3clF46">
@@ -2157,7 +2157,7 @@
           <node concept="2ShNRf" id="4sSe4$oSSCq" role="37wK5m">
             <node concept="3$_iS1" id="4sSe4$oSSCo" role="2ShVmc">
               <node concept="3uibUv" id="4sSe4$oSSCp" role="3$_nBY">
-                <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
               </node>
               <node concept="3$GHV9" id="4sSe4$oSTzC" role="3$GQph">
                 <node concept="3cmrfG" id="4sSe4$oSTGJ" role="3$I4v7">
@@ -2175,13 +2175,13 @@
       <ref role="3uigEE" to="yg8f:5uFPQ7BZsAX" resolve="AbstractConstraint" />
     </node>
     <node concept="3uibUv" id="5mr7UHcclM3" role="EKbjA">
-      <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+      <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
     </node>
     <node concept="3clFb_" id="5mr7UHcclSi" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="constraint" />
-      <node concept="3uibUv" id="5mr7UHcclSj" role="3clF45">
-        <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+      <node concept="3uibUv" id="1HG00HG3kct" role="3clF45">
+        <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
       </node>
       <node concept="3Tm1VV" id="5mr7UHcclSk" role="1B3o_S" />
       <node concept="3clFbS" id="5mr7UHcclSn" role="3clF47">
@@ -2215,7 +2215,7 @@
                     <ref role="37wK5l" to="yg8f:5uFPQ7BZsCD" resolve="symbol" />
                   </node>
                   <node concept="liA8E" id="5jPBdKP5Wb" role="2OqNvi">
-                    <ref role="37wK5l" to="rchb:54i3FxcZMvt" resolve="id" />
+                    <ref role="37wK5l" to="av0y:~Symbol.id():java.lang.String" resolve="id" />
                   </node>
                 </node>
               </node>
diff --git a/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index 939813a8..996478a9 100644
--- a/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -15,7 +15,7 @@
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
@@ -328,7 +328,7 @@
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="7nPD14NOHH4" role="37wK5m">
                 <node concept="1pGfFk" id="7nPD14NOHH5" role="2ShVmc">
-                  <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
+                  <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.Class)" resolve="MetaLogical" />
                   <node concept="3VsKOn" id="2Dg5bSg3QiY" role="37wK5m">
                     <ref role="3VsUkX" to="wyt6:~String" resolve="String" />
                   </node>
@@ -343,7 +343,7 @@
             <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
             <node concept="2ShNRf" id="2Dg5bSg3RdY" role="37wK5m">
               <node concept="1pGfFk" id="2Dg5bSg3RdZ" role="2ShVmc">
-                <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
+                <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.Class)" resolve="MetaLogical" />
                 <node concept="3VsKOn" id="2Dg5bSg3Rjh" role="37wK5m">
                   <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -907,7 +907,7 @@
             <node concept="3cpWsn" id="1mP5b6jOPFT" role="3cpWs9">
               <property role="TrG5h" value="lv" />
               <node concept="3uibUv" id="dfChU1kjs$" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                 <node concept="raruj" id="dfChU1koS6" role="lGtFl" />
                 <node concept="29HgVG" id="1sCZQVfbz8D" role="lGtFl">
                   <node concept="3NFfHV" id="1sCZQVfbz8E" role="3NFExx">
@@ -938,7 +938,7 @@
             <node concept="3cpWsn" id="7HUwyZb1KbI" role="3cpWs9">
               <property role="TrG5h" value="lv" />
               <node concept="3uibUv" id="7HUwyZb1KbJ" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:7HUwyZaNIC5" resolve="MultiMetaLogical" />
+                <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
                 <node concept="raruj" id="7HUwyZb1KbK" role="lGtFl" />
                 <node concept="29HgVG" id="7HUwyZb1KbL" role="lGtFl">
                   <node concept="3NFfHV" id="7HUwyZb1KbM" role="3NFExx">
@@ -979,7 +979,7 @@
             <node concept="3cpWsn" id="677NV56tBWz" role="3cpWs9">
               <property role="TrG5h" value="mlp" />
               <node concept="3uibUv" id="7HUwyZb7bp_" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:7HUwyZaNIC5" resolve="MultiMetaLogical" />
+                <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
               </node>
             </node>
           </node>
@@ -1028,7 +1028,7 @@
                   <property role="TrG5h" value="dummy" />
                   <node concept="2DMOqp" id="7HUwyZb7b4f" role="1YbcFS">
                     <node concept="3uibUv" id="7HUwyZb7b4g" role="2DMOqq">
-                      <ref role="3uigEE" to="45ys:7HUwyZaNIC5" resolve="MultiMetaLogical" />
+                      <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
                     </node>
                   </node>
                 </node>
@@ -1051,7 +1051,7 @@
             <node concept="3cpWsn" id="677NV56tAlm" role="3cpWs9">
               <property role="TrG5h" value="logical" />
               <node concept="3uibUv" id="7HUwyZb7bYW" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
               </node>
             </node>
           </node>
@@ -1095,7 +1095,7 @@
                   <property role="TrG5h" value="dummy" />
                   <node concept="2DMOqp" id="7HUwyZb7bxR" role="1YbcFS">
                     <node concept="3uibUv" id="7HUwyZb7bxS" role="2DMOqq">
-                      <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                      <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                     </node>
                   </node>
                 </node>
@@ -1136,7 +1136,7 @@
                   <property role="TrG5h" value="dummy" />
                   <node concept="2DMOqp" id="514BAS_YAHp" role="1YbcFS">
                     <node concept="3uibUv" id="3mz2_dYrgHu" role="2DMOqq">
-                      <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                      <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                     </node>
                   </node>
                 </node>
@@ -1152,7 +1152,7 @@
             <node concept="3cpWsn" id="514BAS_YBDv" role="3cpWs9">
               <property role="TrG5h" value="logical" />
               <node concept="3uibUv" id="3mz2_dYuqQi" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
               </node>
             </node>
           </node>
@@ -1281,7 +1281,7 @@
             <node concept="3cpWsn" id="6dMt3c5appH" role="3cpWs9">
               <property role="TrG5h" value="multiMetaLogical" />
               <node concept="3uibUv" id="7HUwyZaNQoy" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:7HUwyZaNIC5" resolve="MultiMetaLogical" />
+                <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
               </node>
             </node>
           </node>
@@ -1343,7 +1343,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="7HUwyZaNQGE" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:7HUwyZaNHY_" resolve="logicalAt" />
+                <ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int):jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="logicalAt" />
                 <node concept="3cmrfG" id="7HUwyZaNQHA" role="37wK5m">
                   <property role="3cmrfH" value="0" />
                   <node concept="29HgVG" id="7HUwyZaNQHB" role="lGtFl">
@@ -1392,7 +1392,7 @@
             <node concept="3cpWsn" id="6dMt3c5aqjp" role="3cpWs9">
               <property role="TrG5h" value="metaLogical" />
               <node concept="3uibUv" id="7HUwyZaNHmx" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
               </node>
             </node>
           </node>
diff --git a/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index dfd27141..2d300610 100644
--- a/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -52,7 +52,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
         <module reference="85f64970-3326-4ea7-966e-1ac904686424(jetbrains.mps.logic#6626732309150416985)" version="0" />
-        <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
         <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
         <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
       </dependencyVersions>
@@ -135,7 +134,6 @@
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
-    <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/intentions.mps b/logic/languages/jetbrains.mps.logic/languageModels/intentions.mps
index 13b2afc5..1671cc52 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/intentions.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/intentions.mps
@@ -14,23 +14,15 @@
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-    <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.typesystem2.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
-        <child id="1068498886297" name="rValue" index="37vLTx" />
-        <child id="1068498886295" name="lValue" index="37vLTJ" />
-      </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
-      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
-        <child id="1145553007750" name="creator" index="2ShVmc" />
-      </concept>
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
@@ -50,7 +42,6 @@
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
-      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
@@ -84,13 +75,6 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
-        <property id="6329021646629104958" name="text" index="3SKdUp" />
-      </concept>
-      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
-        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
-      </concept>
-      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
@@ -134,10 +118,6 @@
       <concept id="1138661924179" name="jetbrains.mps.lang.smodel.structure.Property_SetOperation" flags="nn" index="tyxLq">
         <child id="1138662048170" name="value" index="tz02z" />
       </concept>
-      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
-        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
-      </concept>
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS" />
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
@@ -148,10 +128,6 @@
         <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
       </concept>
       <concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz" />
-      <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
-      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
-        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
-      </concept>
       <concept id="6870613620390542976" name="jetbrains.mps.lang.smodel.structure.ConceptAliasOperation" flags="ng" index="3n3YKJ" />
       <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
@@ -159,9 +135,6 @@
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
       </concept>
-      <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
-        <child id="1180636770616" name="createdType" index="3zrR0E" />
-      </concept>
       <concept id="6407023681583036853" name="jetbrains.mps.lang.smodel.structure.NodeAttributeQualifier" flags="ng" index="3CFYIy">
         <reference id="6407023681583036854" name="attributeConcept" index="3CFYIx" />
       </concept>
@@ -173,23 +146,11 @@
         <child id="1240930317927" name="operation" index="3Hdvt7" />
       </concept>
       <concept id="1240930444980" name="jetbrains.mps.lang.smodel.structure.SEnum_MembersOperation" flags="ng" index="3HdYuk" />
-      <concept id="1140131837776" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithAnotherOperation" flags="nn" index="1P9Npp">
-        <child id="1140131861877" name="replacementNode" index="1P9ThW" />
-      </concept>
       <concept id="1140133623887" name="jetbrains.mps.lang.smodel.structure.Node_DeleteOperation" flags="nn" index="1PgB_6" />
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <property id="1238684351431" name="asCast" index="1BlNFB" />
-      </concept>
-      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
-        <reference id="1138405853777" name="concept" index="ehGHo" />
-      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
       <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
         <reference id="1138056395725" name="property" index="3TsBF5" />
       </concept>
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
-      <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -459,127 +420,5 @@
       </node>
     </node>
   </node>
-  <node concept="2S6QgY" id="4sSe4$p4oTF">
-    <property role="3GE5qa" value="logical" />
-    <property role="TrG5h" value="LogicalVariable_specifyValue" />
-    <ref role="2ZfgGC" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
-    <node concept="2S6ZIM" id="4sSe4$p4oTG" role="2ZfVej">
-      <node concept="3clFbS" id="4sSe4$p4oTH" role="2VODD2">
-        <node concept="3clFbF" id="4sSe4$p4p2B" role="3cqZAp">
-          <node concept="Xl_RD" id="4sSe4$p4p2A" role="3clFbG">
-            <property role="Xl_RC" value="Specify Value" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2Sbjvc" id="4sSe4$p4oTI" role="2ZfgGD">
-      <node concept="3clFbS" id="4sSe4$p4oTJ" role="2VODD2">
-        <node concept="3cpWs8" id="4sSe4$p4w5F" role="3cqZAp">
-          <node concept="3cpWsn" id="4sSe4$p4w5G" role="3cpWs9">
-            <property role="TrG5h" value="alv" />
-            <node concept="3Tqbb2" id="4sSe4$p4w5D" role="1tU5fm">
-              <ref role="ehGHo" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
-            </node>
-            <node concept="2ShNRf" id="4sSe4$p4w5H" role="33vP2m">
-              <node concept="3zrR0B" id="4sSe4$p4w5I" role="2ShVmc">
-                <node concept="3Tqbb2" id="4sSe4$p4w5J" role="3zrR0E">
-                  <ref role="ehGHo" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="4sSe4$p4FXc" role="3cqZAp">
-          <node concept="2OqwBi" id="4sSe4$p4G3j" role="3clFbG">
-            <node concept="2Sf5sV" id="4sSe4$p4FXa" role="2Oq$k0" />
-            <node concept="1P9Npp" id="4sSe4$p4Ggq" role="2OqNvi">
-              <node concept="37vLTw" id="4sSe4$p4Gl8" role="1P9ThW">
-                <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="alv" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="4sSe4$p4vIY" role="3cqZAp">
-          <node concept="37vLTI" id="4sSe4$p4wuf" role="3clFbG">
-            <node concept="2OqwBi" id="4sSe4$p4wBZ" role="37vLTx">
-              <node concept="2Sf5sV" id="4sSe4$p4wyl" role="2Oq$k0" />
-              <node concept="3YRAZt" id="4sSe4$p4wJS" role="2OqNvi" />
-            </node>
-            <node concept="2OqwBi" id="4sSe4$p4we2" role="37vLTJ">
-              <node concept="37vLTw" id="4sSe4$p4w5K" role="2Oq$k0">
-                <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="alv" />
-              </node>
-              <node concept="3TrEf2" id="4sSe4$p4wkM" role="2OqNvi">
-                <ref role="3Tt5mk" to="5j4j:4sSe4$p4oON" resolve="variable" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="4sSe4$p4wSN" role="3cqZAp">
-          <node concept="37vLTI" id="4sSe4$p4xi2" role="3clFbG">
-            <node concept="2ShNRf" id="4sSe4$p4xmN" role="37vLTx">
-              <node concept="3zrR0B" id="4sSe4$p4xmL" role="2ShVmc">
-                <node concept="3Tqbb2" id="4sSe4$p4xmM" role="3zrR0E">
-                  <ref role="ehGHo" to="5j4j:7E86$tKskWj" resolve="LogicalValue" />
-                </node>
-              </node>
-            </node>
-            <node concept="2OqwBi" id="4sSe4$p4wYQ" role="37vLTJ">
-              <node concept="37vLTw" id="4sSe4$p4wSL" role="2Oq$k0">
-                <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="alv" />
-              </node>
-              <node concept="3TrEf2" id="4sSe4$p4x9l" role="2OqNvi">
-                <ref role="3Tt5mk" to="5j4j:4sSe4$p4oOP" resolve="value" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2SaL7w" id="4sSe4$p4paM" role="2ZfVeh">
-      <node concept="3clFbS" id="4sSe4$p4paN" role="2VODD2">
-        <node concept="3SKdUt" id="4sSe4$p4t4D" role="3cqZAp">
-          <node concept="3SKdUq" id="4sSe4$p4t4F" role="3SKWNk">
-            <property role="3SKdUp" value="applicable to logical variables in user constraints within rule's head block" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="4sSe4$p4rMM" role="3cqZAp">
-          <node concept="1Wc70l" id="4sSe4$p4s9Q" role="3clFbG">
-            <node concept="2OqwBi" id="4sSe4$p4sDs" role="3uHU7w">
-              <node concept="2OqwBi" id="4sSe4$p4sje" role="2Oq$k0">
-                <node concept="2Sf5sV" id="4sSe4$p4sd_" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="4sSe4$p4sv3" role="2OqNvi">
-                  <node concept="1xMEDy" id="4sSe4$p4sv5" role="1xVPHs">
-                    <node concept="chp4Y" id="4sSe4$p4szo" role="ri$Ld">
-                      <ref role="cht4Q" to="wq2x:6p0DfM0a3gA" resolve="Head" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3x8VRR" id="4sSe4$p4sQk" role="2OqNvi" />
-            </node>
-            <node concept="2OqwBi" id="4sSe4$p4rUe" role="3uHU7B">
-              <node concept="2OqwBi" id="4sSe4$p4rMO" role="2Oq$k0">
-                <node concept="1PxgMI" id="4sSe4$p4rMP" role="2Oq$k0">
-                  <property role="1BlNFB" value="true" />
-                  <ref role="1m5ApE" to="wq2x:6p0DfM0ang5" resolve="UserConstraint" />
-                  <node concept="2OqwBi" id="4sSe4$p4rMQ" role="1m5AlR">
-                    <node concept="2Sf5sV" id="4sSe4$p4rMR" role="2Oq$k0" />
-                    <node concept="1mfA1w" id="4sSe4$p4rMS" role="2OqNvi" />
-                  </node>
-                </node>
-                <node concept="1mfA1w" id="4sSe4$p4rMT" role="2OqNvi" />
-              </node>
-              <node concept="1mIQ4w" id="4sSe4$p4s00" role="2OqNvi">
-                <node concept="chp4Y" id="4sSe4$p4s3a" role="cj9EA">
-                  <ref role="cht4Q" to="wq2x:6p0DfM0a6KG" resolve="EmitConstraintStatement" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
 </model>
 
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
index 866cfc0e..aad5bbf5 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
@@ -9,7 +9,7 @@
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
@@ -212,8 +212,8 @@
     <node concept="3clFbS" id="1mP5b6jNJDk" role="2sgrp5">
       <node concept="3clFbF" id="7HUwyZb13M4" role="3cqZAp">
         <node concept="2c44tf" id="7HUwyZb13M2" role="3clFbG">
-          <node concept="3uibUv" id="7HUwyZb13MN" role="2c44tc">
-            <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+          <node concept="3uibUv" id="1HG00HGaSgq" role="2c44tc">
+            <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
           </node>
         </node>
       </node>
@@ -253,7 +253,7 @@
                 <property role="TrG5h" value="il" />
                 <node concept="2DMOqp" id="2S_ORi36mSh" role="1YbcFS">
                   <node concept="3uibUv" id="7HUwyZb3e5O" role="2DMOqq">
-                    <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                    <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                   </node>
                 </node>
               </node>
@@ -437,7 +437,7 @@
                     </node>
                     <node concept="2c44tf" id="6MYr6Jy87W1" role="3JuZjQ">
                       <node concept="3uibUv" id="6MYr6Jy87W2" role="2c44tc">
-                        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                        <ref role="3uigEE" to="bj13:1mP5b6jQP$C" resolve="Logical" />
                         <node concept="3uibUv" id="6MYr6Jy87W3" role="11_B2D">
                           <ref role="3uigEE" to="wyt6:~String" resolve="String" />
                         </node>
@@ -608,8 +608,8 @@
     <node concept="3clFbS" id="7HUwyZb1IYz" role="2sgrp5">
       <node concept="3clFbF" id="7HUwyZb1IYI" role="3cqZAp">
         <node concept="2c44tf" id="7HUwyZb1IYG" role="3clFbG">
-          <node concept="3uibUv" id="7HUwyZb1IZt" role="2c44tc">
-            <ref role="3uigEE" to="45ys:7HUwyZaNIC5" resolve="MultiMetaLogical" />
+          <node concept="3uibUv" id="1HG00HGaTIh" role="2c44tc">
+            <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
           </node>
         </node>
       </node>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
index 92ed15e1..f4f20457 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
@@ -10,9 +10,9 @@
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
-    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
-    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
+    <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
@@ -245,7 +245,7 @@
       <node concept="37vLTG" id="7HUwyZb7b7D" role="3clF46">
         <property role="TrG5h" value="multiMetaLogical" />
         <node concept="3uibUv" id="7HUwyZb7bf2" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:7HUwyZaNIC5" resolve="MultiMetaLogical" />
+          <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
         </node>
       </node>
       <node concept="10Q1$e" id="7HUwyZb7b7G" role="3clF45">
@@ -271,7 +271,7 @@
                       <ref role="3cqZAo" node="7HUwyZb7b7D" resolve="multiMetaLogical" />
                     </node>
                     <node concept="liA8E" id="7HUwyZbdR3y" role="2OqNvi">
-                      <ref role="37wK5l" to="45ys:7HUwyZaC4ZZ" resolve="cardinality" />
+                      <ref role="37wK5l" to="bj13:~MultiMetaLogical.cardinality():int" resolve="cardinality" />
                     </node>
                   </node>
                 </node>
@@ -301,7 +301,7 @@
                       <ref role="3cqZAo" node="7HUwyZb7b7D" resolve="multiMetaLogical" />
                     </node>
                     <node concept="liA8E" id="7HUwyZbdRgZ" role="2OqNvi">
-                      <ref role="37wK5l" to="45ys:7HUwyZaNHY_" resolve="logicalAt" />
+                      <ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int):jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="logicalAt" />
                       <node concept="37vLTw" id="7HUwyZbdRiC" role="37wK5m">
                         <ref role="3cqZAo" node="7HUwyZb7b8h" resolve="i" />
                       </node>
@@ -327,7 +327,7 @@
                 <ref role="3cqZAo" node="7HUwyZb7b7D" resolve="multiMetaLogical" />
               </node>
               <node concept="liA8E" id="7HUwyZbdR6B" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:7HUwyZaC4ZZ" resolve="cardinality" />
+                <ref role="37wK5l" to="bj13:~MultiMetaLogical.cardinality():int" resolve="cardinality" />
               </node>
             </node>
           </node>
@@ -353,7 +353,7 @@
       <node concept="37vLTG" id="7HUwyZb7chk" role="3clF46">
         <property role="TrG5h" value="metaLogical" />
         <node concept="3uibUv" id="7HUwyZb7chm" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
           <node concept="3qTvmN" id="4TCblo5YIjG" role="11_B2D" />
         </node>
       </node>
@@ -380,7 +380,7 @@
       <node concept="37vLTG" id="4TCblo5YI1I" role="3clF46">
         <property role="TrG5h" value="logical" />
         <node concept="3uibUv" id="4TCblo5YI1J" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="16syzq" id="4TCblo5YIOD" role="11_B2D">
             <ref role="16sUi3" node="4TCblo5YIIG" resolve="T" />
           </node>
@@ -450,7 +450,7 @@
       <node concept="37vLTG" id="4TCblo5NkwR" role="3clF46">
         <property role="TrG5h" value="logicalContext" />
         <node concept="3uibUv" id="4TCblo5Nk_K" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:7IvepusY4Ez" resolve="LogicalContext" />
+          <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
         </node>
       </node>
       <node concept="3uibUv" id="4TCblo5Nlai" role="3clF45">
@@ -486,7 +486,7 @@
         <node concept="37vLTG" id="4TCblo5MI32" role="3clF46">
           <property role="TrG5h" value="logicalContext" />
           <node concept="3uibUv" id="4TCblo5MI31" role="1tU5fm">
-            <ref role="3uigEE" to="45ys:7IvepusY4Ez" resolve="LogicalContext" />
+            <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
           </node>
         </node>
       </node>
@@ -556,7 +556,7 @@
                         <ref role="3cqZAo" node="4TCblo5MI7r" resolve="logicalContext" />
                       </node>
                       <node concept="liA8E" id="4TCblo5PabF" role="2OqNvi">
-                        <ref role="37wK5l" to="45ys:7IvepusY4EY" resolve="variable" />
+                        <ref role="37wK5l" to="bj13:~LogicalContext.variable(jetbrains.mps.logic.reactor.logical.MetaLogical):jetbrains.mps.logic.reactor.logical.Logical" resolve="variable" />
                         <node concept="2OqwBi" id="4TCblo5PabG" role="37wK5m">
                           <node concept="1eOMI4" id="4TCblo5PabH" role="2Oq$k0">
                             <node concept="10QFUN" id="4TCblo5PabI" role="1eOMHV">
@@ -612,7 +612,7 @@
         <property role="TrG5h" value="logicalContext" />
         <node concept="3Tm6S6" id="4TCblo5MI7s" role="1B3o_S" />
         <node concept="3uibUv" id="4TCblo5MI7u" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:7IvepusY4Ez" resolve="LogicalContext" />
+          <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
         </node>
       </node>
     </node>
@@ -630,7 +630,7 @@
         <node concept="YS8fn" id="5_6ImQZ8jaz" role="3cqZAp">
           <node concept="2ShNRf" id="5_6ImQZ8jaX" role="YScLw">
             <node concept="1pGfFk" id="5_6ImQZ8l0Z" role="2ShVmc">
-              <ref role="37wK5l" to="qrld:7vxJ_H4qql2" resolve="EvaluationFailureException" />
+              <ref role="37wK5l" to="w7la:~EvaluationFailureException.&lt;init&gt;(java.lang.String)" resolve="EvaluationFailureException" />
               <node concept="37vLTw" id="5_6ImQZ8l2j" role="37wK5m">
                 <ref role="3cqZAo" node="5_6ImQZ8l1u" resolve="message" />
               </node>
@@ -654,7 +654,7 @@
       <node concept="37vLTG" id="7nkyKX7gU0U" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="5mr7UHccdcS" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="7nkyKX7gU0Y" role="3clF45" />
@@ -668,7 +668,7 @@
       <node concept="37vLTG" id="7nkyKX7gU3M" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="5mr7UHccdlH" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="7nkyKX7gU3Q" role="3clF45" />
@@ -704,7 +704,7 @@
               <node concept="37vLTG" id="1n2ZgJ3M2s1" role="3clF46">
                 <property role="TrG5h" value="occurrence" />
                 <node concept="3uibUv" id="1n2ZgJ3M2s2" role="1tU5fm">
-                  <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                  <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                 </node>
               </node>
               <node concept="3cqZAl" id="1n2ZgJ3M2s3" role="3clF45" />
@@ -717,7 +717,7 @@
               <node concept="37vLTG" id="1n2ZgJ3M2sa" role="3clF46">
                 <property role="TrG5h" value="occurrence" />
                 <node concept="3uibUv" id="1n2ZgJ3M2sb" role="1tU5fm">
-                  <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                  <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                 </node>
               </node>
               <node concept="3cqZAl" id="1n2ZgJ3M2sc" role="3clF45" />
@@ -730,7 +730,7 @@
               <node concept="37vLTG" id="1n2ZgJ3M2sj" role="3clF46">
                 <property role="TrG5h" value="occurrence" />
                 <node concept="3uibUv" id="1n2ZgJ3M2sk" role="1tU5fm">
-                  <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                  <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                 </node>
               </node>
               <node concept="3cqZAl" id="1n2ZgJ3M2sl" role="3clF45" />
@@ -743,7 +743,7 @@
               <node concept="37vLTG" id="1n2ZgJ3M2ss" role="3clF46">
                 <property role="TrG5h" value="occurrence" />
                 <node concept="3uibUv" id="1n2ZgJ3M2st" role="1tU5fm">
-                  <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                  <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                 </node>
               </node>
               <node concept="3cqZAl" id="1n2ZgJ3M2su" role="3clF45" />
@@ -756,7 +756,7 @@
               <node concept="37vLTG" id="4TCblo5JLfn" role="3clF46">
                 <property role="TrG5h" value="matchRule" />
                 <node concept="3uibUv" id="4TCblo5JLfk" role="1tU5fm">
-                  <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+                  <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
                 </node>
               </node>
               <node concept="3cqZAl" id="1n2ZgJ3MiVq" role="3clF45" />
@@ -769,7 +769,7 @@
               <node concept="37vLTG" id="2_NfR5whEhG" role="3clF46">
                 <property role="TrG5h" value="matchRule" />
                 <node concept="3uibUv" id="2_NfR5whEhH" role="1tU5fm">
-                  <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+                  <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
                 </node>
               </node>
               <node concept="3cqZAl" id="2_NfR5whEhI" role="3clF45" />
@@ -782,7 +782,7 @@
               <node concept="37vLTG" id="2UGjFq48gIe" role="3clF46">
                 <property role="TrG5h" value="matchRule" />
                 <node concept="3uibUv" id="2UGjFq48gIf" role="1tU5fm">
-                  <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+                  <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
                 </node>
               </node>
               <node concept="3cqZAl" id="2UGjFq48gIg" role="3clF45" />
@@ -795,7 +795,7 @@
               <node concept="37vLTG" id="2T1p0CFMNWv" role="3clF46">
                 <property role="TrG5h" value="matchRule" />
                 <node concept="3uibUv" id="2T1p0CFMNWw" role="1tU5fm">
-                  <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+                  <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
                 </node>
               </node>
               <node concept="3cqZAl" id="2T1p0CFMNWx" role="3clF45" />
@@ -808,7 +808,7 @@
               <node concept="37vLTG" id="2UGjFq48h1H" role="3clF46">
                 <property role="TrG5h" value="matchRule" />
                 <node concept="3uibUv" id="2UGjFq48h1I" role="1tU5fm">
-                  <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+                  <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
                 </node>
               </node>
               <node concept="3cqZAl" id="2UGjFq48h1J" role="3clF45" />
@@ -821,7 +821,7 @@
               <node concept="37vLTG" id="2UGjFq48k4_" role="3clF46">
                 <property role="TrG5h" value="invocation" />
                 <node concept="3uibUv" id="2UGjFq48k4A" role="1tU5fm">
-                  <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+                  <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
                 </node>
               </node>
               <node concept="3cqZAl" id="2UGjFq48k4B" role="3clF45" />
@@ -838,7 +838,7 @@
               <node concept="37vLTG" id="2UGjFq48k4K" role="3clF46">
                 <property role="TrG5h" value="invocation" />
                 <node concept="3uibUv" id="2UGjFq48k4L" role="1tU5fm">
-                  <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+                  <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
                 </node>
               </node>
               <node concept="3cqZAl" id="2UGjFq48k4M" role="3clF45" />
@@ -851,7 +851,7 @@
               <node concept="37vLTG" id="7vxJ_H4tnOD" role="3clF46">
                 <property role="TrG5h" value="fail" />
                 <node concept="3uibUv" id="7vxJ_H4tnOE" role="1tU5fm">
-                  <ref role="3uigEE" to="qrld:7vxJ_H4qn42" resolve="EvaluationFailureException" />
+                  <ref role="3uigEE" to="w7la:~EvaluationFailureException" resolve="EvaluationFailureException" />
                 </node>
               </node>
               <node concept="3cqZAl" id="7vxJ_H4tnOF" role="3clF45" />
@@ -876,7 +876,7 @@
               <node concept="37vLTG" id="7nkyKX7h9eH" role="3clF46">
                 <property role="TrG5h" value="constraint" />
                 <node concept="3uibUv" id="5mr7UHccduP" role="1tU5fm">
-                  <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                  <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                 </node>
               </node>
               <node concept="3cqZAl" id="7nkyKX7h9eJ" role="3clF45" />
@@ -889,7 +889,7 @@
               <node concept="37vLTG" id="7nkyKX7h9eP" role="3clF46">
                 <property role="TrG5h" value="constraint" />
                 <node concept="3uibUv" id="5mr7UHccd_Z" role="1tU5fm">
-                  <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                  <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                 </node>
               </node>
               <node concept="3cqZAl" id="7nkyKX7h9eR" role="3clF45" />
@@ -917,7 +917,7 @@
     <node concept="2tJIrI" id="qubcdtxJFT" role="jymVt" />
     <node concept="3Tm1VV" id="qubcdtxBiS" role="1B3o_S" />
     <node concept="3uibUv" id="qubcdtxBjm" role="3HQHJm">
-      <ref role="3uigEE" to="qrld:24Vro6cQnrj" resolve="EvaluationTrace" />
+      <ref role="3uigEE" to="w7la:~EvaluationTrace" resolve="EvaluationTrace" />
     </node>
   </node>
   <node concept="312cEu" id="4TCblo5ZkfI">
@@ -931,7 +931,7 @@
       <node concept="37vLTG" id="4TCblo5Nrp7" role="3clF46">
         <property role="TrG5h" value="logicalContext" />
         <node concept="3uibUv" id="4TCblo5Nrr2" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:7IvepusY4Ez" resolve="LogicalContext" />
+          <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
         </node>
       </node>
       <node concept="3Tmbuc" id="4TCblo5ZoJF" role="1B3o_S" />
@@ -954,7 +954,7 @@
                 <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
                 <node concept="2OqwBi" id="4TCblo5Noft" role="37wK5m">
                   <node concept="1rXfSq" id="4TCblo5ZmDR" role="2Oq$k0">
-                    <ref role="37wK5l" to="rchb:5uFPQ7B_b06" resolve="arguments" />
+                    <ref role="37wK5l" to="av0y:~AndItem.arguments():java.util.Collection" resolve="arguments" />
                   </node>
                   <node concept="liA8E" id="4TCblo5Zn2F" role="2OqNvi">
                     <ref role="37wK5l" to="33ny:~Collection.size():int" resolve="size" />
@@ -973,7 +973,7 @@
               <node concept="3eNFk2" id="4TCblo5Z7hN" role="3eNLev">
                 <node concept="2ZW3vV" id="4TCblo5Z7_w" role="3eO9$A">
                   <node concept="3uibUv" id="4TCblo5Z7CL" role="2ZW6by">
-                    <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                    <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                   </node>
                   <node concept="37vLTw" id="4TCblo5Z7xU" role="2ZW6bz">
                     <ref role="3cqZAo" node="4TCblo5NoSd" resolve="a" />
@@ -992,13 +992,13 @@
                             <ref role="3cqZAo" node="4TCblo5Nrp7" resolve="logicalContext" />
                           </node>
                           <node concept="liA8E" id="4TCblo5Z8s6" role="2OqNvi">
-                            <ref role="37wK5l" to="45ys:7IvepusY4EY" resolve="variable" />
+                            <ref role="37wK5l" to="bj13:~LogicalContext.variable(jetbrains.mps.logic.reactor.logical.MetaLogical):jetbrains.mps.logic.reactor.logical.Logical" resolve="variable" />
                             <node concept="10QFUN" id="4TCblo5Z8y1" role="37wK5m">
                               <node concept="37vLTw" id="4TCblo5Z97c" role="10QFUP">
                                 <ref role="3cqZAo" node="4TCblo5NoSd" resolve="a" />
                               </node>
                               <node concept="3uibUv" id="4TCblo5Z8NB" role="10QFUM">
-                                <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                                <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                                 <node concept="3uibUv" id="4TCblo5Z9P0" role="11_B2D">
                                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                                 </node>
@@ -1074,7 +1074,7 @@
             </node>
           </node>
           <node concept="1rXfSq" id="4TCblo5Znfk" role="1DdaDG">
-            <ref role="37wK5l" to="rchb:5uFPQ7B_b06" resolve="arguments" />
+            <ref role="37wK5l" to="av0y:~AndItem.arguments():java.util.Collection" resolve="arguments" />
           </node>
         </node>
         <node concept="3clFbF" id="4TCblo5NpdK" role="3cqZAp">
@@ -1087,7 +1087,7 @@
     <node concept="2tJIrI" id="4sSe4$oZQjr" role="jymVt" />
     <node concept="3Tm1VV" id="4TCblo5ZkfJ" role="1B3o_S" />
     <node concept="3uibUv" id="4TCblo5Zkgx" role="EKbjA">
-      <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+      <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
     </node>
   </node>
   <node concept="312cEu" id="5uFPQ7BZsAX">
@@ -1100,7 +1100,7 @@
       <node concept="37vLTG" id="5uFPQ7BZtxe" role="3clF46">
         <property role="TrG5h" value="constraintSymbol" />
         <node concept="3uibUv" id="5uFPQ7BZtBR" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
         </node>
       </node>
       <node concept="37vLTG" id="5uFPQ7BZtIF" role="3clF46">
@@ -1115,7 +1115,7 @@
         <property role="TrG5h" value="logicals" />
         <node concept="10Q1$e" id="4sSe4$oSP_q" role="1tU5fm">
           <node concept="3uibUv" id="4sSe4$oSPgO" role="10Q1$1">
-            <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+            <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
           </node>
         </node>
       </node>
@@ -1202,7 +1202,7 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="symbol" />
       <node concept="3uibUv" id="5uFPQ7BZsCE" role="3clF45">
-        <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+        <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
       </node>
       <node concept="3Tm1VV" id="5uFPQ7BZsCF" role="1B3o_S" />
       <node concept="3clFbS" id="5uFPQ7BZsCH" role="3clF47">
@@ -1296,12 +1296,12 @@
                               <ref role="3cqZAo" node="78CwJJcO_55" resolve="arg" />
                             </node>
                             <node concept="3uibUv" id="7HUwyZbi4uN" role="10QFUM">
-                              <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                              <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                             </node>
                           </node>
                         </node>
                         <node concept="liA8E" id="7HUwyZbi4HE" role="2OqNvi">
-                          <ref role="37wK5l" to="45ys:7HUwyZaC3Q7" resolve="type" />
+                          <ref role="37wK5l" to="bj13:~MetaLogical.type():java.lang.Class" resolve="type" />
                         </node>
                       </node>
                     </node>
@@ -1311,7 +1311,7 @@
               </node>
               <node concept="2ZW3vV" id="7HUwyZbi3ty" role="3clFbw">
                 <node concept="3uibUv" id="7HUwyZbi3vq" role="2ZW6by">
-                  <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                  <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                 </node>
                 <node concept="37vLTw" id="7HUwyZbi3rn" role="2ZW6bz">
                   <ref role="3cqZAo" node="78CwJJcO_55" resolve="arg" />
@@ -1397,7 +1397,7 @@
       <node concept="37vLTG" id="18cJbc16pY4" role="3clF46">
         <property role="TrG5h" value="logicalContext" />
         <node concept="3uibUv" id="18cJbc16pY5" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:7IvepusY4Ez" resolve="LogicalContext" />
+          <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
         </node>
       </node>
       <node concept="3Tm1VV" id="4TCblo5M6d$" role="1B3o_S" />
@@ -1434,7 +1434,7 @@
         <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
         <node concept="3qUE_q" id="4sSe4$oZGZb" role="11_B2D">
           <node concept="3uibUv" id="4sSe4$oZGZc" role="3qUE_r">
-            <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+            <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
           </node>
         </node>
       </node>
@@ -1446,14 +1446,14 @@
             <node concept="3uibUv" id="4sSe4$p01mH" role="1tU5fm">
               <ref role="3uigEE" to="33ny:~ArrayList" resolve="ArrayList" />
               <node concept="3uibUv" id="4sSe4$p01mK" role="11_B2D">
-                <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+                <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
               </node>
             </node>
             <node concept="2ShNRf" id="4sSe4$p01mR" role="33vP2m">
               <node concept="1pGfFk" id="4sSe4$p01mS" role="2ShVmc">
                 <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
                 <node concept="3uibUv" id="4sSe4$p01mT" role="1pMfVU">
-                  <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+                  <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
                 </node>
                 <node concept="3cmrfG" id="6v0X_XJM1xt" role="37wK5m">
                   <property role="3cmrfH" value="4" />
@@ -1477,7 +1477,7 @@
               <node concept="3cpWsn" id="4sSe4$oZLsv" role="3cpWs9">
                 <property role="TrG5h" value="logicalToBind" />
                 <node concept="3uibUv" id="4sSe4$oZLsw" role="1tU5fm">
-                  <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                  <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                   <node concept="3qTvmN" id="4sSe4$oZLsx" role="11_B2D" />
                 </node>
                 <node concept="1rXfSq" id="6v0X_XJLW3d" role="33vP2m">
@@ -1556,7 +1556,7 @@
         <node concept="10Oyi0" id="4sSe4$oTo$R" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="4sSe4$oTo$S" role="3clF45">
-        <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+        <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
         <node concept="3qTvmN" id="4sSe4$oTo$T" role="11_B2D" />
       </node>
       <node concept="3Tmbuc" id="4sSe4$oTo$U" role="1B3o_S" />
@@ -1599,13 +1599,13 @@
     <node concept="2tJIrI" id="4sSe4$oToXD" role="jymVt" />
     <node concept="3Tm1VV" id="5uFPQ7BZsAY" role="1B3o_S" />
     <node concept="3uibUv" id="5uFPQ7BZsBQ" role="EKbjA">
-      <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+      <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
     </node>
     <node concept="312cEg" id="5uFPQ7BZu60" role="jymVt">
       <property role="TrG5h" value="symbol" />
       <node concept="3Tm6S6" id="5uFPQ7BZu61" role="1B3o_S" />
       <node concept="3uibUv" id="5uFPQ7BZu63" role="1tU5fm">
-        <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+        <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
       </node>
     </node>
     <node concept="2tJIrI" id="4sSe4$oTpGf" role="jymVt" />
@@ -1624,7 +1624,7 @@
       <node concept="3Tm6S6" id="4sSe4$oSRPM" role="1B3o_S" />
       <node concept="10Q1$e" id="4sSe4$oSRPO" role="1tU5fm">
         <node concept="3uibUv" id="4sSe4$oSRPP" role="10Q1$1">
-          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
         </node>
       </node>
     </node>
@@ -1649,7 +1649,7 @@
       <node concept="3Tm1VV" id="7nPD14NHRLH" role="1B3o_S" />
       <node concept="3clFbS" id="7nPD14NHRLI" role="3clF47">
         <node concept="XkiVB" id="7nPD14NXX3u" role="3cqZAp">
-          <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
+          <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.Class)" resolve="MetaLogical" />
           <node concept="37vLTw" id="7nPD14NXX8t" role="37wK5m">
             <ref role="3cqZAo" node="7nPD14NHRSd" resolve="type" />
           </node>
@@ -1670,7 +1670,7 @@
       <property role="TrG5h" value="V" />
     </node>
     <node concept="3uibUv" id="7nPD14NXWzX" role="1zkMxy">
-      <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+      <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
       <node concept="16syzq" id="7nPD14NXWFt" role="11_B2D">
         <ref role="16sUi3" node="7nPD14NHRwV" resolve="V" />
       </node>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
index 9700a836..42484edd 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
@@ -6,12 +6,12 @@
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
-    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
+    <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="omn0" ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
   </imports>
@@ -278,7 +278,7 @@
       <node concept="37vLTG" id="4TCblo5Nrp7" role="3clF46">
         <property role="TrG5h" value="logicalContext" />
         <node concept="3uibUv" id="4TCblo5Nrr2" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:7IvepusY4Ez" resolve="LogicalContext" />
+          <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
         </node>
       </node>
       <node concept="3Tm1VV" id="4TCblo5Mg6f" role="1B3o_S" />
@@ -314,7 +314,7 @@
         <node concept="3clFbF" id="6Kcfpq7B99k" role="3cqZAp">
           <node concept="2OqwBi" id="5uFPQ7BZfDt" role="3clFbG">
             <node concept="1rXfSq" id="7ISVfSJnHs" role="2Oq$k0">
-              <ref role="37wK5l" to="rchb:5uFPQ7BE$9i" resolve="symbol" />
+              <ref role="37wK5l" to="av0y:~AndItem.symbol():jetbrains.mps.logic.reactor.program.Symbol" resolve="symbol" />
             </node>
             <node concept="liA8E" id="5uFPQ7BZfHQ" role="2OqNvi">
               <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
@@ -415,7 +415,7 @@
                       <ref role="3cqZAo" node="6Kcfpq7B2Ww" resolve="that" />
                     </node>
                     <node concept="liA8E" id="7ISVfSJor9" role="2OqNvi">
-                      <ref role="37wK5l" to="rchb:5uFPQ7BE$9i" resolve="symbol" />
+                      <ref role="37wK5l" to="av0y:~AndItem.symbol():jetbrains.mps.logic.reactor.program.Symbol" resolve="symbol" />
                     </node>
                   </node>
                 </node>
@@ -425,7 +425,7 @@
                       <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                     </node>
                     <node concept="1rXfSq" id="7ISVfSJomP" role="10QFUP">
-                      <ref role="37wK5l" to="rchb:5uFPQ7BE$9i" resolve="symbol" />
+                      <ref role="37wK5l" to="av0y:~AndItem.symbol():jetbrains.mps.logic.reactor.program.Symbol" resolve="symbol" />
                     </node>
                   </node>
                 </node>
@@ -434,7 +434,7 @@
             <node concept="3y3z36" id="6Kcfpq7B2WV" role="3K4Cdx">
               <node concept="10Nm6u" id="6Kcfpq7B2WW" role="3uHU7w" />
               <node concept="1rXfSq" id="7ISVfSJojN" role="3uHU7B">
-                <ref role="37wK5l" to="rchb:5uFPQ7BE$9i" resolve="symbol" />
+                <ref role="37wK5l" to="av0y:~AndItem.symbol():jetbrains.mps.logic.reactor.program.Symbol" resolve="symbol" />
               </node>
             </node>
             <node concept="3y3z36" id="6Kcfpq7B2WX" role="3K4GZi">
@@ -444,7 +444,7 @@
                   <ref role="3cqZAo" node="6Kcfpq7B2Ww" resolve="that" />
                 </node>
                 <node concept="liA8E" id="7ISVfSJots" role="2OqNvi">
-                  <ref role="37wK5l" to="rchb:5uFPQ7BE$9i" resolve="symbol" />
+                  <ref role="37wK5l" to="av0y:~AndItem.symbol():jetbrains.mps.logic.reactor.program.Symbol" resolve="symbol" />
                 </node>
               </node>
             </node>
@@ -504,7 +504,7 @@
                   <node concept="3y3z36" id="6Kcfpq7B2Xt" role="3K4Cdx">
                     <node concept="10Nm6u" id="6Kcfpq7B2Xu" role="3uHU7w" />
                     <node concept="1rXfSq" id="7ISVfSJoxI" role="3uHU7B">
-                      <ref role="37wK5l" to="rchb:5uFPQ7BE$9i" resolve="symbol" />
+                      <ref role="37wK5l" to="av0y:~AndItem.symbol():jetbrains.mps.logic.reactor.program.Symbol" resolve="symbol" />
                     </node>
                   </node>
                   <node concept="2OqwBi" id="6Kcfpq7B2Xv" role="3K4E3e">
@@ -512,7 +512,7 @@
                       <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                       <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
                       <node concept="1rXfSq" id="7ISVfSJoy$" role="37wK5m">
-                        <ref role="37wK5l" to="rchb:5uFPQ7BE$9i" resolve="symbol" />
+                        <ref role="37wK5l" to="av0y:~AndItem.symbol():jetbrains.mps.logic.reactor.program.Symbol" resolve="symbol" />
                       </node>
                     </node>
                     <node concept="liA8E" id="6Kcfpq7B2Xx" role="2OqNvi">
@@ -536,7 +536,7 @@
     </node>
     <node concept="2tJIrI" id="6Kcfpq7B3IY" role="jymVt" />
     <node concept="3uibUv" id="5uFPQ7BZiil" role="EKbjA">
-      <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+      <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
     </node>
     <node concept="312cEg" id="5uFPQ7BZe15" role="jymVt">
       <property role="TrG5h" value="arguments" />
@@ -597,7 +597,7 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="symbol" />
       <node concept="3uibUv" id="7ISVfSJpsV" role="3clF45">
-        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
       </node>
       <node concept="3Tm1VV" id="7ISVfSJpsW" role="1B3o_S" />
       <node concept="3clFbS" id="7ISVfSJpsZ" role="3clF47">
@@ -626,11 +626,11 @@
       <property role="TrG5h" value="UNI_SYM" />
       <node concept="3Tm1VV" id="5uFPQ7C29mq" role="1B3o_S" />
       <node concept="3uibUv" id="5uFPQ7C29mr" role="1tU5fm">
-        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
       </node>
       <node concept="2ShNRf" id="5uFPQ7C29ms" role="33vP2m">
         <node concept="1pGfFk" id="5uFPQ7C29mt" role="2ShVmc">
-          <ref role="37wK5l" to="rchb:5uFPQ7B$$fT" resolve="PredicateSymbol" />
+          <ref role="37wK5l" to="av0y:~PredicateSymbol.&lt;init&gt;(java.lang.String,int)" resolve="PredicateSymbol" />
           <node concept="37vLTw" id="5uFPQ7C29mu" role="37wK5m">
             <ref role="3cqZAo" node="2GO7tyJVob2" resolve="UNI" />
           </node>
@@ -667,7 +667,7 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="symbol" />
       <node concept="3uibUv" id="7ISVfSJpfJ" role="3clF45">
-        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
       </node>
       <node concept="3Tm1VV" id="7ISVfSJpfK" role="1B3o_S" />
       <node concept="3clFbS" id="7ISVfSJpfN" role="3clF47">
@@ -697,11 +697,11 @@
       <property role="TrG5h" value="ASSERT_SYM" />
       <node concept="3Tm1VV" id="5uFPQ7BZnLx" role="1B3o_S" />
       <node concept="3uibUv" id="5uFPQ7BZnLy" role="1tU5fm">
-        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
       </node>
       <node concept="2ShNRf" id="5uFPQ7BZnLz" role="33vP2m">
         <node concept="1pGfFk" id="5uFPQ7BZnL$" role="2ShVmc">
-          <ref role="37wK5l" to="rchb:5uFPQ7B$$fT" resolve="PredicateSymbol" />
+          <ref role="37wK5l" to="av0y:~PredicateSymbol.&lt;init&gt;(java.lang.String,int)" resolve="PredicateSymbol" />
           <node concept="37vLTw" id="5uFPQ7BZnL_" role="37wK5m">
             <ref role="3cqZAo" node="6infEALAgS7" resolve="ASSERT" />
           </node>
@@ -757,7 +757,7 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="symbol" />
       <node concept="3uibUv" id="5uFPQ7BZaJx" role="3clF45">
-        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
       </node>
       <node concept="3Tm1VV" id="5uFPQ7BZaxc" role="1B3o_S" />
       <node concept="3clFbS" id="5uFPQ7BZaxh" role="3clF47">
@@ -787,11 +787,11 @@
       <property role="TrG5h" value="EQ_SYM" />
       <node concept="3Tm1VV" id="5uFPQ7C23RP" role="1B3o_S" />
       <node concept="3uibUv" id="5uFPQ7C23RQ" role="1tU5fm">
-        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
       </node>
       <node concept="2ShNRf" id="5uFPQ7C23RR" role="33vP2m">
         <node concept="1pGfFk" id="5uFPQ7C23RS" role="2ShVmc">
-          <ref role="37wK5l" to="rchb:5uFPQ7B$$fT" resolve="PredicateSymbol" />
+          <ref role="37wK5l" to="av0y:~PredicateSymbol.&lt;init&gt;(java.lang.String,int)" resolve="PredicateSymbol" />
           <node concept="37vLTw" id="5uFPQ7C23RT" role="37wK5m">
             <ref role="3cqZAo" node="3HJTsBn4kQi" resolve="EQ" />
           </node>
@@ -810,7 +810,7 @@
       <property role="TrG5h" value="symbol" />
       <node concept="3Tm6S6" id="7ISVfSJoWu" role="1B3o_S" />
       <node concept="3uibUv" id="7ISVfSJoWv" role="1tU5fm">
-        <ref role="3uigEE" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+        <ref role="3uigEE" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
       </node>
     </node>
     <node concept="2tJIrI" id="429xoyqax90" role="jymVt" />
@@ -818,7 +818,7 @@
       <node concept="37vLTG" id="2KSgAgV9I6z" role="3clF46">
         <property role="TrG5h" value="predicateSymbol" />
         <node concept="3uibUv" id="2KSgAgV9I8P" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
         </node>
       </node>
       <node concept="37vLTG" id="5uFPQ7Cj7nY" role="3clF46">
@@ -903,7 +903,7 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="symbol" />
       <node concept="3uibUv" id="7ISVfSJoQn" role="3clF45">
-        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
       </node>
       <node concept="3Tm1VV" id="7ISVfSJoQo" role="1B3o_S" />
       <node concept="3clFbS" id="7ISVfSJoQr" role="3clF47">
@@ -928,11 +928,11 @@
       <property role="3TUv4t" value="true" />
       <node concept="3Tm1VV" id="5uFPQ7C26Lh" role="1B3o_S" />
       <node concept="3uibUv" id="5uFPQ7C26Oo" role="1tU5fm">
-        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
       </node>
       <node concept="2ShNRf" id="5uFPQ7C26Zo" role="33vP2m">
         <node concept="1pGfFk" id="5uFPQ7C26X5" role="2ShVmc">
-          <ref role="37wK5l" to="rchb:5uFPQ7B$$fT" resolve="PredicateSymbol" />
+          <ref role="37wK5l" to="av0y:~PredicateSymbol.&lt;init&gt;(java.lang.String,int)" resolve="PredicateSymbol" />
           <node concept="Xl_RD" id="5uFPQ7C272B" role="37wK5m">
             <property role="Xl_RC" value="isNonVar" />
           </node>
@@ -948,11 +948,11 @@
       <property role="3TUv4t" value="true" />
       <node concept="3Tm1VV" id="5uFPQ7C279_" role="1B3o_S" />
       <node concept="3uibUv" id="5uFPQ7C279A" role="1tU5fm">
-        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
       </node>
       <node concept="2ShNRf" id="5uFPQ7C279B" role="33vP2m">
         <node concept="1pGfFk" id="5uFPQ7C279C" role="2ShVmc">
-          <ref role="37wK5l" to="rchb:5uFPQ7B$$fT" resolve="PredicateSymbol" />
+          <ref role="37wK5l" to="av0y:~PredicateSymbol.&lt;init&gt;(java.lang.String,int)" resolve="PredicateSymbol" />
           <node concept="Xl_RD" id="5uFPQ7C279D" role="37wK5m">
             <property role="Xl_RC" value="isVar" />
           </node>
@@ -1035,13 +1035,13 @@
       <node concept="37vLTG" id="5$WbtTOYtPL" role="3clF46">
         <property role="TrG5h" value="symbol" />
         <node concept="3uibUv" id="5uFPQ7C2821" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
         </node>
       </node>
       <node concept="37vLTG" id="5$WbtTOYsN0" role="3clF46">
         <property role="TrG5h" value="solver" />
         <node concept="3uibUv" id="6MYr6Jx1HSZ" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+          <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
         </node>
       </node>
       <node concept="37vLTG" id="5uFPQ7C28iX" role="3clF46">
@@ -1084,7 +1084,7 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="symbol" />
       <node concept="3uibUv" id="7ISVfSJpIU" role="3clF45">
-        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
       </node>
       <node concept="3Tm1VV" id="7ISVfSJpIV" role="1B3o_S" />
       <node concept="3clFbS" id="7ISVfSJpIY" role="3clF47">
@@ -1100,7 +1100,7 @@
       <property role="TrG5h" value="symbol" />
       <node concept="3Tm6S6" id="7ISVfSJpBJ" role="1B3o_S" />
       <node concept="3uibUv" id="7ISVfSJpBK" role="1tU5fm">
-        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
       </node>
     </node>
     <node concept="3Tm1VV" id="5$WbtTOYoMc" role="1B3o_S" />
@@ -1115,7 +1115,7 @@
       <node concept="37vLTG" id="3F6vMxqo1cY" role="3clF46">
         <property role="TrG5h" value="javaExpressionSolver" />
         <node concept="3uibUv" id="3F6vMxqo1dR" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+          <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
         </node>
       </node>
       <node concept="3cqZAl" id="3F6vMxqo1cA" role="3clF45" />
@@ -1171,7 +1171,7 @@
         <node concept="YS8fn" id="3eLgHzX3On1" role="3cqZAp">
           <node concept="2ShNRf" id="3eLgHzX3OnK" role="YScLw">
             <node concept="1pGfFk" id="3eLgHzX3PBQ" role="2ShVmc">
-              <ref role="37wK5l" to="qrld:7vxJ_H4qql2" resolve="EvaluationFailureException" />
+              <ref role="37wK5l" to="w7la:~EvaluationFailureException.&lt;init&gt;(java.lang.String)" resolve="EvaluationFailureException" />
               <node concept="37vLTw" id="3eLgHzX3PF4" role="37wK5m">
                 <ref role="3cqZAo" node="3F6vMxqo1BG" resolve="message" />
               </node>
@@ -1196,13 +1196,13 @@
       <node concept="37vLTG" id="3F6vMxqo28U" role="3clF46">
         <property role="TrG5h" value="symbol" />
         <node concept="3uibUv" id="3F6vMxqo28V" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
         </node>
       </node>
       <node concept="37vLTG" id="3F6vMxqo28W" role="3clF46">
         <property role="TrG5h" value="computingTracer" />
         <node concept="3uibUv" id="3F6vMxqo28X" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:24Vro6cQnrj" resolve="EvaluationTrace" />
+          <ref role="3uigEE" to="w7la:~EvaluationTrace" resolve="EvaluationTrace" />
         </node>
       </node>
       <node concept="3clFbS" id="3F6vMxqo28Y" role="3clF47">
@@ -1212,10 +1212,10 @@
               <node concept="2OqwBi" id="7ISVfSIVrQ" role="3clFbG">
                 <node concept="Xjq3P" id="2tcGHBEecgK" role="2Oq$k0" />
                 <node concept="liA8E" id="7ISVfSIVsU" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                  <ref role="37wK5l" to="w7la:~SessionSolver.registerSolver(jetbrains.mps.logic.reactor.program.PredicateSymbol,jetbrains.mps.logic.reactor.evaluation.Solver):void" resolve="registerSolver" />
                   <node concept="10QFUN" id="7ISVfSIYFl" role="37wK5m">
                     <node concept="3uibUv" id="7ISVfSIYFj" role="10QFUM">
-                      <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                      <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
                     </node>
                     <node concept="37vLTw" id="7ISVfSIYFk" role="10QFUP">
                       <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
@@ -1246,7 +1246,7 @@
               <ref role="3cqZAo" node="5uFPQ7C29mw" resolve="UNI_SYM" />
             </node>
             <node concept="liA8E" id="7ISVfSIJyd" role="2OqNvi">
-              <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+              <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
               <node concept="37vLTw" id="7ISVfSIJzc" role="37wK5m">
                 <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
               </node>
@@ -1259,7 +1259,7 @@
                 <ref role="1PxDUh" node="3HJTsBn4kk_" resolve="EqualsPredicate" />
               </node>
               <node concept="liA8E" id="7ISVfSIJAs" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
                 <node concept="37vLTw" id="7ISVfSIJBV" role="37wK5m">
                   <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
                 </node>
@@ -1270,10 +1270,10 @@
                 <node concept="2OqwBi" id="7ISVfSIYOw" role="3clFbG">
                   <node concept="Xjq3P" id="2tcGHBEecj3" role="2Oq$k0" />
                   <node concept="liA8E" id="7ISVfSIYOy" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                    <ref role="37wK5l" to="w7la:~SessionSolver.registerSolver(jetbrains.mps.logic.reactor.program.PredicateSymbol,jetbrains.mps.logic.reactor.evaluation.Solver):void" resolve="registerSolver" />
                     <node concept="10QFUN" id="7ISVfSIYOz" role="37wK5m">
                       <node concept="3uibUv" id="7ISVfSIYO$" role="10QFUM">
-                        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
                       </node>
                       <node concept="37vLTw" id="7ISVfSIYO_" role="10QFUP">
                         <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
@@ -1298,7 +1298,7 @@
                 <ref role="1PxDUh" node="6infEALAfer" resolve="AssertPredicate" />
               </node>
               <node concept="liA8E" id="7ISVfSIJIa" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
                 <node concept="37vLTw" id="7ISVfSIJJb" role="37wK5m">
                   <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
                 </node>
@@ -1309,10 +1309,10 @@
                 <node concept="2OqwBi" id="7ISVfSIZhn" role="3clFbG">
                   <node concept="Xjq3P" id="2tcGHBEeclc" role="2Oq$k0" />
                   <node concept="liA8E" id="7ISVfSIZhp" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                    <ref role="37wK5l" to="w7la:~SessionSolver.registerSolver(jetbrains.mps.logic.reactor.program.PredicateSymbol,jetbrains.mps.logic.reactor.evaluation.Solver):void" resolve="registerSolver" />
                     <node concept="10QFUN" id="7ISVfSIZhq" role="37wK5m">
                       <node concept="3uibUv" id="7ISVfSIZhr" role="10QFUM">
-                        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
                       </node>
                       <node concept="37vLTw" id="7ISVfSIZhs" role="10QFUP">
                         <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
@@ -1337,7 +1337,7 @@
                 <ref role="1PxDUh" node="5$WbtTOYoMb" resolve="LogicalPredicate" />
               </node>
               <node concept="liA8E" id="7ISVfSIJJH" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
                 <node concept="37vLTw" id="7ISVfSIJJI" role="37wK5m">
                   <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
                 </node>
@@ -1348,10 +1348,10 @@
                 <node concept="2OqwBi" id="7ISVfSJ2P7" role="3clFbG">
                   <node concept="Xjq3P" id="2tcGHBEecmS" role="2Oq$k0" />
                   <node concept="liA8E" id="7ISVfSJ2P9" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                    <ref role="37wK5l" to="w7la:~SessionSolver.registerSolver(jetbrains.mps.logic.reactor.program.PredicateSymbol,jetbrains.mps.logic.reactor.evaluation.Solver):void" resolve="registerSolver" />
                     <node concept="10QFUN" id="7ISVfSJ2Pa" role="37wK5m">
                       <node concept="3uibUv" id="7ISVfSJ2Pb" role="10QFUM">
-                        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
                       </node>
                       <node concept="37vLTw" id="7ISVfSJ2Pc" role="10QFUP">
                         <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
@@ -1375,7 +1375,7 @@
                 <ref role="3cqZAo" node="5uFPQ7C279$" resolve="FREE_SYM" />
               </node>
               <node concept="liA8E" id="7ISVfSJ2Gg" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
                 <node concept="37vLTw" id="7ISVfSJ2Gh" role="37wK5m">
                   <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
                 </node>
@@ -1386,10 +1386,10 @@
                 <node concept="2OqwBi" id="7ISVfSJ30o" role="3clFbG">
                   <node concept="Xjq3P" id="2tcGHBEecoN" role="2Oq$k0" />
                   <node concept="liA8E" id="7ISVfSJ30q" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                    <ref role="37wK5l" to="w7la:~SessionSolver.registerSolver(jetbrains.mps.logic.reactor.program.PredicateSymbol,jetbrains.mps.logic.reactor.evaluation.Solver):void" resolve="registerSolver" />
                     <node concept="10QFUN" id="7ISVfSJ30r" role="37wK5m">
                       <node concept="3uibUv" id="7ISVfSJ30s" role="10QFUM">
-                        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
                       </node>
                       <node concept="37vLTw" id="7ISVfSJ30t" role="10QFUP">
                         <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
@@ -1420,10 +1420,10 @@
                     <node concept="2OqwBi" id="1ggxSI7qGPQ" role="3clFbG">
                       <node concept="Xjq3P" id="1ggxSI7qGPR" role="2Oq$k0" />
                       <node concept="liA8E" id="1ggxSI7qGPS" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                        <ref role="37wK5l" to="w7la:~SessionSolver.registerSolver(jetbrains.mps.logic.reactor.program.PredicateSymbol,jetbrains.mps.logic.reactor.evaluation.Solver):void" resolve="registerSolver" />
                         <node concept="10QFUN" id="1ggxSI7qGPT" role="37wK5m">
                           <node concept="3uibUv" id="1ggxSI7qGPU" role="10QFUM">
-                            <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                            <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
                           </node>
                           <node concept="37vLTw" id="1ggxSI7qGPV" role="10QFUP">
                             <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
@@ -1454,10 +1454,10 @@
                       <node concept="2OqwBi" id="4psy6tqszLX" role="3clFbG">
                         <node concept="Xjq3P" id="4psy6tqszLY" role="2Oq$k0" />
                         <node concept="liA8E" id="4psy6tqszLZ" role="2OqNvi">
-                          <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                          <ref role="37wK5l" to="w7la:~SessionSolver.registerSolver(jetbrains.mps.logic.reactor.program.PredicateSymbol,jetbrains.mps.logic.reactor.evaluation.Solver):void" resolve="registerSolver" />
                           <node concept="10QFUN" id="4psy6tqszM0" role="37wK5m">
                             <node concept="3uibUv" id="4psy6tqszM1" role="10QFUM">
-                              <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                              <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
                             </node>
                             <node concept="37vLTw" id="4psy6tqszM2" role="10QFUP">
                               <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
@@ -1478,7 +1478,7 @@
             </node>
             <node concept="2ZW3vV" id="1ggxSI7qHdm" role="3eO9$A">
               <node concept="3uibUv" id="1ggxSI7qHiX" role="2ZW6by">
-                <ref role="3uigEE" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+                <ref role="3uigEE" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
               </node>
               <node concept="37vLTw" id="1ggxSI7qH82" role="2ZW6bz">
                 <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
@@ -1522,14 +1522,14 @@
         <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
         <node concept="3qUE_q" id="3F6vMxqottp" role="11_B2D">
           <node concept="3uibUv" id="3F6vMxqottq" role="3qUE_r">
-            <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+            <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
           </node>
         </node>
       </node>
       <node concept="37vLTG" id="3F6vMxqottr" role="3clF46">
         <property role="TrG5h" value="symbol" />
         <node concept="3uibUv" id="3F6vMxqotts" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
         </node>
       </node>
       <node concept="3clFbS" id="3F6vMxqottt" role="3clF47">
@@ -1548,7 +1548,7 @@
               <ref role="3cqZAo" node="5uFPQ7C29mw" resolve="UNI_SYM" />
             </node>
             <node concept="liA8E" id="2tcGHBEvbN5" role="2OqNvi">
-              <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+              <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
               <node concept="37vLTw" id="2tcGHBEvbN6" role="37wK5m">
                 <ref role="3cqZAo" node="3F6vMxqottr" resolve="symbol" />
               </node>
@@ -1561,7 +1561,7 @@
                 <ref role="3cqZAo" node="5uFPQ7C23RV" resolve="EQ_SYM" />
               </node>
               <node concept="liA8E" id="2tcGHBEvbNa" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
                 <node concept="37vLTw" id="2tcGHBEvbNb" role="37wK5m">
                   <ref role="3cqZAo" node="3F6vMxqottr" resolve="symbol" />
                 </node>
@@ -1583,7 +1583,7 @@
                 <ref role="3cqZAo" node="5uFPQ7BZnLB" resolve="ASSERT_SYM" />
               </node>
               <node concept="liA8E" id="2tcGHBEvbNr" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
                 <node concept="37vLTw" id="2tcGHBEvbNs" role="37wK5m">
                   <ref role="3cqZAo" node="3F6vMxqottr" resolve="symbol" />
                 </node>
@@ -1605,7 +1605,7 @@
                 <ref role="3cqZAo" node="5uFPQ7C26$b" resolve="BOUND_SYM" />
               </node>
               <node concept="liA8E" id="2tcGHBEvbNF" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
                 <node concept="37vLTw" id="2tcGHBEvbNG" role="37wK5m">
                   <ref role="3cqZAo" node="3F6vMxqottr" resolve="symbol" />
                 </node>
@@ -1627,7 +1627,7 @@
                 <ref role="1PxDUh" node="5$WbtTOYoMb" resolve="LogicalPredicate" />
               </node>
               <node concept="liA8E" id="2tcGHBEvbNV" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <ref role="37wK5l" to="av0y:~Symbol.equals(java.lang.Object):boolean" resolve="equals" />
                 <node concept="37vLTw" id="2tcGHBEvbNW" role="37wK5m">
                   <ref role="3cqZAo" node="3F6vMxqottr" resolve="symbol" />
                 </node>
@@ -1645,7 +1645,7 @@
           <node concept="3eNFk2" id="2tcGHBEBfnQ" role="3eNLev">
             <node concept="2ZW3vV" id="1ggxSI7oiK8" role="3eO9$A">
               <node concept="3uibUv" id="1ggxSI7oiW9" role="2ZW6by">
-                <ref role="3uigEE" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+                <ref role="3uigEE" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
               </node>
               <node concept="37vLTw" id="1ggxSI7oifj" role="2ZW6bz">
                 <ref role="3cqZAo" node="3F6vMxqottr" resolve="symbol" />
@@ -1688,13 +1688,13 @@
     <node concept="2tJIrI" id="3F6vMxqougm" role="jymVt" />
     <node concept="3Tm1VV" id="3F6vMxqo13Z" role="1B3o_S" />
     <node concept="3uibUv" id="3F6vMxqo15F" role="1zkMxy">
-      <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+      <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
     </node>
     <node concept="312cEg" id="3F6vMxqo1jQ" role="jymVt">
       <property role="TrG5h" value="myJavaExpressionSolver" />
       <node concept="3Tm6S6" id="3F6vMxqo1jR" role="1B3o_S" />
       <node concept="3uibUv" id="3F6vMxqo1jT" role="1tU5fm">
-        <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+        <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
       </node>
     </node>
   </node>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps
index ead17087..26492f9b 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps
@@ -6,13 +6,13 @@
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
-    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
+    <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
-    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
   </imports>
@@ -265,7 +265,7 @@
         <node concept="17QB3L" id="5rhZO$TZiL3" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="5rhZO$U0jE9" role="3clF45">
-        <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+        <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
       </node>
       <node concept="3Tm1VV" id="5rhZO$TZiL7" role="1B3o_S" />
       <node concept="3clFbS" id="5rhZO$TZiL9" role="3clF47">
@@ -301,7 +301,7 @@
       <node concept="37vLTG" id="7eGEHDlcFbs" role="3clF46">
         <property role="TrG5h" value="rule" />
         <node concept="3uibUv" id="7eGEHDlcFct" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
         </node>
       </node>
       <node concept="3cqZAl" id="7eGEHDlcF9q" role="3clF45" />
@@ -323,7 +323,7 @@
               <node concept="YS8fn" id="7eGEHDlfYpR" role="3cqZAp">
                 <node concept="2ShNRf" id="7eGEHDlfYqe" role="YScLw">
                   <node concept="1pGfFk" id="7eGEHDlfYFY" role="2ShVmc">
-                    <ref role="37wK5l" to="rchb:7Oc59RS$yHZ" resolve="InvalidRuleException" />
+                    <ref role="37wK5l" to="av0y:~InvalidRuleException.&lt;init&gt;(java.lang.String,java.lang.Throwable)" resolve="InvalidRuleException" />
                     <node concept="3cpWs3" id="7eGEHDlg7tx" role="37wK5m">
                       <node concept="2OqwBi" id="7Oc59RSI7ly" role="3uHU7w">
                         <node concept="37vLTw" id="7Oc59RSI7hx" role="2Oq$k0">
@@ -347,7 +347,7 @@
             <node concept="3cpWsn" id="7Oc59RSI60u" role="TDEfY">
               <property role="TrG5h" value="e" />
               <node concept="3uibUv" id="7Oc59RSI60v" role="1tU5fm">
-                <ref role="3uigEE" to="rchb:7Oc59RSHJnv" resolve="InvalidConstraintException" />
+                <ref role="3uigEE" to="av0y:~InvalidConstraintException" resolve="InvalidConstraintException" />
               </node>
             </node>
           </node>
@@ -368,7 +368,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="7Oc59RSHX2Z" role="Sfmx6">
-        <ref role="3uigEE" to="rchb:7Oc59RS$wKP" resolve="InvalidRuleException" />
+        <ref role="3uigEE" to="av0y:~InvalidRuleException" resolve="InvalidRuleException" />
       </node>
     </node>
     <node concept="2tJIrI" id="429xoypV6tp" role="jymVt" />
@@ -378,7 +378,7 @@
         <property role="TrG5h" value="rule" />
         <property role="3TUv4t" value="true" />
         <node concept="3uibUv" id="7eGEHDldikz" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
         </node>
       </node>
       <node concept="3cqZAl" id="7Oc59RSHXMC" role="3clF45" />
@@ -408,7 +408,7 @@
           <node concept="3cpWsn" id="7eGEHDldjbG" role="1Duv9x">
             <property role="TrG5h" value="item" />
             <node concept="3uibUv" id="5uFPQ7BHdLO" role="1tU5fm">
-              <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+              <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
             </node>
           </node>
           <node concept="2OqwBi" id="7eGEHDldjbL" role="1DdaDG">
@@ -416,7 +416,7 @@
               <ref role="3cqZAo" node="7eGEHDldi8e" resolve="rule" />
             </node>
             <node concept="liA8E" id="7eGEHDldjbN" role="2OqNvi">
-              <ref role="37wK5l" to="rchb:7eGEHDldrDm" resolve="all" />
+              <ref role="37wK5l" to="av0y:~Rule.all():java.lang.Iterable" resolve="all" />
             </node>
           </node>
         </node>
@@ -440,7 +440,7 @@
           <node concept="3cpWsn" id="7eGEHDlf0Og" role="1Duv9x">
             <property role="TrG5h" value="item" />
             <node concept="3uibUv" id="5uFPQ7BHdOW" role="1tU5fm">
-              <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+              <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
             </node>
           </node>
           <node concept="2OqwBi" id="7eGEHDlf0Oi" role="1DdaDG">
@@ -448,7 +448,7 @@
               <ref role="3cqZAo" node="7eGEHDldi8e" resolve="rule" />
             </node>
             <node concept="liA8E" id="7eGEHDlf0Ok" role="2OqNvi">
-              <ref role="37wK5l" to="rchb:7eGEHDldrDm" resolve="all" />
+              <ref role="37wK5l" to="av0y:~Rule.all():java.lang.Iterable" resolve="all" />
             </node>
           </node>
         </node>
@@ -468,7 +468,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="7Oc59RSI0zY" role="Sfmx6">
-        <ref role="3uigEE" to="rchb:7Oc59RSHJnv" resolve="InvalidConstraintException" />
+        <ref role="3uigEE" to="av0y:~InvalidConstraintException" resolve="InvalidConstraintException" />
       </node>
     </node>
     <node concept="2tJIrI" id="5rhZO$TZU2B" role="jymVt" />
@@ -480,14 +480,14 @@
       <node concept="3uibUv" id="5rhZO$TZNO5" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3uibUv" id="5rhZO$TZNO6" role="11_B2D">
-          <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
         </node>
       </node>
       <node concept="2ShNRf" id="5rhZO$TZNO7" role="33vP2m">
         <node concept="1pGfFk" id="5rhZO$TZNO8" role="2ShVmc">
           <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
           <node concept="3uibUv" id="5rhZO$TZNO9" role="1pMfVU">
-            <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+            <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
           </node>
         </node>
       </node>
@@ -525,7 +525,7 @@
   <node concept="312cEu" id="7eGEHDlcEJ0">
     <property role="TrG5h" value="ChrProgram" />
     <node concept="3uibUv" id="78CwJJcTnG5" role="1zkMxy">
-      <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+      <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
     </node>
     <node concept="2tJIrI" id="78CwJJd1ZwT" role="jymVt" />
     <node concept="3clFbW" id="7eGEHDlcF69" role="jymVt">
@@ -539,7 +539,7 @@
         <node concept="3uibUv" id="5rhZO$TZMNx" role="1tU5fm">
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
           <node concept="3uibUv" id="5rhZO$TZMSL" role="11_B2D">
-            <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+            <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
           </node>
         </node>
       </node>
@@ -620,7 +620,7 @@
       <property role="2aFKle" value="false" />
       <node concept="3Tm1VV" id="6X5F0NgiqA7" role="1B3o_S" />
       <node concept="3uibUv" id="6X5F0NgiqA8" role="3clF45">
-        <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
       </node>
       <node concept="3clFbS" id="6X5F0NgiqA9" role="3clF47">
         <node concept="YS8fn" id="2UGjFq4KXWH" role="3cqZAp">
@@ -645,7 +645,7 @@
       <node concept="37vLTG" id="78CwJJcXhUG" role="3clF46">
         <property role="TrG5h" value="constraintSymbol" />
         <node concept="3uibUv" id="78CwJJcXhUH" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
         </node>
       </node>
       <node concept="3uibUv" id="78CwJJcXhUI" role="3clF45">
@@ -679,7 +679,7 @@
       <node concept="3uibUv" id="78CwJJcTorR" role="3clF45">
         <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
         <node concept="3uibUv" id="78CwJJcTorS" role="11_B2D">
-          <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
         </node>
       </node>
       <node concept="3Tm1VV" id="78CwJJcTorT" role="1B3o_S" />
@@ -706,7 +706,7 @@
       <node concept="3uibUv" id="78CwJJcTos8" role="3clF45">
         <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
         <node concept="3uibUv" id="78CwJJcTos9" role="11_B2D">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
         </node>
       </node>
       <node concept="3Tm1VV" id="78CwJJcTosa" role="1B3o_S" />
@@ -746,7 +746,7 @@
       <node concept="3uibUv" id="ZqZbw4QmIw" role="3clF45">
         <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
         <node concept="3uibUv" id="ZqZbw4Qnai" role="11_B2D">
-          <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
         </node>
       </node>
       <node concept="3Tm1VV" id="ZqZbw4Qln9" role="1B3o_S" />
@@ -842,7 +842,7 @@
       <node concept="3uibUv" id="7eGEHDlcFrm" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3uibUv" id="7eGEHDlcFuc" role="11_B2D">
-          <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
         </node>
       </node>
     </node>
@@ -876,7 +876,7 @@
       <node concept="3uibUv" id="78CwJJcXKop" role="3clF45">
         <ref role="3uigEE" to="33ny:~Set" resolve="Set" />
         <node concept="3uibUv" id="78CwJJcXKoq" role="11_B2D">
-          <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
         </node>
       </node>
       <node concept="3Tm1VV" id="78CwJJcXKor" role="1B3o_S" />
@@ -930,7 +930,7 @@
       <node concept="37vLTG" id="78CwJJcXom8" role="3clF46">
         <property role="TrG5h" value="constraintSymbol" />
         <node concept="3uibUv" id="78CwJJcXom7" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
         </node>
       </node>
     </node>
@@ -940,7 +940,7 @@
       <node concept="3uibUv" id="ZqZbw4RJ9K" role="3clF45">
         <ref role="3uigEE" to="33ny:~Set" resolve="Set" />
         <node concept="3uibUv" id="78CwJJcXOef" role="11_B2D">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
         </node>
       </node>
       <node concept="3Tm1VV" id="ZqZbw4RIlO" role="1B3o_S" />
@@ -968,14 +968,14 @@
               <node concept="3cpWsn" id="5uFPQ7BEo4w" role="3cpWs9">
                 <property role="TrG5h" value="cst" />
                 <node concept="3uibUv" id="5uFPQ7BEo4s" role="1tU5fm">
-                  <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+                  <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
                 </node>
                 <node concept="10QFUN" id="5uFPQ7BEo4x" role="33vP2m">
                   <node concept="37vLTw" id="5uFPQ7BEo4y" role="10QFUP">
                     <ref role="3cqZAo" node="7eGEHDldphF" resolve="item" />
                   </node>
                   <node concept="3uibUv" id="5uFPQ7BEo4z" role="10QFUM">
-                    <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+                    <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
                   </node>
                 </node>
               </node>
@@ -991,7 +991,7 @@
                         <ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
                       </node>
                       <node concept="liA8E" id="30XHGaOWeZv" role="2OqNvi">
-                        <ref role="37wK5l" to="rchb:5uFPQ7B_b06" resolve="arguments" />
+                        <ref role="37wK5l" to="av0y:~AndItem.arguments():java.util.Collection" resolve="arguments" />
                       </node>
                     </node>
                     <node concept="liA8E" id="30XHGaOWfgx" role="2OqNvi">
@@ -1004,11 +1004,11 @@
                         <ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
                       </node>
                       <node concept="liA8E" id="30XHGaP5pQG" role="2OqNvi">
-                        <ref role="37wK5l" to="rchb:5uFPQ7B_aTC" resolve="symbol" />
+                        <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
                       </node>
                     </node>
                     <node concept="liA8E" id="7eGEHDlg3RZ" role="2OqNvi">
-                      <ref role="37wK5l" to="rchb:54i3FxcZMv$" resolve="arity" />
+                      <ref role="37wK5l" to="av0y:~Symbol.arity():int" resolve="arity" />
                     </node>
                   </node>
                 </node>
@@ -1021,7 +1021,7 @@
                 <node concept="YS8fn" id="7Oc59RSHOPS" role="3cqZAp">
                   <node concept="2ShNRf" id="7Oc59RSHPbM" role="YScLw">
                     <node concept="1pGfFk" id="7Oc59RSHPxc" role="2ShVmc">
-                      <ref role="37wK5l" to="rchb:7Oc59RSHJEw" resolve="InvalidConstraintException" />
+                      <ref role="37wK5l" to="av0y:~InvalidConstraintException.&lt;init&gt;(java.lang.String)" resolve="InvalidConstraintException" />
                       <node concept="3cpWs3" id="7Oc59RSHQew" role="37wK5m">
                         <node concept="2YIFZM" id="7Oc59RSHQex" role="3uHU7w">
                           <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
@@ -1031,7 +1031,7 @@
                               <ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
                             </node>
                             <node concept="liA8E" id="7Oc59RSHQe$" role="2OqNvi">
-                              <ref role="37wK5l" to="rchb:5uFPQ7B_aTC" resolve="symbol" />
+                              <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
                             </node>
                           </node>
                         </node>
@@ -1058,7 +1058,7 @@
                     <node concept="YS8fn" id="1zN1RIln3iC" role="3cqZAp">
                       <node concept="2ShNRf" id="1zN1RIln3iD" role="YScLw">
                         <node concept="1pGfFk" id="1zN1RIln3iE" role="2ShVmc">
-                          <ref role="37wK5l" to="rchb:7Oc59RSHJEw" resolve="InvalidConstraintException" />
+                          <ref role="37wK5l" to="av0y:~InvalidConstraintException.&lt;init&gt;(java.lang.String)" resolve="InvalidConstraintException" />
                           <node concept="3cpWs3" id="4sSe4$prVxK" role="37wK5m">
                             <node concept="3cpWs3" id="4sSe4$prSVy" role="3uHU7B">
                               <node concept="3cpWs3" id="4sSe4$prRB1" role="3uHU7B">
@@ -1075,7 +1075,7 @@
                                           <ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
                                         </node>
                                         <node concept="liA8E" id="1zN1RIln3iJ" role="2OqNvi">
-                                          <ref role="37wK5l" to="rchb:5uFPQ7B_aTC" resolve="symbol" />
+                                          <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
                                         </node>
                                       </node>
                                     </node>
@@ -1089,7 +1089,7 @@
                                     <ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
                                   </node>
                                   <node concept="liA8E" id="4sSe4$prSgx" role="2OqNvi">
-                                    <ref role="37wK5l" to="rchb:78CwJJcOwWR" resolve="argumentTypes" />
+                                    <ref role="37wK5l" to="av0y:~Constraint.argumentTypes():java.util.List" resolve="argumentTypes" />
                                   </node>
                                 </node>
                               </node>
@@ -1108,7 +1108,7 @@
                                     <ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
                                   </node>
                                   <node concept="liA8E" id="4sSe4$prWcW" role="2OqNvi">
-                                    <ref role="37wK5l" to="rchb:5uFPQ7B_aTC" resolve="symbol" />
+                                    <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
                                   </node>
                                 </node>
                               </node>
@@ -1125,7 +1125,7 @@
                           <ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
                         </node>
                         <node concept="liA8E" id="78CwJJcX3RX" role="2OqNvi">
-                          <ref role="37wK5l" to="rchb:78CwJJcOwWR" resolve="argumentTypes" />
+                          <ref role="37wK5l" to="av0y:~Constraint.argumentTypes():java.util.List" resolve="argumentTypes" />
                         </node>
                       </node>
                       <node concept="liA8E" id="78CwJJcX49I" role="2OqNvi">
@@ -1141,7 +1141,7 @@
                                 <ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
                               </node>
                               <node concept="liA8E" id="30XHGaP5H3x" role="2OqNvi">
-                                <ref role="37wK5l" to="rchb:5uFPQ7B_aTC" resolve="symbol" />
+                                <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
                               </node>
                             </node>
                           </node>
@@ -1162,7 +1162,7 @@
                       <ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
                     </node>
                     <node concept="liA8E" id="7eGEHDleLzH" role="2OqNvi">
-                      <ref role="37wK5l" to="rchb:5uFPQ7B_aTC" resolve="symbol" />
+                      <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
                     </node>
                   </node>
                 </node>
@@ -1172,7 +1172,7 @@
           </node>
           <node concept="2ZW3vV" id="5uFPQ7BEjM3" role="3clFbw">
             <node concept="3uibUv" id="5uFPQ7BEk3l" role="2ZW6by">
-              <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+              <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
             </node>
             <node concept="37vLTw" id="5uFPQ7BEjxn" role="2ZW6bz">
               <ref role="3cqZAo" node="7eGEHDldphF" resolve="item" />
@@ -1181,7 +1181,7 @@
           <node concept="3eNFk2" id="5uFPQ7BEsMn" role="3eNLev">
             <node concept="2ZW3vV" id="5uFPQ7BEtf6" role="3eO9$A">
               <node concept="3uibUv" id="5uFPQ7BEtlm" role="2ZW6by">
-                <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+                <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
               </node>
               <node concept="37vLTw" id="5uFPQ7BEt9u" role="2ZW6bz">
                 <ref role="3cqZAo" node="7eGEHDldphF" resolve="item" />
@@ -1192,14 +1192,14 @@
                 <node concept="3cpWsn" id="5uFPQ7BEu6z" role="3cpWs9">
                   <property role="TrG5h" value="pred" />
                   <node concept="3uibUv" id="5uFPQ7BEu6w" role="1tU5fm">
-                    <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+                    <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
                   </node>
                   <node concept="10QFUN" id="5uFPQ7BEu6$" role="33vP2m">
                     <node concept="37vLTw" id="5uFPQ7BEu6_" role="10QFUP">
                       <ref role="3cqZAo" node="7eGEHDldphF" resolve="item" />
                     </node>
                     <node concept="3uibUv" id="5uFPQ7BEu6A" role="10QFUM">
-                      <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+                      <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
                     </node>
                   </node>
                 </node>
@@ -1211,7 +1211,7 @@
                   <node concept="YS8fn" id="2pvEdquuFKC" role="3cqZAp">
                     <node concept="2ShNRf" id="2pvEdquuFKD" role="YScLw">
                       <node concept="1pGfFk" id="2pvEdquuFKE" role="2ShVmc">
-                        <ref role="37wK5l" to="rchb:7Oc59RSHJEw" resolve="InvalidConstraintException" />
+                        <ref role="37wK5l" to="av0y:~InvalidConstraintException.&lt;init&gt;(java.lang.String)" resolve="InvalidConstraintException" />
                         <node concept="3cpWs3" id="2pvEdquuFKF" role="37wK5m">
                           <node concept="2YIFZM" id="2pvEdquuFKG" role="3uHU7w">
                             <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
@@ -1221,7 +1221,7 @@
                                 <ref role="3cqZAo" node="5uFPQ7BEu6z" resolve="pred" />
                               </node>
                               <node concept="liA8E" id="2pvEdquuFKJ" role="2OqNvi">
-                                <ref role="37wK5l" to="rchb:6Kcfpq7Bjgi" resolve="symbol" />
+                                <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
                               </node>
                             </node>
                           </node>
@@ -1240,7 +1240,7 @@
                         <ref role="3cqZAo" node="5uFPQ7BEu6z" resolve="pred" />
                       </node>
                       <node concept="liA8E" id="30XHGaOWeEi" role="2OqNvi">
-                        <ref role="37wK5l" to="rchb:5uFPQ7B_b06" resolve="arguments" />
+                        <ref role="37wK5l" to="av0y:~AndItem.arguments():java.util.Collection" resolve="arguments" />
                       </node>
                     </node>
                     <node concept="liA8E" id="30XHGaOWeVo" role="2OqNvi">
@@ -1253,11 +1253,11 @@
                         <ref role="3cqZAo" node="5uFPQ7BEu6z" resolve="pred" />
                       </node>
                       <node concept="liA8E" id="2pvEdquuFma" role="2OqNvi">
-                        <ref role="37wK5l" to="rchb:6Kcfpq7Bjgi" resolve="symbol" />
+                        <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
                       </node>
                     </node>
                     <node concept="liA8E" id="2pvEdquuFmb" role="2OqNvi">
-                      <ref role="37wK5l" to="rchb:54i3FxcZMv$" resolve="arity" />
+                      <ref role="37wK5l" to="av0y:~Symbol.arity():int" resolve="arity" />
                     </node>
                   </node>
                 </node>
@@ -1273,7 +1273,7 @@
                 <node concept="YS8fn" id="2KVRGowW_uZ" role="3cqZAp">
                   <node concept="2ShNRf" id="2KVRGowW_w4" role="YScLw">
                     <node concept="1pGfFk" id="2KVRGowWD9N" role="2ShVmc">
-                      <ref role="37wK5l" to="rchb:7Oc59RSHJEw" resolve="InvalidConstraintException" />
+                      <ref role="37wK5l" to="av0y:~InvalidConstraintException.&lt;init&gt;(java.lang.String)" resolve="InvalidConstraintException" />
                       <node concept="3cpWs3" id="2KVRGowWD$u" role="37wK5m">
                         <node concept="2YIFZM" id="2KVRGowWDMj" role="3uHU7w">
                           <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
@@ -1283,7 +1283,7 @@
                               <ref role="3cqZAo" node="7eGEHDldphF" resolve="item" />
                             </node>
                             <node concept="liA8E" id="2KVRGowWEea" role="2OqNvi">
-                              <ref role="37wK5l" to="rchb:5uFPQ7BE$9i" resolve="symbol" />
+                              <ref role="37wK5l" to="av0y:~AndItem.symbol():jetbrains.mps.logic.reactor.program.Symbol" resolve="symbol" />
                             </node>
                           </node>
                         </node>
@@ -1315,7 +1315,7 @@
               <ref role="3cqZAo" node="7eGEHDldphF" resolve="item" />
             </node>
             <node concept="liA8E" id="2KVRGowW$Kw" role="2OqNvi">
-              <ref role="37wK5l" to="rchb:5uFPQ7B_b06" resolve="arguments" />
+              <ref role="37wK5l" to="av0y:~AndItem.arguments():java.util.Collection" resolve="arguments" />
             </node>
           </node>
         </node>
@@ -1323,11 +1323,11 @@
       <node concept="37vLTG" id="7eGEHDldphF" role="3clF46">
         <property role="TrG5h" value="item" />
         <node concept="3uibUv" id="5uFPQ7BEg4K" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+          <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
         </node>
       </node>
       <node concept="3uibUv" id="7Oc59RSHN4l" role="Sfmx6">
-        <ref role="3uigEE" to="rchb:7Oc59RSHJnv" resolve="InvalidConstraintException" />
+        <ref role="3uigEE" to="av0y:~InvalidConstraintException" resolve="InvalidConstraintException" />
       </node>
     </node>
     <node concept="2tJIrI" id="7eGEHDldnO1" role="jymVt" />
@@ -1349,14 +1349,14 @@
               <node concept="3cpWsn" id="5uFPQ7BH1yJ" role="3cpWs9">
                 <property role="TrG5h" value="cst" />
                 <node concept="3uibUv" id="5uFPQ7BH1yG" role="1tU5fm">
-                  <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+                  <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
                 </node>
                 <node concept="10QFUN" id="5uFPQ7BH1yK" role="33vP2m">
                   <node concept="37vLTw" id="5uFPQ7BH1yL" role="10QFUP">
                     <ref role="3cqZAo" node="7eGEHDleg3E" resolve="item" />
                   </node>
                   <node concept="3uibUv" id="5uFPQ7BH1yM" role="10QFUM">
-                    <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+                    <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
                   </node>
                 </node>
               </node>
@@ -1373,7 +1373,7 @@
                       <ref role="3cqZAo" node="5uFPQ7BH1yJ" resolve="cst" />
                     </node>
                     <node concept="liA8E" id="7eGEHDleRaS" role="2OqNvi">
-                      <ref role="37wK5l" to="rchb:5uFPQ7B_aTC" resolve="symbol" />
+                      <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
                     </node>
                   </node>
                   <node concept="2OqwBi" id="78CwJJcWZ_9" role="37wK5m">
@@ -1381,7 +1381,7 @@
                       <ref role="3cqZAo" node="5uFPQ7BH1yJ" resolve="cst" />
                     </node>
                     <node concept="liA8E" id="78CwJJcWZFx" role="2OqNvi">
-                      <ref role="37wK5l" to="rchb:78CwJJcOwWR" resolve="argumentTypes" />
+                      <ref role="37wK5l" to="av0y:~Constraint.argumentTypes():java.util.List" resolve="argumentTypes" />
                     </node>
                   </node>
                 </node>
@@ -1391,7 +1391,7 @@
           </node>
           <node concept="2ZW3vV" id="5uFPQ7BH0Nf" role="3clFbw">
             <node concept="3uibUv" id="5uFPQ7BH0W3" role="2ZW6by">
-              <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+              <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
             </node>
             <node concept="37vLTw" id="5uFPQ7BH0oU" role="2ZW6bz">
               <ref role="3cqZAo" node="7eGEHDleg3E" resolve="item" />
@@ -1400,7 +1400,7 @@
           <node concept="3eNFk2" id="5uFPQ7BH23e" role="3eNLev">
             <node concept="2ZW3vV" id="5uFPQ7BH2ms" role="3eO9$A">
               <node concept="3uibUv" id="5uFPQ7BH2ni" role="2ZW6by">
-                <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+                <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
               </node>
               <node concept="37vLTw" id="5uFPQ7BH2j_" role="2ZW6bz">
                 <ref role="3cqZAo" node="7eGEHDleg3E" resolve="item" />
@@ -1411,14 +1411,14 @@
                 <node concept="3cpWsn" id="5uFPQ7BH2qT" role="3cpWs9">
                   <property role="TrG5h" value="pred" />
                   <node concept="3uibUv" id="5uFPQ7BH2qQ" role="1tU5fm">
-                    <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+                    <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
                   </node>
                   <node concept="10QFUN" id="5uFPQ7BH2qU" role="33vP2m">
                     <node concept="37vLTw" id="5uFPQ7BH2qV" role="10QFUP">
                       <ref role="3cqZAo" node="7eGEHDleg3E" resolve="item" />
                     </node>
                     <node concept="3uibUv" id="5uFPQ7BH2qW" role="10QFUM">
-                      <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+                      <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
                     </node>
                   </node>
                 </node>
@@ -1435,7 +1435,7 @@
                         <ref role="3cqZAo" node="5uFPQ7BH2qT" resolve="pred" />
                       </node>
                       <node concept="liA8E" id="78CwJJcX$qQ" role="2OqNvi">
-                        <ref role="37wK5l" to="rchb:6Kcfpq7Bjgi" resolve="symbol" />
+                        <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
                       </node>
                     </node>
                   </node>
@@ -1473,11 +1473,11 @@
       <node concept="37vLTG" id="7eGEHDleg3E" role="3clF46">
         <property role="TrG5h" value="item" />
         <node concept="3uibUv" id="5uFPQ7BGZBH" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+          <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
         </node>
       </node>
       <node concept="3uibUv" id="7Oc59RSHLFV" role="Sfmx6">
-        <ref role="3uigEE" to="rchb:7Oc59RSHJnv" resolve="InvalidConstraintException" />
+        <ref role="3uigEE" to="av0y:~InvalidConstraintException" resolve="InvalidConstraintException" />
       </node>
       <node concept="3Tmbuc" id="5rhZO$U01k6" role="1B3o_S" />
     </node>
@@ -1489,14 +1489,14 @@
       <node concept="3uibUv" id="7ISVfSJtsY" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~Set" resolve="Set" />
         <node concept="3uibUv" id="78CwJJcXzcn" role="11_B2D">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
         </node>
       </node>
       <node concept="2ShNRf" id="7ISVfSJtt0" role="33vP2m">
         <node concept="1pGfFk" id="7ISVfSJtt1" role="2ShVmc">
           <ref role="37wK5l" to="33ny:~HashSet.&lt;init&gt;()" resolve="HashSet" />
           <node concept="3uibUv" id="78CwJJcXzNm" role="1pMfVU">
-            <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+            <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
           </node>
         </node>
       </node>
@@ -1508,7 +1508,7 @@
       <node concept="3uibUv" id="7eGEHDley91" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
         <node concept="3uibUv" id="30XHGaP58dI" role="11_B2D">
-          <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
         </node>
         <node concept="3uibUv" id="78CwJJcX046" role="11_B2D">
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
@@ -1522,7 +1522,7 @@
         <node concept="1pGfFk" id="7eGEHDle_f8" role="2ShVmc">
           <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
           <node concept="3uibUv" id="30XHGaP58v0" role="1pMfVU">
-            <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+            <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
           </node>
           <node concept="3uibUv" id="78CwJJcX2Zu" role="1pMfVU">
             <ref role="3uigEE" to="33ny:~List" resolve="List" />
@@ -1544,7 +1544,7 @@
       <node concept="3uibUv" id="aFQeb4jRC4" role="3clF45">
         <ref role="3uigEE" to="33ny:~Set" resolve="Set" />
         <node concept="3uibUv" id="7nPD14NOXoR" role="11_B2D">
-          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
         </node>
       </node>
       <node concept="3Tm1VV" id="aFQeb4jQAB" role="1B3o_S" />
@@ -1571,11 +1571,11 @@
       <node concept="37vLTG" id="2$F5QpuuhMO" role="3clF46">
         <property role="TrG5h" value="metaLogical" />
         <node concept="3uibUv" id="7HUwyZaOE2P" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
         </node>
       </node>
       <node concept="3uibUv" id="2$F5Qpuug7j" role="3clF45">
-        <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+        <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
       </node>
       <node concept="3Tm1VV" id="2$F5QpuufjT" role="1B3o_S" />
       <node concept="3clFbS" id="2$F5QpuufjU" role="3clF47">
@@ -1654,7 +1654,7 @@
         <property role="TrG5h" value="rule" />
         <property role="3TUv4t" value="true" />
         <node concept="3uibUv" id="5rhZO$TZT8s" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
         </node>
       </node>
       <node concept="3clFbS" id="5rhZO$TZT5j" role="3clF47">
@@ -1676,7 +1676,7 @@
                           <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object):java.lang.Object" resolve="put" />
                           <node concept="10QFUN" id="5rhZO$TZT5w" role="37wK5m">
                             <node concept="3uibUv" id="5rhZO$TZT5x" role="10QFUM">
-                              <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                              <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                             </node>
                             <node concept="37vLTw" id="5rhZO$TZT5y" role="10QFUP">
                               <ref role="3cqZAo" node="5rhZO$TZT5B" resolve="arg" />
@@ -1691,7 +1691,7 @@
                   </node>
                   <node concept="2ZW3vV" id="5rhZO$TZT5$" role="3clFbw">
                     <node concept="3uibUv" id="5rhZO$TZT5_" role="2ZW6by">
-                      <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                      <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                     </node>
                     <node concept="37vLTw" id="5rhZO$TZT5A" role="2ZW6bz">
                       <ref role="3cqZAo" node="5rhZO$TZT5B" resolve="arg" />
@@ -1710,7 +1710,7 @@
                   <ref role="3cqZAo" node="5rhZO$TZT5G" resolve="cst" />
                 </node>
                 <node concept="liA8E" id="5rhZO$TZT5F" role="2OqNvi">
-                  <ref role="37wK5l" to="rchb:5uFPQ7B_b06" resolve="arguments" />
+                  <ref role="37wK5l" to="av0y:~AndItem.arguments():java.util.Collection" resolve="arguments" />
                 </node>
               </node>
             </node>
@@ -1718,7 +1718,7 @@
           <node concept="3cpWsn" id="5rhZO$TZT5G" role="1Duv9x">
             <property role="TrG5h" value="cst" />
             <node concept="3uibUv" id="5rhZO$TZT5H" role="1tU5fm">
-              <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+              <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
             </node>
           </node>
           <node concept="2OqwBi" id="5rhZO$TZT5I" role="1DdaDG">
@@ -1726,7 +1726,7 @@
               <ref role="3cqZAo" node="5rhZO$TZT8r" resolve="rule" />
             </node>
             <node concept="liA8E" id="5rhZO$TZT5K" role="2OqNvi">
-              <ref role="37wK5l" to="rchb:7eGEHDlc$9D" resolve="headKept" />
+              <ref role="37wK5l" to="av0y:~Rule.headKept():java.lang.Iterable" resolve="headKept" />
             </node>
           </node>
         </node>
@@ -1748,7 +1748,7 @@
                           <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object):java.lang.Object" resolve="put" />
                           <node concept="10QFUN" id="5rhZO$TZT5X" role="37wK5m">
                             <node concept="3uibUv" id="5rhZO$TZT5Y" role="10QFUM">
-                              <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                              <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                             </node>
                             <node concept="37vLTw" id="5rhZO$TZT5Z" role="10QFUP">
                               <ref role="3cqZAo" node="5rhZO$TZT64" resolve="arg" />
@@ -1763,7 +1763,7 @@
                   </node>
                   <node concept="2ZW3vV" id="5rhZO$TZT61" role="3clFbw">
                     <node concept="3uibUv" id="5rhZO$TZT62" role="2ZW6by">
-                      <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                      <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                     </node>
                     <node concept="37vLTw" id="5rhZO$TZT63" role="2ZW6bz">
                       <ref role="3cqZAo" node="5rhZO$TZT64" resolve="arg" />
@@ -1782,7 +1782,7 @@
                   <ref role="3cqZAo" node="5rhZO$TZT69" resolve="cst" />
                 </node>
                 <node concept="liA8E" id="5rhZO$TZT68" role="2OqNvi">
-                  <ref role="37wK5l" to="rchb:5uFPQ7B_b06" resolve="arguments" />
+                  <ref role="37wK5l" to="av0y:~AndItem.arguments():java.util.Collection" resolve="arguments" />
                 </node>
               </node>
             </node>
@@ -1790,7 +1790,7 @@
           <node concept="3cpWsn" id="5rhZO$TZT69" role="1Duv9x">
             <property role="TrG5h" value="cst" />
             <node concept="3uibUv" id="5rhZO$TZT6a" role="1tU5fm">
-              <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+              <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
             </node>
           </node>
           <node concept="2OqwBi" id="5rhZO$TZT6b" role="1DdaDG">
@@ -1798,7 +1798,7 @@
               <ref role="3cqZAo" node="5rhZO$TZT8r" resolve="rule" />
             </node>
             <node concept="liA8E" id="5rhZO$TZT6d" role="2OqNvi">
-              <ref role="37wK5l" to="rchb:7eGEHDlc$9J" resolve="headReplaced" />
+              <ref role="37wK5l" to="av0y:~Rule.headReplaced():java.lang.Iterable" resolve="headReplaced" />
             </node>
           </node>
         </node>
@@ -1814,7 +1814,7 @@
           <node concept="3cpWsn" id="5rhZO$TZT6j" role="1Duv9x">
             <property role="TrG5h" value="pred" />
             <node concept="3uibUv" id="5rhZO$TZT6k" role="1tU5fm">
-              <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+              <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
             </node>
           </node>
           <node concept="2OqwBi" id="5rhZO$TZT6l" role="1DdaDG">
@@ -1822,7 +1822,7 @@
               <ref role="3cqZAo" node="5rhZO$TZT8r" resolve="rule" />
             </node>
             <node concept="liA8E" id="5rhZO$TZT6n" role="2OqNvi">
-              <ref role="37wK5l" to="rchb:7eGEHDlc$9P" resolve="guard" />
+              <ref role="37wK5l" to="av0y:~Rule.guard():java.lang.Iterable" resolve="guard" />
             </node>
           </node>
         </node>
@@ -1844,7 +1844,7 @@
                               <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object):java.lang.Object" resolve="put" />
                               <node concept="10QFUN" id="5rhZO$TZT6z" role="37wK5m">
                                 <node concept="3uibUv" id="7nPD14NOWJl" role="10QFUM">
-                                  <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                                  <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                                 </node>
                                 <node concept="37vLTw" id="5rhZO$TZT6_" role="10QFUP">
                                   <ref role="3cqZAo" node="5rhZO$TZT8h" resolve="arg" />
@@ -1860,7 +1860,7 @@
                       </node>
                       <node concept="2ZW3vV" id="5rhZO$TZT6C" role="3clFbw">
                         <node concept="3uibUv" id="5rhZO$TZT6D" role="2ZW6by">
-                          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                         </node>
                         <node concept="37vLTw" id="5rhZO$TZT6E" role="2ZW6bz">
                           <ref role="3cqZAo" node="5rhZO$TZT8h" resolve="arg" />
@@ -2138,7 +2138,7 @@
                       <ref role="3cqZAo" node="5rhZO$TZT8m" resolve="item" />
                     </node>
                     <node concept="liA8E" id="5rhZO$TZT8l" role="2OqNvi">
-                      <ref role="37wK5l" to="rchb:5uFPQ7B_b06" resolve="arguments" />
+                      <ref role="37wK5l" to="av0y:~AndItem.arguments():java.util.Collection" resolve="arguments" />
                     </node>
                   </node>
                 </node>
@@ -2146,7 +2146,7 @@
               <node concept="3cpWsn" id="5rhZO$TZT8m" role="1Duv9x">
                 <property role="TrG5h" value="item" />
                 <node concept="3uibUv" id="5rhZO$TZT8n" role="1tU5fm">
-                  <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+                  <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
                 </node>
               </node>
               <node concept="37vLTw" id="TYqmVPGe0u" role="1DdaDG">
@@ -2159,7 +2159,7 @@
             <node concept="3uibUv" id="TYqmVPGczW" role="1tU5fm">
               <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
               <node concept="3uibUv" id="TYqmVPGczX" role="11_B2D">
-                <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+                <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
               </node>
             </node>
           </node>
@@ -2168,7 +2168,7 @@
               <ref role="3cqZAo" node="5rhZO$TZT8r" resolve="rule" />
             </node>
             <node concept="liA8E" id="TYqmVPGcZy" role="2OqNvi">
-              <ref role="37wK5l" to="rchb:TYqmVPFWVP" resolve="bodyAlternation" />
+              <ref role="37wK5l" to="av0y:~Rule.bodyAlternation():java.lang.Iterable" resolve="bodyAlternation" />
             </node>
           </node>
         </node>
@@ -2182,20 +2182,20 @@
       <node concept="3uibUv" id="2$F5QpusuSy" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
         <node concept="3uibUv" id="7HUwyZaOa9R" role="11_B2D">
-          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
         </node>
         <node concept="3uibUv" id="2$F5QpuubsW" role="11_B2D">
-          <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
         </node>
       </node>
       <node concept="2ShNRf" id="2$F5QpusuS$" role="33vP2m">
         <node concept="1pGfFk" id="2$F5QpusuS_" role="2ShVmc">
           <ref role="37wK5l" to="33ny:~IdentityHashMap.&lt;init&gt;()" resolve="IdentityHashMap" />
           <node concept="3uibUv" id="7HUwyZaOaOH" role="1pMfVU">
-            <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+            <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
           </node>
           <node concept="3uibUv" id="2$F5QpuucxZ" role="1pMfVU">
-            <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+            <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
           </node>
         </node>
       </node>
@@ -2207,20 +2207,20 @@
       <node concept="3uibUv" id="aFQeb4kfUf" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
         <node concept="3uibUv" id="7nPD14NOWN9" role="11_B2D">
-          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
         </node>
         <node concept="3uibUv" id="2$F5QpuucP4" role="11_B2D">
-          <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
         </node>
       </node>
       <node concept="2ShNRf" id="aFQeb4jN9q" role="33vP2m">
         <node concept="1pGfFk" id="aFQeb4jNr2" role="2ShVmc">
           <ref role="37wK5l" to="33ny:~IdentityHashMap.&lt;init&gt;()" resolve="IdentityHashMap" />
           <node concept="3uibUv" id="7nPD14NOX6c" role="1pMfVU">
-            <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+            <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
           </node>
           <node concept="3uibUv" id="2$F5QpuudCp" role="1pMfVU">
-            <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+            <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
           </node>
         </node>
       </node>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps
index 6524fdc1..717fc6b6 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps
@@ -7,9 +7,9 @@
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
-    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
+    <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
@@ -243,7 +243,7 @@
       <node concept="37vLTG" id="5p8T3QHE69z" role="3clF46">
         <property role="TrG5h" value="sessionSolver" />
         <node concept="3uibUv" id="4xBopTzoL5d" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
       </node>
     </node>
@@ -254,7 +254,7 @@
       <node concept="37vLTG" id="2UGjFq4fUbG" role="3clF46">
         <property role="TrG5h" value="predicateSymbol" />
         <node concept="3uibUv" id="2UGjFq4fUbH" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
         </node>
       </node>
       <node concept="37vLTG" id="2UGjFq4fUbI" role="3clF46">
@@ -266,7 +266,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="2UGjFq4gVon" role="3clF45">
-        <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+        <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
       </node>
       <node concept="3Tm1VV" id="2UGjFq4fUbM" role="1B3o_S" />
       <node concept="3clFbS" id="2UGjFq4fUbP" role="3clF47">
@@ -352,7 +352,7 @@
       <node concept="37vLTG" id="2UGjFq4lDR6" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="2UGjFq4lDR7" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="10P_77" id="2UGjFq4lDR8" role="3clF45" />
@@ -367,7 +367,7 @@
                   <ref role="3cqZAo" node="2UGjFq4lDR6" resolve="invocation" />
                 </node>
                 <node concept="liA8E" id="2UGjFq4lFoe" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:49L2l3FhtTG" resolve="arguments" />
+                  <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
                 </node>
               </node>
               <node concept="liA8E" id="2UGjFq4lFof" role="2OqNvi">
@@ -383,7 +383,7 @@
                   <ref role="3cqZAo" node="2UGjFq4lDR6" resolve="invocation" />
                 </node>
                 <node concept="liA8E" id="2UGjFq4lFMe" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:49L2l3FhtTG" resolve="arguments" />
+                  <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
                 </node>
               </node>
               <node concept="liA8E" id="2UGjFq4lFMf" role="2OqNvi">
@@ -425,7 +425,7 @@
                     <ref role="3cqZAo" node="2UGjFq4lB$n" resolve="left" />
                   </node>
                   <node concept="3uibUv" id="2UGjFq4lBz3" role="10QFUM">
-                    <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                    <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                     <node concept="16syzq" id="2UGjFq4lBz4" role="11_B2D">
                       <ref role="16sUi3" node="2UGjFq4mCKS" resolve="T" />
                     </node>
@@ -433,7 +433,7 @@
                 </node>
                 <node concept="10QFUN" id="2UGjFq4lBz5" role="37wK5m">
                   <node concept="3uibUv" id="2UGjFq4lBz6" role="10QFUM">
-                    <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                    <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                     <node concept="16syzq" id="2UGjFq4lBz7" role="11_B2D">
                       <ref role="16sUi3" node="2UGjFq4mCKS" resolve="T" />
                     </node>
@@ -449,7 +449,7 @@
           <node concept="1Wc70l" id="2UGjFq4lBza" role="3clFbw">
             <node concept="2ZW3vV" id="2UGjFq4lBzb" role="3uHU7w">
               <node concept="3uibUv" id="2UGjFq4lBzc" role="2ZW6by">
-                <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               </node>
               <node concept="37vLTw" id="2UGjFq4lB$E" role="2ZW6bz">
                 <ref role="3cqZAo" node="2UGjFq4lB$p" resolve="right" />
@@ -457,7 +457,7 @@
             </node>
             <node concept="2ZW3vV" id="2UGjFq4lBze" role="3uHU7B">
               <node concept="3uibUv" id="2UGjFq4lBzf" role="2ZW6by">
-                <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               </node>
               <node concept="37vLTw" id="2UGjFq4lB$z" role="2ZW6bz">
                 <ref role="3cqZAo" node="2UGjFq4lB$n" resolve="left" />
@@ -474,7 +474,7 @@
                       <ref role="3cqZAo" node="2UGjFq4lB$n" resolve="left" />
                     </node>
                     <node concept="3uibUv" id="2UGjFq4lBzn" role="10QFUM">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                       <node concept="16syzq" id="2UGjFq4lBzo" role="11_B2D">
                         <ref role="16sUi3" node="2UGjFq4mCKS" resolve="T" />
                       </node>
@@ -497,7 +497,7 @@
                 <node concept="1eOMI4" id="2UGjFq4lBzv" role="3fr31v">
                   <node concept="2ZW3vV" id="2UGjFq4lBzw" role="1eOMHV">
                     <node concept="3uibUv" id="2UGjFq4lBzx" role="2ZW6by">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                     </node>
                     <node concept="37vLTw" id="2UGjFq4lB$w" role="2ZW6bz">
                       <ref role="3cqZAo" node="2UGjFq4lB$p" resolve="right" />
@@ -507,7 +507,7 @@
               </node>
               <node concept="2ZW3vV" id="2UGjFq4lBzz" role="3uHU7B">
                 <node concept="3uibUv" id="2UGjFq4lBz$" role="2ZW6by">
-                  <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                  <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 </node>
                 <node concept="37vLTw" id="2UGjFq4lB$v" role="2ZW6bz">
                   <ref role="3cqZAo" node="2UGjFq4lB$n" resolve="left" />
@@ -530,7 +530,7 @@
                   </node>
                   <node concept="10QFUN" id="2UGjFq4lBzH" role="37wK5m">
                     <node concept="3uibUv" id="2UGjFq4lBzI" role="10QFUM">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                       <node concept="16syzq" id="2UGjFq4lBzJ" role="11_B2D">
                         <ref role="16sUi3" node="2UGjFq4mCKS" resolve="T" />
                       </node>
@@ -546,7 +546,7 @@
             <node concept="1Wc70l" id="2UGjFq4lBzM" role="3eO9$A">
               <node concept="2ZW3vV" id="2UGjFq4lBzN" role="3uHU7w">
                 <node concept="3uibUv" id="2UGjFq4lBzO" role="2ZW6by">
-                  <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                  <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 </node>
                 <node concept="37vLTw" id="2UGjFq4lB$u" role="2ZW6bz">
                   <ref role="3cqZAo" node="2UGjFq4lB$p" resolve="right" />
@@ -556,7 +556,7 @@
                 <node concept="1eOMI4" id="2UGjFq4lBzR" role="3fr31v">
                   <node concept="2ZW3vV" id="2UGjFq4lBzS" role="1eOMHV">
                     <node concept="3uibUv" id="2UGjFq4lBzT" role="2ZW6by">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                     </node>
                     <node concept="37vLTw" id="2UGjFq4lB$D" role="2ZW6bz">
                       <ref role="3cqZAo" node="2UGjFq4lB$n" resolve="left" />
@@ -596,7 +596,7 @@
                 <node concept="1eOMI4" id="2UGjFq4lB$8" role="3fr31v">
                   <node concept="2ZW3vV" id="2UGjFq4lB$9" role="1eOMHV">
                     <node concept="3uibUv" id="2UGjFq4lB$a" role="2ZW6by">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                     </node>
                     <node concept="37vLTw" id="2UGjFq4lB$r" role="2ZW6bz">
                       <ref role="3cqZAo" node="2UGjFq4lB$n" resolve="left" />
@@ -608,7 +608,7 @@
                 <node concept="1eOMI4" id="2UGjFq4lB$d" role="3fr31v">
                   <node concept="2ZW3vV" id="2UGjFq4lB$e" role="1eOMHV">
                     <node concept="3uibUv" id="2UGjFq4lB$f" role="2ZW6by">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                     </node>
                     <node concept="37vLTw" id="2UGjFq4lB$s" role="2ZW6bz">
                       <ref role="3cqZAo" node="2UGjFq4lB$p" resolve="right" />
@@ -647,7 +647,7 @@
       <node concept="37vLTG" id="2UGjFq4lKkm" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="2UGjFq4lKkn" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="3clFbS" id="2UGjFq4lKkp" role="3clF47">
@@ -660,7 +660,7 @@
                   <ref role="3cqZAo" node="2UGjFq4lKkm" resolve="invocation" />
                 </node>
                 <node concept="liA8E" id="2UGjFq4lNPx" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:49L2l3FhtTG" resolve="arguments" />
+                  <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
                 </node>
               </node>
               <node concept="liA8E" id="2UGjFq4lNPy" role="2OqNvi">
@@ -676,7 +676,7 @@
                   <ref role="3cqZAo" node="2UGjFq4lKkm" resolve="invocation" />
                 </node>
                 <node concept="liA8E" id="2UGjFq4lNPB" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:49L2l3FhtTG" resolve="arguments" />
+                  <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
                 </node>
               </node>
               <node concept="liA8E" id="2UGjFq4lNPC" role="2OqNvi">
@@ -721,7 +721,7 @@
                     <ref role="3cqZAo" node="2UGjFq4lGBA" resolve="left" />
                   </node>
                   <node concept="3uibUv" id="2UGjFq4lGAh" role="10QFUM">
-                    <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                    <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                     <node concept="16syzq" id="2UGjFq4lGAi" role="11_B2D">
                       <ref role="16sUi3" node="2UGjFq4lHLA" resolve="T" />
                     </node>
@@ -729,7 +729,7 @@
                 </node>
                 <node concept="10QFUN" id="2UGjFq4lGAj" role="37wK5m">
                   <node concept="3uibUv" id="2UGjFq4lGAk" role="10QFUM">
-                    <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                    <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                     <node concept="16syzq" id="2UGjFq4lGAl" role="11_B2D">
                       <ref role="16sUi3" node="2UGjFq4lHLA" resolve="T" />
                     </node>
@@ -745,7 +745,7 @@
           <node concept="1Wc70l" id="2UGjFq4lGAo" role="3clFbw">
             <node concept="2ZW3vV" id="2UGjFq4lGAp" role="3uHU7w">
               <node concept="3uibUv" id="2UGjFq4lGAq" role="2ZW6by">
-                <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               </node>
               <node concept="37vLTw" id="2UGjFq4lGBM" role="2ZW6bz">
                 <ref role="3cqZAo" node="2UGjFq4lGBC" resolve="right" />
@@ -753,7 +753,7 @@
             </node>
             <node concept="2ZW3vV" id="2UGjFq4lGAs" role="3uHU7B">
               <node concept="3uibUv" id="2UGjFq4lGAt" role="2ZW6by">
-                <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               </node>
               <node concept="37vLTw" id="2UGjFq4lGBG" role="2ZW6bz">
                 <ref role="3cqZAo" node="2UGjFq4lGBA" resolve="left" />
@@ -770,7 +770,7 @@
                       <ref role="3cqZAo" node="2UGjFq4lGBA" resolve="left" />
                     </node>
                     <node concept="3uibUv" id="2UGjFq4lGA_" role="10QFUM">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                       <node concept="16syzq" id="2UGjFq4lGAA" role="11_B2D">
                         <ref role="16sUi3" node="2UGjFq4lHLA" resolve="T" />
                       </node>
@@ -793,7 +793,7 @@
                 <node concept="1eOMI4" id="2UGjFq4lGAH" role="3fr31v">
                   <node concept="2ZW3vV" id="2UGjFq4lGAI" role="1eOMHV">
                     <node concept="3uibUv" id="2UGjFq4lGAJ" role="2ZW6by">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                     </node>
                     <node concept="37vLTw" id="2UGjFq4lGBH" role="2ZW6bz">
                       <ref role="3cqZAo" node="2UGjFq4lGBC" resolve="right" />
@@ -803,7 +803,7 @@
               </node>
               <node concept="2ZW3vV" id="2UGjFq4lGAL" role="3uHU7B">
                 <node concept="3uibUv" id="2UGjFq4lGAM" role="2ZW6by">
-                  <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                  <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 </node>
                 <node concept="37vLTw" id="2UGjFq4lGBN" role="2ZW6bz">
                   <ref role="3cqZAo" node="2UGjFq4lGBA" resolve="left" />
@@ -826,7 +826,7 @@
                   </node>
                   <node concept="10QFUN" id="2UGjFq4lGAV" role="37wK5m">
                     <node concept="3uibUv" id="2UGjFq4lGAW" role="10QFUM">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                       <node concept="16syzq" id="2UGjFq4lGAX" role="11_B2D">
                         <ref role="16sUi3" node="2UGjFq4lHLA" resolve="T" />
                       </node>
@@ -842,7 +842,7 @@
             <node concept="1Wc70l" id="2UGjFq4lGB0" role="3eO9$A">
               <node concept="2ZW3vV" id="2UGjFq4lGB1" role="3uHU7w">
                 <node concept="3uibUv" id="2UGjFq4lGB2" role="2ZW6by">
-                  <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                  <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 </node>
                 <node concept="37vLTw" id="2UGjFq4lGBP" role="2ZW6bz">
                   <ref role="3cqZAo" node="2UGjFq4lGBC" resolve="right" />
@@ -852,7 +852,7 @@
                 <node concept="1eOMI4" id="2UGjFq4lGB5" role="3fr31v">
                   <node concept="2ZW3vV" id="2UGjFq4lGB6" role="1eOMHV">
                     <node concept="3uibUv" id="2UGjFq4lGB7" role="2ZW6by">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                     </node>
                     <node concept="37vLTw" id="2UGjFq4lGBT" role="2ZW6bz">
                       <ref role="3cqZAo" node="2UGjFq4lGBA" resolve="left" />
@@ -896,7 +896,7 @@
               <node concept="1eOMI4" id="2UGjFq4lGBn" role="3uHU7B">
                 <node concept="2ZW3vV" id="2UGjFq4lGBo" role="1eOMHV">
                   <node concept="3uibUv" id="2UGjFq4lGBp" role="2ZW6by">
-                    <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                    <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                   </node>
                   <node concept="37vLTw" id="2UGjFq4lGBI" role="2ZW6bz">
                     <ref role="3cqZAo" node="2UGjFq4lGBA" resolve="left" />
@@ -907,7 +907,7 @@
                 <node concept="1eOMI4" id="2UGjFq4lGBs" role="3fr31v">
                   <node concept="2ZW3vV" id="2UGjFq4lGBt" role="1eOMHV">
                     <node concept="3uibUv" id="2UGjFq4lGBu" role="2ZW6by">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                     </node>
                     <node concept="37vLTw" id="2UGjFq4lGBQ" role="2ZW6bz">
                       <ref role="3cqZAo" node="2UGjFq4lGBC" resolve="right" />
@@ -965,7 +965,7 @@
               <ref role="3cqZAo" node="4xBopTzoHcz" resolve="sessionSolver" />
             </node>
             <node concept="liA8E" id="6MYr6JwpMla" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:6MYr6JwonCY" resolve="queueIfBusy" />
+              <ref role="37wK5l" to="w7la:~SessionSolver.queueIfBusy(java.lang.Runnable):boolean" resolve="queueIfBusy" />
               <node concept="1bVj0M" id="7K4Mb_JwZRG" role="37wK5m">
                 <node concept="3clFbS" id="7K4Mb_JwZRH" role="1bW5cS">
                   <node concept="3clFbF" id="7K4Mb_JwZRI" role="3cqZAp">
@@ -1029,7 +1029,7 @@
               <ref role="3cqZAo" node="4xBopTzoHcz" resolve="sessionSolver" />
             </node>
             <node concept="liA8E" id="3eLgHzX3RSy" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:3eLgHzX3LYG" resolve="fail" />
+              <ref role="37wK5l" to="w7la:~SessionSolver.fail(java.lang.String):void" resolve="fail" />
               <node concept="3cpWs3" id="3HJTsBn7Ap2" role="37wK5m">
                 <node concept="Xl_RD" id="3HJTsBn7Asb" role="3uHU7w">
                   <property role="Xl_RC" value="'" />
@@ -1074,7 +1074,7 @@
       <node concept="37vLTG" id="3HJTsBn4V_r" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="3HJTsBn4V_s" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="6MYr6JwQ7Bx" role="11_B2D">
             <ref role="16sUi3" node="6MYr6JwQ5Cq" resolve="T" />
           </node>
@@ -1106,7 +1106,7 @@
       <node concept="37vLTG" id="3HJTsBn4V_C" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="3HJTsBn4V_D" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="6MYr6JwQoGG" role="11_B2D">
             <ref role="16sUi3" node="6MYr6JwQnR4" resolve="T" />
           </node>
@@ -1125,7 +1125,7 @@
           <node concept="3cpWsn" id="3HJTsBn77YW" role="3cpWs9">
             <property role="TrG5h" value="leftRepr" />
             <node concept="3uibUv" id="3HJTsBn79hD" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+              <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               <node concept="16syzq" id="6MYr6JwQpP1" role="11_B2D">
                 <ref role="16sUi3" node="6MYr6JwQnR4" resolve="T" />
               </node>
@@ -1135,7 +1135,7 @@
                 <ref role="3cqZAo" node="3HJTsBn4V_C" resolve="left" />
               </node>
               <node concept="liA8E" id="3HJTsBn77Z0" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:429xoyqB1jp" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~SolverLogical.findRoot():jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -1150,7 +1150,7 @@
               <ref role="3cqZAo" node="4xBopTzoHcz" resolve="sessionSolver" />
             </node>
             <node concept="liA8E" id="6MYr6JwpI7s" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:6MYr6JwonCY" resolve="queueIfBusy" />
+              <ref role="37wK5l" to="w7la:~SessionSolver.queueIfBusy(java.lang.Runnable):boolean" resolve="queueIfBusy" />
               <node concept="1bVj0M" id="7K4Mb_JwYHk" role="37wK5m">
                 <node concept="3clFbS" id="7K4Mb_JwYHl" role="1bW5cS">
                   <node concept="3clFbF" id="7K4Mb_JwYHm" role="3cqZAp">
@@ -1181,7 +1181,7 @@
                 <ref role="3cqZAo" node="3HJTsBn77YW" resolve="leftRepr" />
               </node>
               <node concept="liA8E" id="3HJTsBn77Zn" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
           </node>
@@ -1194,7 +1194,7 @@
                   <ref role="3cqZAo" node="3HJTsBn77YW" resolve="leftRepr" />
                 </node>
                 <node concept="liA8E" id="7K4Mb_JzT$I" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:6MYr6Jwy05T" resolve="setValue" />
+                  <ref role="37wK5l" to="bj13:~SolverLogical.setValue(java.lang.Object):void" resolve="setValue" />
                   <node concept="37vLTw" id="7K4Mb_JzT$N" role="37wK5m">
                     <ref role="3cqZAo" node="3HJTsBn4V_F" resolve="rightVal" />
                   </node>
@@ -1237,7 +1237,7 @@
       <node concept="37vLTG" id="3HJTsBn4V_R" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="3HJTsBn4V_S" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="6MYr6JwQtLp" role="11_B2D">
             <ref role="16sUi3" node="6MYr6JwQsDp" resolve="T" />
           </node>
@@ -1246,7 +1246,7 @@
       <node concept="37vLTG" id="3HJTsBn4V_U" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="3HJTsBn4V_V" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="6MYr6JwQuP9" role="11_B2D">
             <ref role="16sUi3" node="6MYr6JwQsDp" resolve="T" />
           </node>
@@ -1278,7 +1278,7 @@
           <node concept="3cpWsn" id="3HJTsBn6R7x" role="3cpWs9">
             <property role="TrG5h" value="leftRepr" />
             <node concept="3uibUv" id="3HJTsBn6UOm" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+              <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               <node concept="16syzq" id="6MYr6JwQvoS" role="11_B2D">
                 <ref role="16sUi3" node="6MYr6JwQsDp" resolve="T" />
               </node>
@@ -1288,7 +1288,7 @@
                 <ref role="3cqZAo" node="3HJTsBn4V_R" resolve="left" />
               </node>
               <node concept="liA8E" id="3HJTsBn6R7_" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:429xoyqB1jp" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~SolverLogical.findRoot():jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -1297,7 +1297,7 @@
           <node concept="3cpWsn" id="3HJTsBn6R7B" role="3cpWs9">
             <property role="TrG5h" value="rightRepr" />
             <node concept="3uibUv" id="3HJTsBn6WzP" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+              <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               <node concept="16syzq" id="6MYr6JwQvEZ" role="11_B2D">
                 <ref role="16sUi3" node="6MYr6JwQsDp" resolve="T" />
               </node>
@@ -1307,7 +1307,7 @@
                 <ref role="3cqZAo" node="3HJTsBn4V_U" resolve="right" />
               </node>
               <node concept="liA8E" id="3HJTsBn6R7F" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:429xoyqB1jp" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~SolverLogical.findRoot():jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -1336,7 +1336,7 @@
               <ref role="3cqZAo" node="4xBopTzoHcz" resolve="sessionSolver" />
             </node>
             <node concept="liA8E" id="6MYr6JwpKdw" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:6MYr6JwonCY" resolve="queueIfBusy" />
+              <ref role="37wK5l" to="w7la:~SessionSolver.queueIfBusy(java.lang.Runnable):boolean" resolve="queueIfBusy" />
               <node concept="1bVj0M" id="7K4Mb_Jx1A2" role="37wK5m">
                 <node concept="3clFbS" id="7K4Mb_Jx1A3" role="1bW5cS">
                   <node concept="3clFbF" id="7K4Mb_Jx1A4" role="3cqZAp">
@@ -1362,7 +1362,7 @@
               <ref role="3cqZAo" node="3HJTsBn6R7x" resolve="leftRepr" />
             </node>
             <node concept="liA8E" id="20WMLipx_Oa" role="2OqNvi">
-              <ref role="37wK5l" to="45ys:20WMLipvYTD" resolve="union" />
+              <ref role="37wK5l" to="bj13:~SolverLogical.union(jetbrains.mps.logic.reactor.logical.SolverLogical,jetbrains.mps.logic.reactor.logical.SolverLogical$ValueReconciler):void" resolve="union" />
               <node concept="37vLTw" id="20WMLipx_QK" role="37wK5m">
                 <ref role="3cqZAo" node="3HJTsBn6R7B" resolve="rightRepr" />
               </node>
@@ -1466,7 +1466,7 @@
       <node concept="37vLTG" id="3HJTsBn4VAp" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="3HJTsBn4VAq" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="6MYr6JwQEWs" role="11_B2D">
             <ref role="16sUi3" node="6MYr6JwQDrB" resolve="T" />
           </node>
@@ -1498,7 +1498,7 @@
       <node concept="37vLTG" id="3HJTsBn4VAC" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="3HJTsBn4VAD" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="6MYr6JwQHqG" role="11_B2D">
             <ref role="16sUi3" node="6MYr6JwQGB9" resolve="T" />
           </node>
@@ -1517,7 +1517,7 @@
           <node concept="3cpWsn" id="3HJTsBn6Ehk" role="3cpWs9">
             <property role="TrG5h" value="leftRepr" />
             <node concept="3uibUv" id="3HJTsBn6Fci" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+              <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               <node concept="16syzq" id="6MYr6JwQIFk" role="11_B2D">
                 <ref role="16sUi3" node="6MYr6JwQGB9" resolve="T" />
               </node>
@@ -1527,7 +1527,7 @@
                 <ref role="3cqZAo" node="3HJTsBn4VAC" resolve="left" />
               </node>
               <node concept="liA8E" id="3HJTsBn6Eho" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:429xoyqB1jp" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~SolverLogical.findRoot():jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -1548,7 +1548,7 @@
                 <ref role="3cqZAo" node="3HJTsBn6Ehk" resolve="leftRepr" />
               </node>
               <node concept="liA8E" id="3HJTsBn6Ehy" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
           </node>
@@ -1561,7 +1561,7 @@
                 <ref role="3cqZAo" node="3HJTsBn6Ehk" resolve="leftRepr" />
               </node>
               <node concept="liA8E" id="6xYPVrpBGC1" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
             <node concept="liA8E" id="6xYPVrpBIo_" role="2OqNvi">
@@ -1584,7 +1584,7 @@
       <node concept="37vLTG" id="3HJTsBn4VAT" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="3HJTsBn4VAU" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="6MYr6JwQLAe" role="11_B2D">
             <ref role="16sUi3" node="6MYr6JwQJMk" resolve="T" />
           </node>
@@ -1593,7 +1593,7 @@
       <node concept="37vLTG" id="3HJTsBn4VAW" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="3HJTsBn4VAX" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="6MYr6JwQMz4" role="11_B2D">
             <ref role="16sUi3" node="6MYr6JwQJMk" resolve="T" />
           </node>
@@ -1624,7 +1624,7 @@
           <node concept="3cpWsn" id="3HJTsBn61Rr" role="3cpWs9">
             <property role="TrG5h" value="leftRepr" />
             <node concept="3uibUv" id="3HJTsBn6y1d" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+              <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               <node concept="16syzq" id="6MYr6JwQN3J" role="11_B2D">
                 <ref role="16sUi3" node="6MYr6JwQJMk" resolve="T" />
               </node>
@@ -1634,7 +1634,7 @@
                 <ref role="3cqZAo" node="3HJTsBn4VAT" resolve="left" />
               </node>
               <node concept="liA8E" id="3HJTsBn61Rv" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:429xoyqB1jp" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~SolverLogical.findRoot():jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -1643,7 +1643,7 @@
           <node concept="3cpWsn" id="3HJTsBn61Rx" role="3cpWs9">
             <property role="TrG5h" value="rightRepr" />
             <node concept="3uibUv" id="3HJTsBn6yZM" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+              <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               <node concept="16syzq" id="6MYr6JwQNvZ" role="11_B2D">
                 <ref role="16sUi3" node="6MYr6JwQJMk" resolve="T" />
               </node>
@@ -1653,7 +1653,7 @@
                 <ref role="3cqZAo" node="3HJTsBn4VAW" resolve="right" />
               </node>
               <node concept="liA8E" id="3HJTsBn61R_" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:429xoyqB1jp" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~SolverLogical.findRoot():jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -1692,7 +1692,7 @@
                   <ref role="3cqZAo" node="3HJTsBn61Rr" resolve="leftRepr" />
                 </node>
                 <node concept="liA8E" id="6xYPVrpBCta" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
                 </node>
               </node>
             </node>
@@ -1702,7 +1702,7 @@
                   <ref role="3cqZAo" node="3HJTsBn61Rr" resolve="leftRepr" />
                 </node>
                 <node concept="liA8E" id="3HJTsBn6AhX" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
                 </node>
               </node>
               <node concept="10Nm6u" id="3HJTsBn6AhY" role="3uHU7w" />
@@ -1717,7 +1717,7 @@
                 <ref role="3cqZAo" node="3HJTsBn61Rr" resolve="leftRepr" />
               </node>
               <node concept="liA8E" id="6xYPVrpB_ns" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
             <node concept="liA8E" id="6xYPVrpBBqE" role="2OqNvi">
@@ -1727,7 +1727,7 @@
                   <ref role="3cqZAo" node="3HJTsBn61Rx" resolve="rightRepr" />
                 </node>
                 <node concept="liA8E" id="6xYPVrpBCwV" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
                 </node>
               </node>
             </node>
@@ -1744,11 +1744,11 @@
       <property role="TrG5h" value="sessionSolver" />
       <node concept="3Tm6S6" id="4xBopTzoHc$" role="1B3o_S" />
       <node concept="3uibUv" id="4xBopTzoIhj" role="1tU5fm">
-        <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
       </node>
     </node>
     <node concept="3uibUv" id="6H279bUP8wy" role="EKbjA">
-      <ref role="3uigEE" to="qrld:6H279bUODvp" resolve="Solver" />
+      <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
     </node>
   </node>
   <node concept="312cEu" id="4xBopTzrd8Y">
@@ -1761,7 +1761,7 @@
       <node concept="37vLTG" id="2UGjFq4h1E6" role="3clF46">
         <property role="TrG5h" value="predicateSymbol" />
         <node concept="3uibUv" id="2UGjFq4h1E7" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
         </node>
       </node>
       <node concept="37vLTG" id="2UGjFq4h1E8" role="3clF46">
@@ -1773,7 +1773,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="2UGjFq4h1Eb" role="3clF45">
-        <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+        <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
       </node>
       <node concept="3Tm1VV" id="2UGjFq4h1Ec" role="1B3o_S" />
       <node concept="3clFbS" id="2UGjFq4h1Ef" role="3clF47">
@@ -1875,7 +1875,7 @@
       <node concept="37vLTG" id="2UGjFq4lPBJ" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="2UGjFq4lPBK" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="10P_77" id="2UGjFq4lPBL" role="3clF45" />
@@ -1886,7 +1886,7 @@
             <ref role="37wK5l" node="6MYr6Jx1D_6" resolve="_ask" />
             <node concept="10QFUN" id="2UGjFq4lPMB" role="37wK5m">
               <node concept="3uibUv" id="2UGjFq4lPMC" role="10QFUM">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3qTvmN" id="2UGjFq4lPMD" role="11_B2D" />
               </node>
               <node concept="2OqwBi" id="2UGjFq4lPXm" role="10QFUP">
@@ -1895,7 +1895,7 @@
                     <ref role="3cqZAo" node="2UGjFq4lPBJ" resolve="invocation" />
                   </node>
                   <node concept="liA8E" id="2UGjFq4lPV7" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:49L2l3FhtTG" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="liA8E" id="2UGjFq4lQ3A" role="2OqNvi">
@@ -1919,7 +1919,7 @@
       <node concept="37vLTG" id="2UGjFq4lQgb" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="2UGjFq4lQgc" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="3clFbS" id="2UGjFq4lQge" role="3clF47">
@@ -1942,7 +1942,7 @@
               <ref role="37wK5l" node="6MYr6Jx1D_6" resolve="_ask" />
               <node concept="10QFUN" id="2UGjFq4lQVF" role="37wK5m">
                 <node concept="3uibUv" id="2UGjFq4lQVG" role="10QFUM">
-                  <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                  <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                   <node concept="3qTvmN" id="2UGjFq4lQVH" role="11_B2D" />
                 </node>
                 <node concept="2OqwBi" id="2UGjFq4lR8D" role="10QFUP">
@@ -1951,7 +1951,7 @@
                       <ref role="3cqZAo" node="2UGjFq4lQgb" resolve="invocation" />
                     </node>
                     <node concept="liA8E" id="2UGjFq4lR5V" role="2OqNvi">
-                      <ref role="37wK5l" to="qrld:49L2l3FhtTG" resolve="arguments" />
+                      <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
                     </node>
                   </node>
                   <node concept="liA8E" id="2UGjFq4lRfo" role="2OqNvi">
@@ -1974,7 +1974,7 @@
       <node concept="37vLTG" id="6MYr6Jx1EGF" role="3clF46">
         <property role="TrG5h" value="logical" />
         <node concept="3uibUv" id="6MYr6Jx1EGG" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="3qTvmN" id="6MYr6Jx1EGH" role="11_B2D" />
         </node>
       </node>
@@ -1993,7 +1993,7 @@
         <node concept="37vLTG" id="7ISVfSJ19s" role="3clF46">
           <property role="TrG5h" value="logical" />
           <node concept="3uibUv" id="7ISVfSJ19t" role="1tU5fm">
-            <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+            <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
             <node concept="3qTvmN" id="7ISVfSJ19u" role="11_B2D" />
           </node>
         </node>
@@ -2006,7 +2006,7 @@
                 <ref role="3cqZAo" node="7ISVfSJ19s" resolve="logical" />
               </node>
               <node concept="liA8E" id="5uFPQ7CiQsu" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPKP" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -2032,7 +2032,7 @@
         <node concept="37vLTG" id="7ISVfSJ1ol" role="3clF46">
           <property role="TrG5h" value="logical" />
           <node concept="3uibUv" id="7ISVfSJ1om" role="1tU5fm">
-            <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+            <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
             <node concept="3qTvmN" id="7ISVfSJ1on" role="11_B2D" />
           </node>
         </node>
@@ -2046,7 +2046,7 @@
                   <ref role="3cqZAo" node="7ISVfSJ1ol" resolve="logical" />
                 </node>
                 <node concept="liA8E" id="3eLgHzX3VwK" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:1mP5b6jQPKP" resolve="isBound" />
+                  <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
                 </node>
               </node>
             </node>
@@ -2065,7 +2065,7 @@
     <node concept="2tJIrI" id="7ISVfSIZY1" role="jymVt" />
     <node concept="3Tm1VV" id="4xBopTzrd8Z" role="1B3o_S" />
     <node concept="3uibUv" id="6H279bUPewp" role="EKbjA">
-      <ref role="3uigEE" to="qrld:6H279bUODvp" resolve="Solver" />
+      <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
     </node>
   </node>
   <node concept="312cEu" id="6MYr6Jx1bvI">
@@ -2093,7 +2093,7 @@
       <node concept="37vLTG" id="6MYr6Jx1c8r" role="3clF46">
         <property role="TrG5h" value="delegate" />
         <node concept="3uibUv" id="6H279bUVmZs" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+          <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
         </node>
       </node>
     </node>
@@ -2104,7 +2104,7 @@
       <node concept="37vLTG" id="2UGjFq4gMzq" role="3clF46">
         <property role="TrG5h" value="predicateSymbol" />
         <node concept="3uibUv" id="2UGjFq4gMzr" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
         </node>
       </node>
       <node concept="37vLTG" id="2UGjFq4gMzs" role="3clF46">
@@ -2116,7 +2116,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="2UGjFq4gWiw" role="3clF45">
-        <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+        <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
       </node>
       <node concept="3Tm1VV" id="2UGjFq4gMzw" role="1B3o_S" />
       <node concept="3clFbS" id="2UGjFq4gMz_" role="3clF47">
@@ -2134,7 +2134,7 @@
             <node concept="1eOMI4" id="2UGjFq4gZH4" role="3fr31v">
               <node concept="2ZW3vV" id="2UGjFq4gZPt" role="1eOMHV">
                 <node concept="3uibUv" id="2UGjFq4gZQX" role="2ZW6by">
-                  <ref role="3uigEE" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+                  <ref role="3uigEE" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
                 </node>
                 <node concept="37vLTw" id="2UGjFq4gZNa" role="2ZW6bz">
                   <ref role="3cqZAo" node="2UGjFq4gMzq" resolve="predicateSymbol" />
@@ -2150,7 +2150,7 @@
               <ref role="37wK5l" to="cxk7:429xoyqax91" resolve="JavaPredicate" />
               <node concept="10QFUN" id="2UGjFq4h0gg" role="37wK5m">
                 <node concept="3uibUv" id="2UGjFq4h0ge" role="10QFUM">
-                  <ref role="3uigEE" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+                  <ref role="3uigEE" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
                 </node>
                 <node concept="37vLTw" id="2UGjFq4h0pV" role="10QFUP">
                   <ref role="3cqZAo" node="2UGjFq4gMzq" resolve="predicateSymbol" />
@@ -2174,7 +2174,7 @@
       <node concept="37vLTG" id="2UGjFq4mLqW" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="2UGjFq4mLqX" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="10P_77" id="2UGjFq4mLqY" role="3clF45" />
@@ -2186,7 +2186,7 @@
               <ref role="3cqZAo" node="6MYr6Jx1bRN" resolve="delegateSolver" />
             </node>
             <node concept="liA8E" id="2UGjFq4mLD8" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:2UGjFq4kyWk" resolve="ask" />
+              <ref role="37wK5l" to="w7la:~Queryable.ask(jetbrains.mps.logic.reactor.evaluation.PredicateInvocation):boolean" resolve="ask" />
               <node concept="37vLTw" id="2UGjFq4mLLw" role="37wK5m">
                 <ref role="3cqZAo" node="2UGjFq4mLqW" resolve="invocation" />
               </node>
@@ -2204,7 +2204,7 @@
       <node concept="37vLTG" id="2UGjFq4mLr8" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="2UGjFq4mLr9" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="3clFbS" id="2UGjFq4mLrb" role="3clF47">
@@ -2214,7 +2214,7 @@
               <ref role="3cqZAo" node="6MYr6Jx1bRN" resolve="delegateSolver" />
             </node>
             <node concept="liA8E" id="2UGjFq4mLU_" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:2UGjFq4kyQU" resolve="tell" />
+              <ref role="37wK5l" to="w7la:~Instructible.tell(jetbrains.mps.logic.reactor.evaluation.PredicateInvocation):void" resolve="tell" />
               <node concept="37vLTw" id="2UGjFq4mLVJ" role="37wK5m">
                 <ref role="3cqZAo" node="2UGjFq4mLr8" resolve="invocation" />
               </node>
@@ -2230,7 +2230,7 @@
       <node concept="37vLTG" id="6MYr6Jx1bRk" role="3clF46">
         <property role="TrG5h" value="symbol" />
         <node concept="3uibUv" id="6MYr6Jx1bRl" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$mzX" resolve="Symbol" />
+          <ref role="3uigEE" to="av0y:~Symbol" resolve="Symbol" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6Jx1bRm" role="3clF46">
@@ -2250,7 +2250,7 @@
               <ref role="3cqZAo" node="6MYr6Jx1bRN" resolve="delegateSolver" />
             </node>
             <node concept="liA8E" id="6MYr6Jx1bRv" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:2UGjFq4kyQU" resolve="tell" />
+              <ref role="37wK5l" to="w7la:~Instructible.tell(jetbrains.mps.logic.reactor.evaluation.PredicateInvocation):void" resolve="tell" />
               <node concept="2ShNRf" id="6H279bUVrUo" role="37wK5m">
                 <node concept="1pGfFk" id="6H279bUVrUp" role="2ShVmc">
                   <ref role="37wK5l" node="6H279bUTJFv" resolve="JavaSolver.Invocation" />
@@ -2261,7 +2261,7 @@
                         <ref role="3cqZAo" node="6MYr6Jx1bRk" resolve="symbol" />
                       </node>
                       <node concept="3uibUv" id="6H279bUVshC" role="10QFUM">
-                        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
                       </node>
                     </node>
                     <node concept="37vLTw" id="6H279bUVshD" role="37wK5m">
@@ -2289,7 +2289,7 @@
       <node concept="37vLTG" id="6MYr6Jx1bR$" role="3clF46">
         <property role="TrG5h" value="predicateSymbol" />
         <node concept="3uibUv" id="6MYr6Jx1bR_" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6Jx1bRA" role="3clF46">
@@ -2309,7 +2309,7 @@
               <ref role="3cqZAo" node="6MYr6Jx1bRN" resolve="delegateSolver" />
             </node>
             <node concept="liA8E" id="6H279bUVss$" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:2UGjFq4kyWk" resolve="ask" />
+              <ref role="37wK5l" to="w7la:~Queryable.ask(jetbrains.mps.logic.reactor.evaluation.PredicateInvocation):boolean" resolve="ask" />
               <node concept="2ShNRf" id="6H279bUVss_" role="37wK5m">
                 <node concept="1pGfFk" id="6H279bUVssA" role="2ShVmc">
                   <ref role="37wK5l" node="6H279bUTJFv" resolve="JavaSolver.Invocation" />
@@ -2345,7 +2345,7 @@
         <node concept="37vLTG" id="6H279bUTJIC" role="3clF46">
           <property role="TrG5h" value="predicate" />
           <node concept="3uibUv" id="6H279bUTJKr" role="1tU5fm">
-            <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+            <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
           </node>
         </node>
         <node concept="37vLTG" id="6H279bUTK2z" role="3clF46">
@@ -2389,7 +2389,7 @@
       <node concept="2tJIrI" id="6H279bUTJQm" role="jymVt" />
       <node concept="3Tm6S6" id="6H279bUTKwT" role="1B3o_S" />
       <node concept="3uibUv" id="6H279bUTJuN" role="EKbjA">
-        <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+        <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
       </node>
       <node concept="3clFb_" id="6H279bUTJzv" role="jymVt">
         <property role="1EzhhJ" value="false" />
@@ -2397,7 +2397,7 @@
         <property role="TrG5h" value="predicate" />
         <node concept="3Tm1VV" id="6H279bUTJzx" role="1B3o_S" />
         <node concept="3uibUv" id="6H279bUTJzy" role="3clF45">
-          <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+          <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
         </node>
         <node concept="3clFbS" id="6H279bUTJzz" role="3clF47">
           <node concept="3clFbF" id="6H279bUTKhV" role="3cqZAp">
@@ -2430,7 +2430,7 @@
         <property role="TrG5h" value="predicate" />
         <node concept="3Tm6S6" id="6H279bUTJMl" role="1B3o_S" />
         <node concept="3uibUv" id="6H279bUTJMn" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+          <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
         </node>
       </node>
       <node concept="312cEg" id="6H279bUTKaT" role="jymVt">
@@ -2447,12 +2447,12 @@
       <property role="TrG5h" value="delegateSolver" />
       <node concept="3Tm6S6" id="6MYr6Jx1bRO" role="1B3o_S" />
       <node concept="3uibUv" id="6H279bUVnbF" role="1tU5fm">
-        <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+        <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
       </node>
     </node>
     <node concept="3Tm1VV" id="6MYr6Jx1bvJ" role="1B3o_S" />
     <node concept="3uibUv" id="6H279bUPfZN" role="EKbjA">
-      <ref role="3uigEE" to="qrld:6H279bUODvp" resolve="Solver" />
+      <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
     </node>
   </node>
   <node concept="312cEu" id="6infEALAKBG">
@@ -2479,7 +2479,7 @@
       <node concept="37vLTG" id="6MYr6Jx02A2" role="3clF46">
         <property role="TrG5h" value="sessionSolver" />
         <node concept="3uibUv" id="6MYr6Jx02A1" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
       </node>
     </node>
@@ -2490,7 +2490,7 @@
       <node concept="37vLTG" id="2UGjFq4gIzc" role="3clF46">
         <property role="TrG5h" value="predicateSymbol" />
         <node concept="3uibUv" id="2UGjFq4gIzd" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
         </node>
       </node>
       <node concept="37vLTG" id="2UGjFq4gIze" role="3clF46">
@@ -2502,7 +2502,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="2UGjFq4gV1F" role="3clF45">
-        <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+        <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
       </node>
       <node concept="3Tm1VV" id="2UGjFq4gIzi" role="1B3o_S" />
       <node concept="3clFbS" id="2UGjFq4gIzl" role="3clF47">
@@ -2583,7 +2583,7 @@
       <node concept="37vLTG" id="2UGjFq4l$TZ" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="2UGjFq4l$U0" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="10P_77" id="2UGjFq4l$U1" role="3clF45" />
@@ -2598,7 +2598,7 @@
                   <ref role="3cqZAo" node="2UGjFq4l$TZ" resolve="invocation" />
                 </node>
                 <node concept="liA8E" id="2UGjFq4l_wR" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:49L2l3FhtTG" resolve="arguments" />
+                  <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
                 </node>
               </node>
               <node concept="liA8E" id="2UGjFq4l_Rj" role="2OqNvi">
@@ -2632,7 +2632,7 @@
                 <node concept="1eOMI4" id="2UGjFq4l$3n" role="37wK5m">
                   <node concept="10QFUN" id="2UGjFq4l$3o" role="1eOMHV">
                     <node concept="3uibUv" id="2UGjFq4l$3p" role="10QFUM">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                       <node concept="3uibUv" id="2UGjFq4l$3q" role="11_B2D">
                         <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
                       </node>
@@ -2648,7 +2648,7 @@
           </node>
           <node concept="2ZW3vV" id="2UGjFq4l$3t" role="3clFbw">
             <node concept="3uibUv" id="2UGjFq4l$3u" role="2ZW6by">
-              <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+              <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
             </node>
             <node concept="37vLTw" id="2UGjFq4l$3O" role="2ZW6bz">
               <ref role="3cqZAo" node="2UGjFq4l$3L" resolve="test" />
@@ -2706,7 +2706,7 @@
       <node concept="37vLTG" id="2UGjFq4kzkN" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="2UGjFq4kzkO" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="3clFbS" id="2UGjFq4kzkQ" role="3clF47">
@@ -2719,7 +2719,7 @@
                   <ref role="3cqZAo" node="2UGjFq4kzkN" resolve="invocation" />
                 </node>
                 <node concept="liA8E" id="2UGjFq4lzR8" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:49L2l3FhtTG" resolve="arguments" />
+                  <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
                 </node>
               </node>
               <node concept="liA8E" id="2UGjFq4lzR9" role="2OqNvi">
@@ -2756,7 +2756,7 @@
                 <node concept="1eOMI4" id="2UGjFq4lzaB" role="37wK5m">
                   <node concept="10QFUN" id="2UGjFq4lzaC" role="1eOMHV">
                     <node concept="3uibUv" id="2UGjFq4lzaD" role="10QFUM">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                       <node concept="3uibUv" id="2UGjFq4lzaE" role="11_B2D">
                         <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
                       </node>
@@ -2772,7 +2772,7 @@
           </node>
           <node concept="2ZW3vV" id="2UGjFq4lzaH" role="3clFbw">
             <node concept="3uibUv" id="2UGjFq4lzaI" role="2ZW6by">
-              <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+              <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
             </node>
             <node concept="37vLTw" id="2UGjFq4lzcb" role="2ZW6bz">
               <ref role="3cqZAo" node="2UGjFq4lzb1" resolve="test" />
@@ -2824,7 +2824,7 @@
     <node concept="2tJIrI" id="4xBopTzrRzV" role="jymVt" />
     <node concept="3Tm1VV" id="6infEALAKBH" role="1B3o_S" />
     <node concept="3uibUv" id="6H279bUPaLB" role="EKbjA">
-      <ref role="3uigEE" to="qrld:6H279bUODvp" resolve="Solver" />
+      <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
     </node>
     <node concept="3clFb_" id="6infEALAKQz" role="jymVt">
       <property role="1EzhhJ" value="false" />
@@ -2846,7 +2846,7 @@
                   <ref role="3cqZAo" node="6MYr6Jx02Gi" resolve="sessionSolver" />
                 </node>
                 <node concept="liA8E" id="3eLgHzX3QyK" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:3eLgHzX3LYG" resolve="fail" />
+                  <ref role="37wK5l" to="w7la:~SessionSolver.fail(java.lang.String):void" resolve="fail" />
                   <node concept="Xl_RD" id="6infEALBkCD" role="37wK5m">
                     <property role="Xl_RC" value="cannot assert false" />
                   </node>
@@ -2869,7 +2869,7 @@
       <node concept="37vLTG" id="6infEALAKQI" role="3clF46">
         <property role="TrG5h" value="logical" />
         <node concept="3uibUv" id="6infEALAKQJ" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="3uibUv" id="6infEALAKQK" role="11_B2D">
             <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
           </node>
@@ -2887,7 +2887,7 @@
               <ref role="3cqZAo" node="6MYr6Jx02Gi" resolve="sessionSolver" />
             </node>
             <node concept="liA8E" id="6MYr6Jx055T" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:6MYr6JwonCY" resolve="queueIfBusy" />
+              <ref role="37wK5l" to="w7la:~SessionSolver.queueIfBusy(java.lang.Runnable):boolean" resolve="queueIfBusy" />
               <node concept="1bVj0M" id="6MYr6Jx0585" role="37wK5m">
                 <node concept="3clFbS" id="6MYr6Jx0586" role="1bW5cS">
                   <node concept="3clFbF" id="6MYr6Jx0587" role="3cqZAp">
@@ -2908,7 +2908,7 @@
           <node concept="3cpWsn" id="6infEALBcln" role="3cpWs9">
             <property role="TrG5h" value="repr" />
             <node concept="3uibUv" id="6infEALBclo" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+              <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               <node concept="3uibUv" id="6infEALBclp" role="11_B2D">
                 <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
               </node>
@@ -2918,7 +2918,7 @@
                 <ref role="3cqZAo" node="6infEALAKQI" resolve="logical" />
               </node>
               <node concept="liA8E" id="6infEALBcls" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:429xoyqB1jp" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~SolverLogical.findRoot():jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -2931,7 +2931,7 @@
                   <ref role="3cqZAo" node="6MYr6Jx02Gi" resolve="sessionSolver" />
                 </node>
                 <node concept="liA8E" id="3eLgHzX3QG1" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:3eLgHzX3LYG" resolve="fail" />
+                  <ref role="37wK5l" to="w7la:~SessionSolver.fail(java.lang.String):void" resolve="fail" />
                   <node concept="Xl_RD" id="6infEALBjz_" role="37wK5m">
                     <property role="Xl_RC" value="cannot assert false" />
                   </node>
@@ -2946,7 +2946,7 @@
                   <ref role="3cqZAo" node="6infEALBcln" resolve="repr" />
                 </node>
                 <node concept="liA8E" id="6infEALBgCV" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
                 </node>
               </node>
             </node>
@@ -2955,7 +2955,7 @@
                 <ref role="3cqZAo" node="6infEALBcln" resolve="repr" />
               </node>
               <node concept="liA8E" id="6infEALBeBH" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPKP" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -2972,7 +2972,7 @@
                 <ref role="3cqZAo" node="6infEALBcln" resolve="repr" />
               </node>
               <node concept="liA8E" id="6infEALBscr" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
           </node>
@@ -2985,7 +2985,7 @@
                   <ref role="3cqZAo" node="6infEALBcln" resolve="repr" />
                 </node>
                 <node concept="liA8E" id="6infEALBvmp" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:6MYr6Jwy05T" resolve="setValue" />
+                  <ref role="37wK5l" to="bj13:~SolverLogical.setValue(java.lang.Object):void" resolve="setValue" />
                   <node concept="10M0yZ" id="6infEALBvoZ" role="37wK5m">
                     <ref role="1PxDUh" to="wyt6:~Boolean" resolve="Boolean" />
                     <ref role="3cqZAo" to="wyt6:~Boolean.TRUE" resolve="TRUE" />
@@ -3030,7 +3030,7 @@
       <node concept="37vLTG" id="6infEALAKR3" role="3clF46">
         <property role="TrG5h" value="logical" />
         <node concept="3uibUv" id="6infEALAKR4" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="3uibUv" id="6infEALAKR5" role="11_B2D">
             <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
           </node>
@@ -3043,7 +3043,7 @@
           <node concept="3cpWsn" id="6infEALBa$A" role="3cpWs9">
             <property role="TrG5h" value="repr" />
             <node concept="3uibUv" id="6infEALBa$x" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+              <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               <node concept="3uibUv" id="6infEALBa$$" role="11_B2D">
                 <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
               </node>
@@ -3053,7 +3053,7 @@
                 <ref role="3cqZAo" node="6infEALAKR3" resolve="logical" />
               </node>
               <node concept="liA8E" id="6infEALBa$D" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:429xoyqB1jp" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~SolverLogical.findRoot():jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -3072,7 +3072,7 @@
                 <ref role="3cqZAo" node="6infEALBa$A" resolve="repr" />
               </node>
               <node concept="liA8E" id="6infEALB0GT" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPKP" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -3084,7 +3084,7 @@
               <ref role="3cqZAo" node="6infEALBa$A" resolve="repr" />
             </node>
             <node concept="liA8E" id="6infEALAXgk" role="2OqNvi">
-              <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+              <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
             </node>
           </node>
         </node>
@@ -3095,7 +3095,7 @@
       <property role="TrG5h" value="sessionSolver" />
       <node concept="3Tm6S6" id="6MYr6Jx02Gj" role="1B3o_S" />
       <node concept="3uibUv" id="6MYr6Jx02Gl" role="1tU5fm">
-        <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
       </node>
     </node>
   </node>
@@ -3103,7 +3103,7 @@
     <property role="TrG5h" value="UnificationSolver" />
     <node concept="3Tm1VV" id="6GYQG_Spvw6" role="1B3o_S" />
     <node concept="3uibUv" id="6H279bUP3zp" role="EKbjA">
-      <ref role="3uigEE" to="qrld:6H279bUODvp" resolve="Solver" />
+      <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
     </node>
     <node concept="2tJIrI" id="4U_yxogBZmE" role="jymVt" />
     <node concept="3clFbW" id="5p8T3QHGKJ7" role="jymVt">
@@ -3153,19 +3153,19 @@
       <node concept="37vLTG" id="3FIATxbQcKV" role="3clF46">
         <property role="TrG5h" value="logicalUnification" />
         <node concept="3uibUv" id="3FIATxbQcPk" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwANOa" resolve="LogicalUnification" />
+          <ref role="3uigEE" to="bj13:~LogicalUnification" resolve="LogicalUnification" />
         </node>
       </node>
       <node concept="37vLTG" id="4xBopTzo15x" role="3clF46">
         <property role="TrG5h" value="sessionSolver" />
         <node concept="3uibUv" id="4xBopTzo1oi" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
       </node>
       <node concept="37vLTG" id="24Vro6cS3w6" role="3clF46">
         <property role="TrG5h" value="tracer" />
         <node concept="3uibUv" id="24Vro6cS3NX" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:24Vro6cQnrj" resolve="EvaluationTrace" />
+          <ref role="3uigEE" to="w7la:~EvaluationTrace" resolve="EvaluationTrace" />
         </node>
       </node>
     </node>
@@ -3176,7 +3176,7 @@
       <node concept="37vLTG" id="2UGjFq4h7S5" role="3clF46">
         <property role="TrG5h" value="predicateSymbol" />
         <node concept="3uibUv" id="2UGjFq4h7S6" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
         </node>
       </node>
       <node concept="37vLTG" id="2UGjFq4h7S7" role="3clF46">
@@ -3188,7 +3188,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="2UGjFq4h7Sa" role="3clF45">
-        <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+        <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
       </node>
       <node concept="3Tm1VV" id="2UGjFq4h7Sb" role="1B3o_S" />
       <node concept="3clFbS" id="2UGjFq4h7Se" role="3clF47">
@@ -3271,7 +3271,7 @@
       <node concept="37vLTG" id="2UGjFq4m5q1" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="2UGjFq4m5q2" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="10P_77" id="2UGjFq4m5q3" role="3clF45" />
@@ -3286,7 +3286,7 @@
                   <ref role="3cqZAo" node="2UGjFq4m5q1" resolve="invocation" />
                 </node>
                 <node concept="liA8E" id="2UGjFq4m8A8" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:49L2l3FhtTG" resolve="arguments" />
+                  <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
                 </node>
               </node>
               <node concept="liA8E" id="2UGjFq4m8A9" role="2OqNvi">
@@ -3302,7 +3302,7 @@
                   <ref role="3cqZAo" node="2UGjFq4m5q1" resolve="invocation" />
                 </node>
                 <node concept="liA8E" id="2UGjFq4m8Ae" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:49L2l3FhtTG" resolve="arguments" />
+                  <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
                 </node>
               </node>
               <node concept="liA8E" id="2UGjFq4m8Af" role="2OqNvi">
@@ -3392,7 +3392,7 @@
                   </node>
                   <node concept="10QFUN" id="2UGjFq4lTCj" role="37wK5m">
                     <node concept="3uibUv" id="2UGjFq4lTCk" role="10QFUM">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                       <node concept="16syzq" id="2UGjFq4lTCl" role="11_B2D">
                         <ref role="16sUi3" node="2UGjFq4lWIN" resolve="TERM" />
                       </node>
@@ -3408,7 +3408,7 @@
             <node concept="1Wc70l" id="2UGjFq4lTCo" role="3eO9$A">
               <node concept="2ZW3vV" id="2UGjFq4lTCp" role="3uHU7w">
                 <node concept="3uibUv" id="2UGjFq4lTCq" role="2ZW6by">
-                  <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                  <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 </node>
                 <node concept="37vLTw" id="2UGjFq4lTDg" role="2ZW6bz">
                   <ref role="3cqZAo" node="2UGjFq4lTDe" resolve="right" />
@@ -3434,7 +3434,7 @@
                       <ref role="3cqZAo" node="2UGjFq4lTDc" resolve="left" />
                     </node>
                     <node concept="3uibUv" id="2UGjFq4lTC_" role="10QFUM">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                       <node concept="16syzq" id="2UGjFq4lTCA" role="11_B2D">
                         <ref role="16sUi3" node="2UGjFq4lWIN" resolve="TERM" />
                       </node>
@@ -3463,7 +3463,7 @@
               </node>
               <node concept="2ZW3vV" id="2UGjFq4lTCJ" role="3uHU7B">
                 <node concept="3uibUv" id="2UGjFq4lTCK" role="2ZW6by">
-                  <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                  <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 </node>
                 <node concept="37vLTw" id="2UGjFq4lTDl" role="2ZW6bz">
                   <ref role="3cqZAo" node="2UGjFq4lTDc" resolve="left" />
@@ -3481,7 +3481,7 @@
                       <ref role="3cqZAo" node="2UGjFq4lTDc" resolve="left" />
                     </node>
                     <node concept="3uibUv" id="2UGjFq4lTCS" role="10QFUM">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                       <node concept="16syzq" id="2UGjFq4lTCT" role="11_B2D">
                         <ref role="16sUi3" node="2UGjFq4lWIN" resolve="TERM" />
                       </node>
@@ -3489,7 +3489,7 @@
                   </node>
                   <node concept="10QFUN" id="2UGjFq4lTCU" role="37wK5m">
                     <node concept="3uibUv" id="2UGjFq4lTCV" role="10QFUM">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                       <node concept="16syzq" id="2UGjFq4lTCW" role="11_B2D">
                         <ref role="16sUi3" node="2UGjFq4lWIN" resolve="TERM" />
                       </node>
@@ -3505,7 +3505,7 @@
             <node concept="1Wc70l" id="2UGjFq4lTCZ" role="3eO9$A">
               <node concept="2ZW3vV" id="2UGjFq4lTD0" role="3uHU7w">
                 <node concept="3uibUv" id="2UGjFq4lTD1" role="2ZW6by">
-                  <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                  <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 </node>
                 <node concept="37vLTw" id="2UGjFq4lTDp" role="2ZW6bz">
                   <ref role="3cqZAo" node="2UGjFq4lTDe" resolve="right" />
@@ -3513,7 +3513,7 @@
               </node>
               <node concept="2ZW3vV" id="2UGjFq4lTD3" role="3uHU7B">
                 <node concept="3uibUv" id="2UGjFq4lTD4" role="2ZW6by">
-                  <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                  <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 </node>
                 <node concept="37vLTw" id="2UGjFq4lTDo" role="2ZW6bz">
                   <ref role="3cqZAo" node="2UGjFq4lTDc" resolve="left" />
@@ -3553,7 +3553,7 @@
       <node concept="37vLTG" id="2UGjFq4mhER" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="2UGjFq4mhES" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="3clFbS" id="2UGjFq4mhEU" role="3clF47">
@@ -3566,7 +3566,7 @@
                   <ref role="3cqZAo" node="2UGjFq4mhER" resolve="invocation" />
                 </node>
                 <node concept="liA8E" id="2UGjFq4mjWD" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:49L2l3FhtTG" resolve="arguments" />
+                  <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
                 </node>
               </node>
               <node concept="liA8E" id="2UGjFq4mjWE" role="2OqNvi">
@@ -3582,7 +3582,7 @@
                   <ref role="3cqZAo" node="2UGjFq4mhER" resolve="invocation" />
                 </node>
                 <node concept="liA8E" id="2UGjFq4mjWJ" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:49L2l3FhtTG" resolve="arguments" />
+                  <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
                 </node>
               </node>
               <node concept="liA8E" id="2UGjFq4mjWK" role="2OqNvi">
@@ -3672,7 +3672,7 @@
                   </node>
                   <node concept="10QFUN" id="2UGjFq4mblb" role="37wK5m">
                     <node concept="3uibUv" id="2UGjFq4mblc" role="10QFUM">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                       <node concept="16syzq" id="2UGjFq4mbld" role="11_B2D">
                         <ref role="16sUi3" node="2UGjFq4mdQc" resolve="TERM" />
                       </node>
@@ -3688,7 +3688,7 @@
             <node concept="1Wc70l" id="2UGjFq4mblg" role="3eO9$A">
               <node concept="2ZW3vV" id="2UGjFq4mblh" role="3uHU7w">
                 <node concept="3uibUv" id="2UGjFq4mbli" role="2ZW6by">
-                  <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                  <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 </node>
                 <node concept="37vLTw" id="2UGjFq4mbm8" role="2ZW6bz">
                   <ref role="3cqZAo" node="2UGjFq4mbm6" resolve="right" />
@@ -3714,7 +3714,7 @@
                       <ref role="3cqZAo" node="2UGjFq4mbm4" resolve="left" />
                     </node>
                     <node concept="3uibUv" id="2UGjFq4mblt" role="10QFUM">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                       <node concept="16syzq" id="2UGjFq4mblu" role="11_B2D">
                         <ref role="16sUi3" node="2UGjFq4mdQc" resolve="TERM" />
                       </node>
@@ -3743,7 +3743,7 @@
               </node>
               <node concept="2ZW3vV" id="2UGjFq4mblB" role="3uHU7B">
                 <node concept="3uibUv" id="2UGjFq4mblC" role="2ZW6by">
-                  <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                  <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 </node>
                 <node concept="37vLTw" id="2UGjFq4mbmb" role="2ZW6bz">
                   <ref role="3cqZAo" node="2UGjFq4mbm4" resolve="left" />
@@ -3761,7 +3761,7 @@
                       <ref role="3cqZAo" node="2UGjFq4mbm4" resolve="left" />
                     </node>
                     <node concept="3uibUv" id="2UGjFq4mblK" role="10QFUM">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                       <node concept="16syzq" id="2UGjFq4mblL" role="11_B2D">
                         <ref role="16sUi3" node="2UGjFq4mdQc" resolve="TERM" />
                       </node>
@@ -3769,7 +3769,7 @@
                   </node>
                   <node concept="10QFUN" id="2UGjFq4mblM" role="37wK5m">
                     <node concept="3uibUv" id="2UGjFq4mblN" role="10QFUM">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                       <node concept="16syzq" id="2UGjFq4mblO" role="11_B2D">
                         <ref role="16sUi3" node="2UGjFq4mdQc" resolve="TERM" />
                       </node>
@@ -3785,7 +3785,7 @@
             <node concept="1Wc70l" id="2UGjFq4mblR" role="3eO9$A">
               <node concept="2ZW3vV" id="2UGjFq4mblS" role="3uHU7w">
                 <node concept="3uibUv" id="2UGjFq4mblT" role="2ZW6by">
-                  <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                  <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 </node>
                 <node concept="37vLTw" id="2UGjFq4mbmj" role="2ZW6bz">
                   <ref role="3cqZAo" node="2UGjFq4mbm6" resolve="right" />
@@ -3793,7 +3793,7 @@
               </node>
               <node concept="2ZW3vV" id="2UGjFq4mblV" role="3uHU7B">
                 <node concept="3uibUv" id="2UGjFq4mblW" role="2ZW6by">
-                  <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                  <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                 </node>
                 <node concept="37vLTw" id="2UGjFq4mbmd" role="2ZW6bz">
                   <ref role="3cqZAo" node="2UGjFq4mbm4" resolve="left" />
@@ -3852,7 +3852,7 @@
               <ref role="3cqZAo" node="4xBopTznWRz" resolve="sessionSolver" />
             </node>
             <node concept="liA8E" id="6MYr6Jwq2OP" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:6MYr6JwonCY" resolve="queueIfBusy" />
+              <ref role="37wK5l" to="w7la:~SessionSolver.queueIfBusy(java.lang.Runnable):boolean" resolve="queueIfBusy" />
               <node concept="1bVj0M" id="7K4Mb_Jw166" role="37wK5m">
                 <node concept="3clFbS" id="7K4Mb_Jw167" role="1bW5cS">
                   <node concept="3clFbF" id="7K4Mb_Jw168" role="3cqZAp">
@@ -3898,7 +3898,7 @@
                   <ref role="3cqZAo" node="4xBopTznWRz" resolve="sessionSolver" />
                 </node>
                 <node concept="liA8E" id="3eLgHzX3UG_" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:3eLgHzX3LYG" resolve="fail" />
+                  <ref role="37wK5l" to="w7la:~SessionSolver.fail(java.lang.String):void" resolve="fail" />
                   <node concept="3cpWs3" id="6MYr6JxT1oR" role="37wK5m">
                     <node concept="3cpWs3" id="6MYr6JxT1bo" role="3uHU7B">
                       <node concept="3cpWs3" id="6SkxsMzEhV3" role="3uHU7B">
@@ -3974,7 +3974,7 @@
                     <ref role="3cqZAo" node="6MYr6JwATAl" resolve="logicalUnification" />
                   </node>
                   <node concept="liA8E" id="6MYr6JwRQjW" role="2OqNvi">
-                    <ref role="37wK5l" to="45ys:6MYr6JwRKzQ" resolve="isLogical" />
+                    <ref role="37wK5l" to="bj13:~LogicalUnification.isLogical(jetbrains.mps.unification.Term):boolean" resolve="isLogical" />
                     <node concept="37vLTw" id="6MYr6JwRQlP" role="37wK5m">
                       <ref role="3cqZAo" node="1Ns6gpY7SoX" resolve="bvar" />
                     </node>
@@ -3987,7 +3987,7 @@
               <node concept="3cpWsn" id="6MYr6JwRS$H" role="3cpWs9">
                 <property role="TrG5h" value="bvarLogical" />
                 <node concept="3uibUv" id="6MYr6JwRS$v" role="1tU5fm">
-                  <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                  <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                   <node concept="3uibUv" id="6MYr6JwSaxS" role="11_B2D">
                     <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
                   </node>
@@ -3997,7 +3997,7 @@
                     <ref role="3cqZAo" node="6MYr6JwATAl" resolve="logicalUnification" />
                   </node>
                   <node concept="liA8E" id="6MYr6JwRS$K" role="2OqNvi">
-                    <ref role="37wK5l" to="45ys:6MYr6JwAPxG" resolve="logical" />
+                    <ref role="37wK5l" to="bj13:~LogicalUnification.logical(jetbrains.mps.unification.Term):jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="logical" />
                     <node concept="37vLTw" id="6MYr6JwRS$L" role="37wK5m">
                       <ref role="3cqZAo" node="1Ns6gpY7SoX" resolve="bvar" />
                     </node>
@@ -4019,7 +4019,7 @@
                         <ref role="3cqZAo" node="6MYr6JwATAl" resolve="logicalUnification" />
                       </node>
                       <node concept="liA8E" id="6MYr6JwS1$m" role="2OqNvi">
-                        <ref role="37wK5l" to="45ys:6MYr6JwAODW" resolve="asRoot" />
+                        <ref role="37wK5l" to="bj13:~LogicalUnification.asRoot(jetbrains.mps.unification.Term):jetbrains.mps.unification.Term" resolve="asRoot" />
                         <node concept="2OqwBi" id="6MYr6JwS1$n" role="37wK5m">
                           <node concept="37vLTw" id="6MYr6JwS1$o" role="2Oq$k0">
                             <ref role="3cqZAo" node="6SkxsMzDp28" resolve="bnd" />
@@ -4081,7 +4081,7 @@
                           <ref role="3cqZAo" node="6MYr6JwATAl" resolve="logicalUnification" />
                         </node>
                         <node concept="liA8E" id="6MYr6JwRG9s" role="2OqNvi">
-                          <ref role="37wK5l" to="45ys:6MYr6JwAPxG" resolve="logical" />
+                          <ref role="37wK5l" to="bj13:~LogicalUnification.logical(jetbrains.mps.unification.Term):jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="logical" />
                           <node concept="2OqwBi" id="6MYr6JwSbtb" role="37wK5m">
                             <node concept="37vLTw" id="6MYr6JwSbtc" role="2Oq$k0">
                               <ref role="3cqZAo" node="6SkxsMzDp28" resolve="bnd" />
@@ -4140,7 +4140,7 @@
       <node concept="37vLTG" id="4U_yxogBZsN" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6Jwz28e" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="6MYr6Jw$v4o" role="11_B2D">
             <ref role="16sUi3" node="6MYr6Jw$si$" resolve="TERM" />
           </node>
@@ -4175,7 +4175,7 @@
       <node concept="37vLTG" id="4U_yxogBZLE" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6Jwz28h" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="6MYr6Jw$$48" role="11_B2D">
             <ref role="16sUi3" node="6MYr6Jw$xTR" resolve="TERM" />
           </node>
@@ -4194,7 +4194,7 @@
           <node concept="3cpWsn" id="7d$oK1$qfYd" role="3cpWs9">
             <property role="TrG5h" value="leftRepr" />
             <node concept="3uibUv" id="6MYr6Jwz28k" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+              <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               <node concept="16syzq" id="6MYr6JwA0OY" role="11_B2D">
                 <ref role="16sUi3" node="6MYr6Jw$xTR" resolve="TERM" />
               </node>
@@ -4204,7 +4204,7 @@
                 <ref role="3cqZAo" node="4U_yxogBZLE" resolve="left" />
               </node>
               <node concept="liA8E" id="7d$oK1$qfYh" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:429xoyqB1jp" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~SolverLogical.findRoot():jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -4219,7 +4219,7 @@
               <ref role="3cqZAo" node="4xBopTznWRz" resolve="sessionSolver" />
             </node>
             <node concept="liA8E" id="6MYr6Jwq0ar" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:6MYr6JwonCY" resolve="queueIfBusy" />
+              <ref role="37wK5l" to="w7la:~SessionSolver.queueIfBusy(java.lang.Runnable):boolean" resolve="queueIfBusy" />
               <node concept="1bVj0M" id="7K4Mb_Jw3Eg" role="37wK5m">
                 <node concept="3clFbS" id="7K4Mb_Jw3Eh" role="1bW5cS">
                   <node concept="3clFbF" id="7K4Mb_Jw3Ei" role="3cqZAp">
@@ -4250,7 +4250,7 @@
                 <ref role="3cqZAo" node="7d$oK1$qfYd" resolve="leftRepr" />
               </node>
               <node concept="liA8E" id="1bm7a6EUZWh" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
           </node>
@@ -4263,7 +4263,7 @@
                   <ref role="3cqZAo" node="7d$oK1$qfYd" resolve="leftRepr" />
                 </node>
                 <node concept="liA8E" id="1bm7a6EV5ci" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:6MYr6Jwy05T" resolve="setValue" />
+                  <ref role="37wK5l" to="bj13:~SolverLogical.setValue(java.lang.Object):void" resolve="setValue" />
                   <node concept="37vLTw" id="1bm7a6EV5e0" role="37wK5m">
                     <ref role="3cqZAo" node="4U_yxogBZLC" resolve="rightVal" />
                   </node>
@@ -4309,7 +4309,7 @@
       <node concept="37vLTG" id="4U_yxogC05J" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6Jwz28n" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="6MYr6Jw$E6F" role="11_B2D">
             <ref role="16sUi3" node="6MYr6Jw$BQ2" resolve="TERM" />
           </node>
@@ -4318,7 +4318,7 @@
       <node concept="37vLTG" id="4U_yxogC0jU" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6Jwz28q" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="6MYr6Jw$GmS" role="11_B2D">
             <ref role="16sUi3" node="6MYr6Jw$BQ2" resolve="TERM" />
           </node>
@@ -4345,7 +4345,7 @@
           <node concept="3cpWsn" id="7d$oK1$rAnE" role="3cpWs9">
             <property role="TrG5h" value="leftRepr" />
             <node concept="3uibUv" id="6MYr6Jwz28t" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+              <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               <node concept="16syzq" id="6MYr6JwA2yy" role="11_B2D">
                 <ref role="16sUi3" node="6MYr6Jw$BQ2" resolve="TERM" />
               </node>
@@ -4355,7 +4355,7 @@
                 <ref role="3cqZAo" node="4U_yxogC05J" resolve="left" />
               </node>
               <node concept="liA8E" id="7d$oK1$rAnI" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:429xoyqB1jp" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~SolverLogical.findRoot():jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -4364,7 +4364,7 @@
           <node concept="3cpWsn" id="7d$oK1$rAnK" role="3cpWs9">
             <property role="TrG5h" value="rightRepr" />
             <node concept="3uibUv" id="6MYr6Jwz28w" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+              <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               <node concept="16syzq" id="6MYr6JwA3hl" role="11_B2D">
                 <ref role="16sUi3" node="6MYr6Jw$BQ2" resolve="TERM" />
               </node>
@@ -4374,7 +4374,7 @@
                 <ref role="3cqZAo" node="4U_yxogC0jU" resolve="right" />
               </node>
               <node concept="liA8E" id="7d$oK1$rAnO" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:429xoyqB1jp" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~SolverLogical.findRoot():jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -4400,7 +4400,7 @@
               <ref role="3cqZAo" node="4xBopTznWRz" resolve="sessionSolver" />
             </node>
             <node concept="liA8E" id="6MYr6JwpXiD" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:6MYr6JwonCY" resolve="queueIfBusy" />
+              <ref role="37wK5l" to="w7la:~SessionSolver.queueIfBusy(java.lang.Runnable):boolean" resolve="queueIfBusy" />
               <node concept="1bVj0M" id="7K4Mb_Jw2J6" role="37wK5m">
                 <node concept="3clFbS" id="7K4Mb_Jw2J7" role="1bW5cS">
                   <node concept="3clFbF" id="7K4Mb_Jw2J8" role="3cqZAp">
@@ -4429,7 +4429,7 @@
               <ref role="3cqZAo" node="7d$oK1$rAnE" resolve="leftRepr" />
             </node>
             <node concept="liA8E" id="20WMLipxwje" role="2OqNvi">
-              <ref role="37wK5l" to="45ys:20WMLipvYTD" resolve="union" />
+              <ref role="37wK5l" to="bj13:~SolverLogical.union(jetbrains.mps.logic.reactor.logical.SolverLogical,jetbrains.mps.logic.reactor.logical.SolverLogical$ValueReconciler):void" resolve="union" />
               <node concept="37vLTw" id="20WMLipxwMt" role="37wK5m">
                 <ref role="3cqZAo" node="7d$oK1$rAnK" resolve="rightRepr" />
               </node>
@@ -4548,7 +4548,7 @@
                           <ref role="3cqZAo" node="6MYr6JwATAl" resolve="logicalUnification" />
                         </node>
                         <node concept="liA8E" id="6MYr6JwBrpD" role="2OqNvi">
-                          <ref role="37wK5l" to="45ys:6MYr6JwAPxG" resolve="logical" />
+                          <ref role="37wK5l" to="bj13:~LogicalUnification.logical(jetbrains.mps.unification.Term):jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="logical" />
                           <node concept="2OqwBi" id="6xYPVrp_rZW" role="37wK5m">
                             <node concept="37vLTw" id="6xYPVrp_rZX" role="2Oq$k0">
                               <ref role="3cqZAo" node="6xYPVrp_s03" resolve="bnd" />
@@ -4576,7 +4576,7 @@
                   <ref role="3cqZAo" node="6MYr6JwATAl" resolve="logicalUnification" />
                 </node>
                 <node concept="liA8E" id="6MYr6JwSk3X" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:6MYr6JwRKzQ" resolve="isLogical" />
+                  <ref role="37wK5l" to="bj13:~LogicalUnification.isLogical(jetbrains.mps.unification.Term):boolean" resolve="isLogical" />
                   <node concept="2OqwBi" id="7FFmDVAMd61" role="37wK5m">
                     <node concept="37vLTw" id="7FFmDVAMd62" role="2Oq$k0">
                       <ref role="3cqZAo" node="6xYPVrp_s03" resolve="bnd" />
@@ -4631,7 +4631,7 @@
       <node concept="37vLTG" id="4U_yxogC1eI" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6Jwz28z" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="6MYr6Jw$Q2y" role="11_B2D">
             <ref role="16sUi3" node="6MYr6Jw$JBX" resolve="TERM" />
           </node>
@@ -4666,7 +4666,7 @@
       <node concept="37vLTG" id="4U_yxogC1Ek" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6Jwz28A" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="6MYr6Jw$YTR" role="11_B2D">
             <ref role="16sUi3" node="6MYr6Jw$T5v" resolve="TERM" />
           </node>
@@ -4685,7 +4685,7 @@
           <node concept="3cpWsn" id="4U_yxogDnOj" role="3cpWs9">
             <property role="TrG5h" value="leftRepr" />
             <node concept="3uibUv" id="6MYr6Jwz28D" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+              <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               <node concept="3qUE_q" id="6MYr6Jwz28E" role="11_B2D">
                 <node concept="3uibUv" id="6MYr6Jwz28F" role="3qUE_r">
                   <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
@@ -4697,7 +4697,7 @@
                 <ref role="3cqZAo" node="4U_yxogC1Ek" resolve="left" />
               </node>
               <node concept="liA8E" id="4U_yxogDnOn" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:429xoyqB1jp" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~SolverLogical.findRoot():jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -4717,7 +4717,7 @@
                 <ref role="3cqZAo" node="4U_yxogDnOj" resolve="leftRepr" />
               </node>
               <node concept="liA8E" id="4U_yxogDnOx" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
           </node>
@@ -4734,7 +4734,7 @@
                 <ref role="3cqZAo" node="4U_yxogDnOj" resolve="leftRepr" />
               </node>
               <node concept="liA8E" id="6SkxsMzGc5_" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
           </node>
@@ -4816,7 +4816,7 @@
                           <ref role="3cqZAo" node="6MYr6JwATAl" resolve="logicalUnification" />
                         </node>
                         <node concept="liA8E" id="6MYr6JwBrFD" role="2OqNvi">
-                          <ref role="37wK5l" to="45ys:6MYr6JwAPxG" resolve="logical" />
+                          <ref role="37wK5l" to="bj13:~LogicalUnification.logical(jetbrains.mps.unification.Term):jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="logical" />
                           <node concept="2OqwBi" id="6xYPVrp_lHu" role="37wK5m">
                             <node concept="37vLTw" id="6xYPVrp_lHv" role="2Oq$k0">
                               <ref role="3cqZAo" node="6xYPVrp_lH_" resolve="bnd" />
@@ -4844,7 +4844,7 @@
                   <ref role="3cqZAo" node="6MYr6JwATAl" resolve="logicalUnification" />
                 </node>
                 <node concept="liA8E" id="6MYr6JwStqX" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:6MYr6JwRKzQ" resolve="isLogical" />
+                  <ref role="37wK5l" to="bj13:~LogicalUnification.isLogical(jetbrains.mps.unification.Term):boolean" resolve="isLogical" />
                   <node concept="2OqwBi" id="7FFmDVAJ$YW" role="37wK5m">
                     <node concept="37vLTw" id="7FFmDVAJ$YX" role="2Oq$k0">
                       <ref role="3cqZAo" node="6xYPVrp_lH_" resolve="bnd" />
@@ -4893,7 +4893,7 @@
       <node concept="37vLTG" id="4U_yxogC2zy" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6Jwz28G" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="6MYr6Jw_7Kb" role="11_B2D">
             <ref role="16sUi3" node="6MYr6Jw_3D$" resolve="TERM" />
           </node>
@@ -4902,7 +4902,7 @@
       <node concept="37vLTG" id="4U_yxogC2z$" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6Jwz28J" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+          <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
           <node concept="16syzq" id="6MYr6Jw_9Ww" role="11_B2D">
             <ref role="16sUi3" node="6MYr6Jw_3D$" resolve="TERM" />
           </node>
@@ -4933,7 +4933,7 @@
           <node concept="3cpWsn" id="7d$oK1$nL7F" role="3cpWs9">
             <property role="TrG5h" value="leftRepr" />
             <node concept="3uibUv" id="6MYr6Jwz28M" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+              <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               <node concept="3qUE_q" id="6MYr6Jwz28N" role="11_B2D">
                 <node concept="3uibUv" id="6MYr6Jwz28O" role="3qUE_r">
                   <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
@@ -4945,7 +4945,7 @@
                 <ref role="3cqZAo" node="4U_yxogC2zy" resolve="left" />
               </node>
               <node concept="liA8E" id="7d$oK1$nL7J" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:429xoyqB1jp" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~SolverLogical.findRoot():jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -4954,7 +4954,7 @@
           <node concept="3cpWsn" id="7d$oK1$nLDN" role="3cpWs9">
             <property role="TrG5h" value="rightRepr" />
             <node concept="3uibUv" id="6MYr6Jwz28P" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+              <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               <node concept="3qUE_q" id="6MYr6Jwz28Q" role="11_B2D">
                 <node concept="3uibUv" id="6MYr6Jwz28R" role="3qUE_r">
                   <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
@@ -4966,7 +4966,7 @@
                 <ref role="3cqZAo" node="4U_yxogC2z$" resolve="right" />
               </node>
               <node concept="liA8E" id="7d$oK1$nLDR" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:429xoyqB1jp" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~SolverLogical.findRoot():jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -5004,7 +5004,7 @@
                   <ref role="3cqZAo" node="7d$oK1$nLDN" resolve="rightRepr" />
                 </node>
                 <node concept="liA8E" id="5oZZzbrizbP" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
                 </node>
               </node>
             </node>
@@ -5014,7 +5014,7 @@
                   <ref role="3cqZAo" node="7d$oK1$nL7F" resolve="leftRepr" />
                 </node>
                 <node concept="liA8E" id="5oZZzbrizbT" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
                 </node>
               </node>
               <node concept="10Nm6u" id="5oZZzbrizbU" role="3uHU7w" />
@@ -5033,7 +5033,7 @@
                 <ref role="3cqZAo" node="7d$oK1$nL7F" resolve="leftRepr" />
               </node>
               <node concept="liA8E" id="1bm7a6EWb4v" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
           </node>
@@ -5049,7 +5049,7 @@
                 <ref role="3cqZAo" node="7d$oK1$nLDN" resolve="rightRepr" />
               </node>
               <node concept="liA8E" id="1bm7a6EWb4y" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
           </node>
@@ -5146,7 +5146,7 @@
                           <ref role="3cqZAo" node="6MYr6JwATAl" resolve="logicalUnification" />
                         </node>
                         <node concept="liA8E" id="6MYr6JwBscD" role="2OqNvi">
-                          <ref role="37wK5l" to="45ys:6MYr6JwAPxG" resolve="logical" />
+                          <ref role="37wK5l" to="bj13:~LogicalUnification.logical(jetbrains.mps.unification.Term):jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="logical" />
                           <node concept="2OqwBi" id="6xYPVrp_7R2" role="37wK5m">
                             <node concept="37vLTw" id="6xYPVrp_7R3" role="2Oq$k0">
                               <ref role="3cqZAo" node="6xYPVrp_5wy" resolve="bnd" />
@@ -5174,7 +5174,7 @@
                   <ref role="3cqZAo" node="6MYr6JwATAl" resolve="logicalUnification" />
                 </node>
                 <node concept="liA8E" id="6MYr6JwSoNk" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:6MYr6JwRKzQ" resolve="isLogical" />
+                  <ref role="37wK5l" to="bj13:~LogicalUnification.isLogical(jetbrains.mps.unification.Term):boolean" resolve="isLogical" />
                   <node concept="2OqwBi" id="7FFmDVAJE92" role="37wK5m">
                     <node concept="37vLTw" id="7FFmDVAJE93" role="2Oq$k0">
                       <ref role="3cqZAo" node="6xYPVrp_5wy" resolve="bnd" />
@@ -5222,7 +5222,7 @@
       <node concept="37vLTG" id="6xYPVrp_1P$" role="3clF46">
         <property role="TrG5h" value="logical" />
         <node concept="3uibUv" id="6xYPVrp_2ET" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="3qTvmN" id="6xYPVrp_31s" role="11_B2D" />
         </node>
       </node>
@@ -5249,7 +5249,7 @@
                 <ref role="3cqZAo" node="6xYPVrp_1P$" resolve="logical" />
               </node>
               <node concept="liA8E" id="6MYr6Jy8_cI" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPKP" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -5262,7 +5262,7 @@
                 <ref role="37wK5l" node="4U_yxogC1Eh" resolve="_askUni" />
                 <node concept="10QFUN" id="2T1p0CFz6ar" role="37wK5m">
                   <node concept="3uibUv" id="2T1p0CFz6as" role="10QFUM">
-                    <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                    <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                     <node concept="16syzq" id="2T1p0CFz6at" role="11_B2D">
                       <ref role="16sUi3" node="6MYr6JwM1_T" resolve="TERM" />
                     </node>
@@ -5276,7 +5276,7 @@
                     <ref role="3cqZAo" node="6MYr6JwATAl" resolve="logicalUnification" />
                   </node>
                   <node concept="liA8E" id="2T1p0CFz6ax" role="2OqNvi">
-                    <ref role="37wK5l" to="45ys:6MYr6JwAODW" resolve="asRoot" />
+                    <ref role="37wK5l" to="bj13:~LogicalUnification.asRoot(jetbrains.mps.unification.Term):jetbrains.mps.unification.Term" resolve="asRoot" />
                     <node concept="37vLTw" id="2T1p0CFz6ay" role="37wK5m">
                       <ref role="3cqZAo" node="6xYPVrp_37O" resolve="bound" />
                     </node>
@@ -5305,7 +5305,7 @@
                   <ref role="37wK5l" node="4U_yxogC2zx" resolve="_askUni" />
                   <node concept="10QFUN" id="2T1p0CFz6aG" role="37wK5m">
                     <node concept="3uibUv" id="2T1p0CFz6aH" role="10QFUM">
-                      <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+                      <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
                       <node concept="16syzq" id="2T1p0CFz6aI" role="11_B2D">
                         <ref role="16sUi3" node="6MYr6JwM1_T" resolve="TERM" />
                       </node>
@@ -5319,7 +5319,7 @@
                       <ref role="3cqZAo" node="6MYr6JwATAl" resolve="logicalUnification" />
                     </node>
                     <node concept="liA8E" id="2T1p0CFz6aM" role="2OqNvi">
-                      <ref role="37wK5l" to="45ys:6MYr6JwAPxG" resolve="logical" />
+                      <ref role="37wK5l" to="bj13:~LogicalUnification.logical(jetbrains.mps.unification.Term):jetbrains.mps.logic.reactor.logical.SolverLogical" resolve="logical" />
                       <node concept="37vLTw" id="2T1p0CFz6aN" role="37wK5m">
                         <ref role="3cqZAo" node="6xYPVrp_37O" resolve="bound" />
                       </node>
@@ -5471,7 +5471,7 @@
       <property role="TrG5h" value="sessionSolver" />
       <node concept="3Tm6S6" id="4xBopTznWR$" role="1B3o_S" />
       <node concept="3uibUv" id="4xBopTznYl8" role="1tU5fm">
-        <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
       </node>
     </node>
     <node concept="2tJIrI" id="7K4Mb_Jwasd" role="jymVt" />
@@ -5479,7 +5479,7 @@
       <property role="TrG5h" value="trace" />
       <node concept="3Tm6S6" id="24Vro6cRIgo" role="1B3o_S" />
       <node concept="3uibUv" id="24Vro6cRIgq" role="1tU5fm">
-        <ref role="3uigEE" to="qrld:24Vro6cQnrj" resolve="EvaluationTrace" />
+        <ref role="3uigEE" to="w7la:~EvaluationTrace" resolve="EvaluationTrace" />
       </node>
     </node>
     <node concept="2tJIrI" id="6MYr6JwARzd" role="jymVt" />
@@ -5487,7 +5487,7 @@
       <property role="TrG5h" value="logicalUnification" />
       <node concept="3Tm6S6" id="6MYr6JwATAm" role="1B3o_S" />
       <node concept="3uibUv" id="6MYr6JwAVkG" role="1tU5fm">
-        <ref role="3uigEE" to="45ys:6MYr6JwANOa" resolve="LogicalUnification" />
+        <ref role="3uigEE" to="bj13:~LogicalUnification" resolve="LogicalUnification" />
       </node>
     </node>
     <node concept="2tJIrI" id="6MYr6JwBO6F" role="jymVt" />
@@ -5501,7 +5501,7 @@
       <node concept="37vLTG" id="4psy6tqstCP" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="4psy6tqstCQ" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="10P_77" id="4psy6tqstCR" role="3clF45" />
@@ -5528,7 +5528,7 @@
       <node concept="37vLTG" id="4psy6tqstDk" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="4psy6tqstDl" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="3clFbS" id="4psy6tqstDp" role="3clF47">
@@ -5551,7 +5551,7 @@
       <node concept="37vLTG" id="4psy6tqstD1" role="3clF46">
         <property role="TrG5h" value="predicateSymbol" />
         <node concept="3uibUv" id="4psy6tqstD2" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
         </node>
       </node>
       <node concept="37vLTG" id="4psy6tqstD3" role="3clF46">
@@ -5563,7 +5563,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="4psy6tqstD6" role="3clF45">
-        <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+        <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
       </node>
       <node concept="3Tm1VV" id="4psy6tqstD7" role="1B3o_S" />
       <node concept="3clFbS" id="4psy6tqstDc" role="3clF47">
@@ -5581,7 +5581,7 @@
     </node>
     <node concept="3Tm1VV" id="4psy6tqstt5" role="1B3o_S" />
     <node concept="3uibUv" id="4psy6tqstwo" role="EKbjA">
-      <ref role="3uigEE" to="qrld:6H279bUODvp" resolve="Solver" />
+      <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
     </node>
   </node>
 </model>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
index d4f979b2..c84e1c24 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
@@ -9,7 +9,7 @@
   <imports>
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
   </imports>
   <registry>
@@ -200,7 +200,7 @@
       <node concept="37vLTG" id="7HUwyZbdNBn" role="3clF46">
         <property role="TrG5h" value="metaLogical" />
         <node concept="3uibUv" id="7HUwyZbdNBm" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
         </node>
       </node>
     </node>
@@ -220,7 +220,7 @@
       </node>
       <node concept="3Tm1VV" id="514BAS_Xsj_" role="1B3o_S" />
       <node concept="3uibUv" id="514BAS_Xswm" role="3clF45">
-        <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+        <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
       </node>
     </node>
     <node concept="2tJIrI" id="514BAS_XsdE" role="jymVt" />
@@ -237,7 +237,7 @@
               <ref role="3cqZAo" node="7HUwyZbdNB$" resolve="metaLogical" />
             </node>
             <node concept="liA8E" id="7HUwyZbdPaE" role="2OqNvi">
-              <ref role="37wK5l" to="45ys:7HUwyZauJox" resolve="isWildcard" />
+              <ref role="37wK5l" to="bj13:~MetaLogical.isWildcard():boolean" resolve="isWildcard" />
             </node>
           </node>
         </node>
@@ -271,7 +271,7 @@
                 <ref role="3cqZAo" node="7HUwyZbdNB$" resolve="metaLogical" />
               </node>
               <node concept="liA8E" id="7HUwyZbdW4K" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:7HUwyZaC3Q7" resolve="type" />
+                <ref role="37wK5l" to="bj13:~MetaLogical.type():java.lang.Class" resolve="type" />
               </node>
             </node>
             <node concept="liA8E" id="6OUp3PsSKJ7" role="2OqNvi">
@@ -305,7 +305,7 @@
               <ref role="3cqZAo" node="7HUwyZbdNB$" resolve="metaLogical" />
             </node>
             <node concept="liA8E" id="4sSe4$pscXp" role="2OqNvi">
-              <ref role="37wK5l" to="45ys:6XBR7US9Exp" resolve="toString" />
+              <ref role="37wK5l" to="bj13:~MetaLogical.toString():java.lang.String" resolve="toString" />
             </node>
           </node>
         </node>
@@ -320,7 +320,7 @@
       <property role="TrG5h" value="metaLogical" />
       <node concept="3Tm6S6" id="7HUwyZbdNB_" role="1B3o_S" />
       <node concept="3uibUv" id="7HUwyZbdNBB" role="1tU5fm">
-        <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+        <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
       </node>
     </node>
   </node>
@@ -331,7 +331,7 @@
       <property role="TrG5h" value="logical" />
       <node concept="3Tm6S6" id="4TCblo5MOOo" role="1B3o_S" />
       <node concept="3uibUv" id="4TCblo5MOQr" role="1tU5fm">
-        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
         <node concept="16syzq" id="4TCblo5MP6S" role="11_B2D">
           <ref role="16sUi3" node="4TCblo5MNXi" resolve="T" />
         </node>
@@ -342,7 +342,7 @@
       <node concept="37vLTG" id="4TCblo5MNMf" role="3clF46">
         <property role="TrG5h" value="logical" />
         <node concept="3uibUv" id="4TCblo5MNQb" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="16syzq" id="4TCblo5MOdf" role="11_B2D">
             <ref role="16sUi3" node="4TCblo5MNXi" resolve="T" />
           </node>
@@ -400,11 +400,11 @@
                     <ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
                   </node>
                   <node concept="liA8E" id="4TCblo5NeWU" role="2OqNvi">
-                    <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                    <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                   </node>
                 </node>
                 <node concept="liA8E" id="4TCblo5NfQc" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
                 </node>
               </node>
             </node>
@@ -415,7 +415,7 @@
               <ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
             </node>
             <node concept="liA8E" id="4TCblo5Ndxq" role="2OqNvi">
-              <ref role="37wK5l" to="45ys:1mP5b6jQPKP" resolve="isBound" />
+              <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
             </node>
           </node>
           <node concept="9aQIb" id="4TCblo5Nikj" role="9aQIa">
@@ -464,7 +464,7 @@
               <ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
             </node>
             <node concept="liA8E" id="4TCblo5MRBz" role="2OqNvi">
-              <ref role="37wK5l" to="45ys:1mP5b6jQPKP" resolve="isBound" />
+              <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
             </node>
           </node>
           <node concept="9aQIb" id="4TCblo5MQHu" role="9aQIa">
@@ -493,7 +493,7 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="logical" />
       <node concept="3uibUv" id="4TCblo5MS1p" role="3clF45">
-        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
         <node concept="3qTvmN" id="4TCblo5MS1q" role="11_B2D" />
       </node>
       <node concept="3Tm1VV" id="4TCblo5MS1r" role="1B3o_S" />
@@ -519,7 +519,7 @@
               <ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
             </node>
             <node concept="liA8E" id="4TCblo5MV1e" role="2OqNvi">
-              <ref role="37wK5l" to="45ys:2DKqMqOiHjb" resolve="isWildcard" />
+              <ref role="37wK5l" to="bj13:~Logical.isWildcard():boolean" resolve="isWildcard" />
             </node>
           </node>
         </node>
@@ -554,7 +554,7 @@
                 <ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
               </node>
               <node concept="liA8E" id="4TCblo5PfRq" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:7HUwyZaOd5Y" resolve="metaLogical" />
+                <ref role="37wK5l" to="bj13:~Logical.metaLogical():jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="metaLogical" />
               </node>
             </node>
           </node>
@@ -567,11 +567,11 @@
                       <ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
                     </node>
                     <node concept="liA8E" id="4TCblo5Pi8Z" role="2OqNvi">
-                      <ref role="37wK5l" to="45ys:7HUwyZaOd5Y" resolve="metaLogical" />
+                      <ref role="37wK5l" to="bj13:~Logical.metaLogical():jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="metaLogical" />
                     </node>
                   </node>
                   <node concept="liA8E" id="4TCblo5Pj6t" role="2OqNvi">
-                    <ref role="37wK5l" to="45ys:7HUwyZaC3Q7" resolve="type" />
+                    <ref role="37wK5l" to="bj13:~MetaLogical.type():java.lang.Class" resolve="type" />
                   </node>
                 </node>
                 <node concept="liA8E" id="6OUp3PsSHqC" role="2OqNvi">
@@ -725,7 +725,7 @@
       <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
     </node>
     <node concept="3uibUv" id="4TCblo5MKQV" role="EKbjA">
-      <ref role="3uigEE" to="45ys:46l0wJhtOD_" resolve="LogicalOwner" />
+      <ref role="3uigEE" to="bj13:~LogicalOwner" resolve="LogicalOwner" />
     </node>
     <node concept="16euLQ" id="4TCblo5MNXi" role="16eVyc">
       <property role="TrG5h" value="T" />
@@ -795,7 +795,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="3FIATxbQg$Q" role="3clF45">
-        <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+        <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
         <node concept="16syzq" id="3FIATxbQg$R" role="11_B2D">
           <ref role="16sUi3" node="3FIATxbQg$T" resolve="TERM" />
         </node>
@@ -817,16 +817,16 @@
                     <ref role="3cqZAo" node="3FIATxbQg$O" resolve="var" />
                   </node>
                   <node concept="3uibUv" id="3FIATxbQg_2" role="10QFUM">
-                    <ref role="3uigEE" to="45ys:46l0wJhtOD_" resolve="LogicalOwner" />
+                    <ref role="3uigEE" to="bj13:~LogicalOwner" resolve="LogicalOwner" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="3FIATxbQg_3" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:46l0wJhtXlr" resolve="logical" />
+                <ref role="37wK5l" to="bj13:~LogicalOwner.logical():jetbrains.mps.logic.reactor.logical.Logical" resolve="logical" />
               </node>
             </node>
             <node concept="3uibUv" id="3FIATxbQg_4" role="10QFUM">
-              <ref role="3uigEE" to="45ys:6MYr6JwxYwB" resolve="SolverLogical" />
+              <ref role="3uigEE" to="bj13:~SolverLogical" resolve="SolverLogical" />
               <node concept="16syzq" id="3FIATxbQg_5" role="11_B2D">
                 <ref role="16sUi3" node="3FIATxbQg$T" resolve="TERM" />
               </node>
@@ -854,7 +854,7 @@
         <node concept="3clFbF" id="3FIATxbQg_d" role="3cqZAp">
           <node concept="2ZW3vV" id="3FIATxbQg_e" role="3clFbG">
             <node concept="3uibUv" id="3FIATxbQg_f" role="2ZW6by">
-              <ref role="3uigEE" to="45ys:46l0wJhtOD_" resolve="LogicalOwner" />
+              <ref role="3uigEE" to="bj13:~LogicalOwner" resolve="LogicalOwner" />
             </node>
             <node concept="37vLTw" id="3FIATxbQg_g" role="2ZW6bz">
               <ref role="3cqZAo" node="3FIATxbQg_8" resolve="term" />
@@ -869,7 +869,7 @@
     <node concept="2tJIrI" id="4xTpErjR1aJ" role="jymVt" />
     <node concept="3Tm1VV" id="4xTpErjR15_" role="1B3o_S" />
     <node concept="3uibUv" id="4xTpErjR19h" role="EKbjA">
-      <ref role="3uigEE" to="45ys:6MYr6JwANOa" resolve="LogicalUnification" />
+      <ref role="3uigEE" to="bj13:~LogicalUnification" resolve="LogicalUnification" />
     </node>
   </node>
 </model>
diff --git a/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd b/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
index fa34b763..7cf97cd2 100644
--- a/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
+++ b/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
@@ -7,6 +7,7 @@
     <modelRoot contentPath="${module}" type="java_classes">
       <sourceRoot location="lib/memreactor-core-0.1.jar" />
       <sourceRoot location="lib/unification-lib-1.0.2.jar" />
+      <sourceRoot location="lib/memreactor-api-0.1.jar" />
     </modelRoot>
   </models>
   <stubModelEntries>
@@ -16,6 +17,7 @@
     <stubModelEntry path="${module}/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
     <stubModelEntry path="${module}/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
     <stubModelEntry path="${module}/lib/unification-lib-1.0.2.jar" />
+    <stubModelEntry path="${module}/lib/memreactor-api-0.1.jar" />
   </stubModelEntries>
   <sourcePath />
   <dependencies>
@@ -26,8 +28,6 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
     <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/evaluation.mps b/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/evaluation.mps
deleted file mode 100644
index 65bac5d2..00000000
--- a/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/evaluation.mps
+++ /dev/null
@@ -1,2040 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)">
-  <persistence version="9" />
-  <languages>
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
-  </languages>
-  <imports>
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
-    <import index="9w4s" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util(MPS.IDEA/)" />
-  </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1219920932475" name="jetbrains.mps.baseLanguage.structure.VariableArityType" flags="in" index="8X2XB">
-        <child id="1219921048460" name="componentType" index="8Xvag" />
-      </concept>
-      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
-        <child id="1068498886297" name="rValue" index="37vLTx" />
-        <child id="1068498886295" name="lValue" index="37vLTJ" />
-      </concept>
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
-      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
-        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
-      </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
-        <child id="1188208488637" name="annotation" index="2AJF6D" />
-      </concept>
-      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
-        <child id="1154032183016" name="body" index="2LFqv$" />
-      </concept>
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1197029447546" name="jetbrains.mps.baseLanguage.structure.FieldReferenceOperation" flags="nn" index="2OwXpG">
-        <reference id="1197029500499" name="fieldDeclaration" index="2Oxat5" />
-      </concept>
-      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
-        <child id="1145553007750" name="creator" index="2ShVmc" />
-      </concept>
-      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
-      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
-      <concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
-      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
-        <property id="1070475926801" name="value" index="Xl_RC" />
-      </concept>
-      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
-        <child id="1182160096073" name="cls" index="YeSDq" />
-      </concept>
-      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
-      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
-        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
-      </concept>
-      <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
-        <child id="1164991057263" name="throwable" index="YScLw" />
-      </concept>
-      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
-        <reference id="1144433057691" name="classifier" index="1PxDUh" />
-      </concept>
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
-        <child id="1070534934091" name="type" index="10QFUM" />
-        <child id="1070534934092" name="expression" index="10QFUP" />
-      </concept>
-      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg">
-        <property id="8606350594693632173" name="isTransient" index="eg7rD" />
-        <property id="1240249534625" name="isVolatile" index="34CwA1" />
-      </concept>
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
-        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
-        <child id="1095933932569" name="implementedInterface" index="EKbjA" />
-        <child id="1165602531693" name="superclass" index="1zkMxy" />
-      </concept>
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <property id="1176718929932" name="isFinal" index="3TUv4t" />
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
-      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
-      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <property id="4276006055363816570" name="isSynchronized" index="od$2w" />
-        <property id="1181808852946" name="isFinal" index="DiZV1" />
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
-        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
-      </concept>
-      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
-      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1068580123160" name="condition" index="3clFbw" />
-        <child id="1068580123161" name="ifTrue" index="3clFbx" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
-      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
-        <child id="1068581517676" name="expression" index="3cqZAk" />
-      </concept>
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
-        <child id="1081516765348" name="expression" index="3fr31v" />
-      </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
-        <child id="1212687122400" name="typeParameter" index="1pMfVU" />
-      </concept>
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="1171903607971" name="jetbrains.mps.baseLanguage.structure.WildCardType" flags="in" index="3qTvmN" />
-      <concept id="1171903916106" name="jetbrains.mps.baseLanguage.structure.UpperBoundType" flags="in" index="3qUE_q">
-        <child id="1171903916107" name="bound" index="3qUE_r" />
-      </concept>
-      <concept id="7812454656619025416" name="jetbrains.mps.baseLanguage.structure.MethodDeclaration" flags="ng" index="1rXfSm">
-        <property id="8355037393041754995" name="isNative" index="2aFKle" />
-      </concept>
-      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-        <child id="1109201940907" name="parameter" index="11_B2D" />
-      </concept>
-      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
-        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
-        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
-      </concept>
-      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
-        <child id="1144226360166" name="iterable" index="1DdaDG" />
-      </concept>
-      <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
-        <child id="1144230900587" name="variable" index="1Duv9x" />
-      </concept>
-      <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615">
-        <child id="1107797138135" name="extendedInterface" index="3HQHJm" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
-      <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
-      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
-        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
-      </concept>
-    </language>
-    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
-      </concept>
-      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
-      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="3HP615" id="6Kcfpq7AXVG">
-    <property role="TrG5h" value="Instructible" />
-    <node concept="2tJIrI" id="6Kcfpq7AY2O" role="jymVt" />
-    <node concept="3clFb_" id="2UGjFq4kyQU" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="tell" />
-      <node concept="3cqZAl" id="2UGjFq4kyQX" role="3clF45" />
-      <node concept="3Tm1VV" id="2UGjFq4kyQY" role="1B3o_S" />
-      <node concept="3clFbS" id="2UGjFq4kyQZ" role="3clF47" />
-      <node concept="37vLTG" id="2UGjFq4kyTk" role="3clF46">
-        <property role="TrG5h" value="invocation" />
-        <node concept="3uibUv" id="2UGjFq4kyTj" role="1tU5fm">
-          <ref role="3uigEE" node="49L2l3FhtS6" resolve="PredicateInvocation" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2UGjFq4kyQa" role="jymVt" />
-    <node concept="3Tm1VV" id="6Kcfpq7AXVH" role="1B3o_S" />
-  </node>
-  <node concept="3HP615" id="6Kcfpq7AYBh">
-    <property role="TrG5h" value="Queryable" />
-    <node concept="2tJIrI" id="6Kcfpq7AYPU" role="jymVt" />
-    <node concept="3clFb_" id="2UGjFq4kyWk" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="ask" />
-      <node concept="37vLTG" id="2UGjFq4kz0t" role="3clF46">
-        <property role="TrG5h" value="invocation" />
-        <node concept="3uibUv" id="2UGjFq4kz2l" role="1tU5fm">
-          <ref role="3uigEE" node="49L2l3FhtS6" resolve="PredicateInvocation" />
-        </node>
-      </node>
-      <node concept="10P_77" id="2UGjFq4kyXA" role="3clF45" />
-      <node concept="3Tm1VV" id="2UGjFq4kyWn" role="1B3o_S" />
-      <node concept="3clFbS" id="2UGjFq4kyWo" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="6H279bV81Y5" role="jymVt" />
-    <node concept="3Tm1VV" id="6Kcfpq7AYBi" role="1B3o_S" />
-    <node concept="3uibUv" id="6Kcfpq7AZqN" role="3HQHJm">
-      <ref role="3uigEE" node="6Kcfpq7AXVG" resolve="Instructible" />
-    </node>
-  </node>
-  <node concept="312cEu" id="6Kcfpq7B0b0">
-    <property role="TrG5h" value="SessionSolver" />
-    <property role="1sVAO0" value="true" />
-    <node concept="3uibUv" id="2tcGHBE67_N" role="EKbjA">
-      <ref role="3uigEE" node="6Kcfpq7AXVG" resolve="Instructible" />
-    </node>
-    <node concept="3uibUv" id="2tcGHBE68Cy" role="EKbjA">
-      <ref role="3uigEE" node="6Kcfpq7AYBh" resolve="Queryable" />
-    </node>
-    <node concept="2tJIrI" id="2tcGHBEencT" role="jymVt" />
-    <node concept="3clFb_" id="2tcGHBEeol1" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="init" />
-      <property role="od$2w" value="false" />
-      <property role="DiZV1" value="false" />
-      <property role="2aFKle" value="false" />
-      <node concept="37vLTG" id="2tcGHBEirFR" role="3clF46">
-        <property role="TrG5h" value="predicateSymbols" />
-        <node concept="8X2XB" id="2tcGHBEirFS" role="1tU5fm">
-          <node concept="3uibUv" id="2tcGHBEirFT" role="8Xvag">
-            <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
-          </node>
-        </node>
-      </node>
-      <node concept="3clFbS" id="2tcGHBEeol4" role="3clF47">
-        <node concept="3clFbF" id="2tcGHBEepha" role="3cqZAp">
-          <node concept="1rXfSq" id="2tcGHBEeph9" role="3clFbG">
-            <ref role="37wK5l" node="5jPBdK__lx" resolve="registerSymbols" />
-            <node concept="37vLTw" id="2tcGHBEisqb" role="37wK5m">
-              <ref role="3cqZAo" node="2tcGHBEirFR" resolve="predicateSymbols" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="2tcGHBEenL5" role="1B3o_S" />
-      <node concept="3cqZAl" id="2tcGHBEeoTR" role="3clF45" />
-    </node>
-    <node concept="2tJIrI" id="2tcGHBEix_v" role="jymVt" />
-    <node concept="3clFb_" id="2tcGHBEix86" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="init" />
-      <property role="od$2w" value="false" />
-      <property role="DiZV1" value="false" />
-      <property role="2aFKle" value="false" />
-      <node concept="37vLTG" id="2tcGHBEix87" role="3clF46">
-        <property role="TrG5h" value="evaluationTrace" />
-        <node concept="3uibUv" id="2tcGHBEix88" role="1tU5fm">
-          <ref role="3uigEE" node="24Vro6cQnrj" resolve="EvaluationTrace" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2tcGHBEix89" role="3clF46">
-        <property role="TrG5h" value="predicateSymbols" />
-        <node concept="8X2XB" id="2tcGHBEix8a" role="1tU5fm">
-          <node concept="3uibUv" id="2tcGHBEix8b" role="8Xvag">
-            <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
-          </node>
-        </node>
-      </node>
-      <node concept="3clFbS" id="2tcGHBEix8c" role="3clF47">
-        <node concept="3clFbF" id="65oL76bXfRV" role="3cqZAp">
-          <node concept="37vLTI" id="65oL76bXfUD" role="3clFbG">
-            <node concept="37vLTw" id="65oL76bXfX9" role="37vLTx">
-              <ref role="3cqZAo" node="2tcGHBEix87" resolve="evaluationTrace" />
-            </node>
-            <node concept="37vLTw" id="65oL76bXfRT" role="37vLTJ">
-              <ref role="3cqZAo" node="65oL76bXcmr" resolve="tracer" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="65oL76bXfZP" role="3cqZAp">
-          <node concept="1rXfSq" id="65oL76bXfZN" role="3clFbG">
-            <ref role="37wK5l" node="2tcGHBEeol1" resolve="init" />
-            <node concept="37vLTw" id="65oL76bXg1V" role="37wK5m">
-              <ref role="3cqZAo" node="2tcGHBEix89" resolve="predicateSymbols" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="2tcGHBEix8h" role="1B3o_S" />
-      <node concept="3cqZAl" id="2tcGHBEix8i" role="3clF45" />
-    </node>
-    <node concept="2tJIrI" id="2UGjFq4mtpr" role="jymVt" />
-    <node concept="3clFb_" id="2UGjFq4ms0s" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="ask" />
-      <node concept="37vLTG" id="2UGjFq4ms0t" role="3clF46">
-        <property role="TrG5h" value="invocation" />
-        <node concept="3uibUv" id="2UGjFq4ms0u" role="1tU5fm">
-          <ref role="3uigEE" node="49L2l3FhtS6" resolve="PredicateInvocation" />
-        </node>
-      </node>
-      <node concept="10P_77" id="2UGjFq4ms0v" role="3clF45" />
-      <node concept="3Tm1VV" id="2UGjFq4ms0w" role="1B3o_S" />
-      <node concept="3clFbS" id="2UGjFq4ms0y" role="3clF47">
-        <node concept="3cpWs8" id="2UGjFq4mtXr" role="3cqZAp">
-          <node concept="3cpWsn" id="2UGjFq4mtXs" role="3cpWs9">
-            <property role="TrG5h" value="result" />
-            <node concept="10P_77" id="2UGjFq4mtXq" role="1tU5fm" />
-            <node concept="2OqwBi" id="2UGjFq4mu00" role="33vP2m">
-              <node concept="1rXfSq" id="2UGjFq4mu01" role="2Oq$k0">
-                <ref role="37wK5l" node="6Kcfpq7B10O" resolve="solver" />
-                <node concept="2OqwBi" id="2UGjFq4mug8" role="37wK5m">
-                  <node concept="2OqwBi" id="2UGjFq4muaZ" role="2Oq$k0">
-                    <node concept="37vLTw" id="2UGjFq4mu8Q" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2UGjFq4ms0t" resolve="invocation" />
-                    </node>
-                    <node concept="liA8E" id="2UGjFq4mudP" role="2OqNvi">
-                      <ref role="37wK5l" node="49L2l3FhtSL" resolve="predicate" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="2UGjFq4muj2" role="2OqNvi">
-                    <ref role="37wK5l" to="rchb:6Kcfpq7Bjgi" resolve="symbol" />
-                  </node>
-                </node>
-              </node>
-              <node concept="liA8E" id="2UGjFq4mu03" role="2OqNvi">
-                <ref role="37wK5l" node="2UGjFq4kyWk" resolve="ask" />
-                <node concept="37vLTw" id="2UGjFq4muro" role="37wK5m">
-                  <ref role="3cqZAo" node="2UGjFq4ms0t" resolve="invocation" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="2UGjFq4mtO$" role="3cqZAp">
-          <node concept="2OqwBi" id="2UGjFq4mtPk" role="3clFbG">
-            <node concept="37vLTw" id="2UGjFq4mtOz" role="2Oq$k0">
-              <ref role="3cqZAo" node="65oL76bXcmr" resolve="tracer" />
-            </node>
-            <node concept="liA8E" id="2UGjFq4mtQL" role="2OqNvi">
-              <ref role="37wK5l" node="2UGjFq48iLL" resolve="ask" />
-              <node concept="37vLTw" id="2UGjFq4mtXu" role="37wK5m">
-                <ref role="3cqZAo" node="2UGjFq4mtXs" resolve="result" />
-              </node>
-              <node concept="37vLTw" id="2UGjFq4mtSs" role="37wK5m">
-                <ref role="3cqZAo" node="2UGjFq4ms0t" resolve="invocation" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="2UGjFq4muw$" role="3cqZAp">
-          <node concept="37vLTw" id="2UGjFq4muzS" role="3cqZAk">
-            <ref role="3cqZAo" node="2UGjFq4mtXs" resolve="result" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="2UGjFq4mtNv" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2UGjFq4msnz" role="jymVt" />
-    <node concept="3clFb_" id="4xBopTznHV5" role="jymVt">
-      <property role="TrG5h" value="ask" />
-      <node concept="37vLTG" id="4xBopTznJFk" role="3clF46">
-        <property role="TrG5h" value="predicateSymbol" />
-        <node concept="3uibUv" id="5uFPQ7C5X61" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="4xBopTznK09" role="3clF46">
-        <property role="TrG5h" value="args" />
-        <node concept="8X2XB" id="4xBopTznKlF" role="1tU5fm">
-          <node concept="3uibUv" id="4xBopTznKj7" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="10P_77" id="4xBopTznJ7k" role="3clF45" />
-      <node concept="3Tm1VV" id="4xBopTznHV8" role="1B3o_S" />
-      <node concept="3clFbS" id="4xBopTznHV9" role="3clF47">
-        <node concept="3cpWs8" id="6H279bUTS0Y" role="3cqZAp">
-          <node concept="3cpWsn" id="6H279bUTS0Z" role="3cpWs9">
-            <property role="TrG5h" value="solver" />
-            <node concept="3uibUv" id="6H279bUTS10" role="1tU5fm">
-              <ref role="3uigEE" node="6H279bUODvp" resolve="Solver" />
-            </node>
-            <node concept="1rXfSq" id="6H279bUTS11" role="33vP2m">
-              <ref role="37wK5l" node="6Kcfpq7B10O" resolve="solver" />
-              <node concept="37vLTw" id="6H279bUTT3T" role="37wK5m">
-                <ref role="3cqZAo" node="4xBopTznJFk" resolve="predicateSymbol" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6H279bUTS15" role="3cqZAp">
-          <node concept="3cpWsn" id="6H279bUTS16" role="3cpWs9">
-            <property role="TrG5h" value="predicate" />
-            <node concept="3uibUv" id="6H279bUTS17" role="1tU5fm">
-              <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
-            </node>
-            <node concept="2OqwBi" id="6H279bUTS18" role="33vP2m">
-              <node concept="37vLTw" id="6H279bUTS19" role="2Oq$k0">
-                <ref role="3cqZAo" node="6H279bUTS0Z" resolve="solver" />
-              </node>
-              <node concept="liA8E" id="6H279bUTS1a" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:2UGjFq4fSE9" resolve="predicate" />
-                <node concept="37vLTw" id="6H279bUTWFE" role="37wK5m">
-                  <ref role="3cqZAo" node="4xBopTznJFk" resolve="predicateSymbol" />
-                </node>
-                <node concept="37vLTw" id="6H279bUTS1e" role="37wK5m">
-                  <ref role="3cqZAo" node="4xBopTznK09" resolve="args" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6H279bUTS1f" role="3cqZAp">
-          <node concept="3cpWsn" id="6H279bUTS1g" role="3cpWs9">
-            <property role="TrG5h" value="invocation" />
-            <node concept="3uibUv" id="6H279bUTS1h" role="1tU5fm">
-              <ref role="3uigEE" node="6H279bUTJ1f" resolve="SessionSolver.Invocation" />
-            </node>
-            <node concept="2ShNRf" id="6H279bUTS1i" role="33vP2m">
-              <node concept="1pGfFk" id="6H279bUTS1j" role="2ShVmc">
-                <ref role="37wK5l" node="6H279bUTJFv" resolve="SessionSolver.Invocation" />
-                <node concept="37vLTw" id="6H279bUTS1k" role="37wK5m">
-                  <ref role="3cqZAo" node="6H279bUTS16" resolve="predicate" />
-                </node>
-                <node concept="2YIFZM" id="6H279bUTS1l" role="37wK5m">
-                  <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
-                  <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
-                  <node concept="37vLTw" id="6H279bUTS1m" role="37wK5m">
-                    <ref role="3cqZAo" node="4xBopTznK09" resolve="args" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6H279bVdcx1" role="3cqZAp" />
-        <node concept="3cpWs6" id="4xBopTznMkq" role="3cqZAp">
-          <node concept="2OqwBi" id="6H279bV88PY" role="3cqZAk">
-            <node concept="1rXfSq" id="6H279bV88PZ" role="2Oq$k0">
-              <ref role="37wK5l" node="6Kcfpq7B10O" resolve="solver" />
-              <node concept="37vLTw" id="6H279bV88Q0" role="37wK5m">
-                <ref role="3cqZAo" node="4xBopTznJFk" resolve="predicateSymbol" />
-              </node>
-            </node>
-            <node concept="liA8E" id="6H279bV88Q1" role="2OqNvi">
-              <ref role="37wK5l" node="2UGjFq4kyWk" resolve="ask" />
-              <node concept="37vLTw" id="6H279bV88Q2" role="37wK5m">
-                <ref role="3cqZAo" node="6H279bUTS1g" resolve="invocation" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="P$JXv" id="6H279bV8a2i" role="lGtFl">
-        <node concept="TZ5HA" id="6H279bV8a2j" role="TZ5H$">
-          <node concept="1dT_AC" id="6H279bV8a2k" role="1dT_Ay">
-            <property role="1dT_AB" value="To be used internally. For testing pupposes. " />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4xBopTznHuj" role="jymVt" />
-    <node concept="3clFb_" id="2UGjFq4muX0" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="tell" />
-      <node concept="3cqZAl" id="2UGjFq4muX1" role="3clF45" />
-      <node concept="3Tm1VV" id="2UGjFq4muX2" role="1B3o_S" />
-      <node concept="37vLTG" id="2UGjFq4muX4" role="3clF46">
-        <property role="TrG5h" value="invocation" />
-        <node concept="3uibUv" id="2UGjFq4muX5" role="1tU5fm">
-          <ref role="3uigEE" node="49L2l3FhtS6" resolve="PredicateInvocation" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="2UGjFq4muX6" role="3clF47">
-        <node concept="3clFbF" id="2UGjFq4mwll" role="3cqZAp">
-          <node concept="2OqwBi" id="2UGjFq4mwmV" role="3clFbG">
-            <node concept="37vLTw" id="2UGjFq4mwlj" role="2Oq$k0">
-              <ref role="3cqZAo" node="65oL76bXcmr" resolve="tracer" />
-            </node>
-            <node concept="liA8E" id="2UGjFq4mwoD" role="2OqNvi">
-              <ref role="37wK5l" node="2UGjFq48i6t" resolve="tell" />
-              <node concept="37vLTw" id="2UGjFq4mwpS" role="37wK5m">
-                <ref role="3cqZAo" node="2UGjFq4muX4" resolve="invocation" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="2UGjFq4mw5F" role="3cqZAp">
-          <node concept="2OqwBi" id="2UGjFq4mwcH" role="3clFbG">
-            <node concept="1rXfSq" id="2UGjFq4mw5E" role="2Oq$k0">
-              <ref role="37wK5l" node="6Kcfpq7B0QC" resolve="handler" />
-              <node concept="2OqwBi" id="2UGjFq4mw9S" role="37wK5m">
-                <node concept="2OqwBi" id="2UGjFq4mw7D" role="2Oq$k0">
-                  <node concept="37vLTw" id="2UGjFq4mw6S" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2UGjFq4muX4" resolve="invocation" />
-                  </node>
-                  <node concept="liA8E" id="2UGjFq4mw9a" role="2OqNvi">
-                    <ref role="37wK5l" node="49L2l3FhtSL" resolve="predicate" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="2UGjFq4mwbN" role="2OqNvi">
-                  <ref role="37wK5l" to="rchb:6Kcfpq7Bjgi" resolve="symbol" />
-                </node>
-              </node>
-            </node>
-            <node concept="liA8E" id="2UGjFq4mweF" role="2OqNvi">
-              <ref role="37wK5l" node="2UGjFq4kyQU" resolve="tell" />
-              <node concept="37vLTw" id="2UGjFq4mwg9" role="37wK5m">
-                <ref role="3cqZAo" node="2UGjFq4muX4" resolve="invocation" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="2UGjFq4KyAx" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2UGjFq4mvH$" role="jymVt" />
-    <node concept="3clFb_" id="4xBopTznPKO" role="jymVt">
-      <property role="TrG5h" value="tell" />
-      <node concept="3cqZAl" id="4xBopTznPKQ" role="3clF45" />
-      <node concept="3Tm1VV" id="4xBopTznPKR" role="1B3o_S" />
-      <node concept="3clFbS" id="4xBopTznPKS" role="3clF47">
-        <node concept="3cpWs8" id="6H279bUT_CP" role="3cqZAp">
-          <node concept="3cpWsn" id="6H279bUT_CQ" role="3cpWs9">
-            <property role="TrG5h" value="solver" />
-            <node concept="3uibUv" id="6H279bUTA8g" role="1tU5fm">
-              <ref role="3uigEE" node="6H279bUODvp" resolve="Solver" />
-            </node>
-            <node concept="1rXfSq" id="6H279bUT_CR" role="33vP2m">
-              <ref role="37wK5l" node="6Kcfpq7B10O" resolve="solver" />
-              <node concept="10QFUN" id="6H279bUT_I_" role="37wK5m">
-                <node concept="3uibUv" id="6H279bUT_Iz" role="10QFUM">
-                  <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
-                </node>
-                <node concept="37vLTw" id="6H279bUT_I$" role="10QFUP">
-                  <ref role="3cqZAo" node="4xBopTznQGo" resolve="symbol" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6H279bUTAtm" role="3cqZAp">
-          <node concept="3cpWsn" id="6H279bUTAtn" role="3cpWs9">
-            <property role="TrG5h" value="predicate" />
-            <node concept="3uibUv" id="6H279bUTAtl" role="1tU5fm">
-              <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
-            </node>
-            <node concept="2OqwBi" id="6H279bUTAto" role="33vP2m">
-              <node concept="37vLTw" id="6H279bUTAtp" role="2Oq$k0">
-                <ref role="3cqZAo" node="6H279bUT_CQ" resolve="solver" />
-              </node>
-              <node concept="liA8E" id="6H279bUTAtq" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:2UGjFq4fSE9" resolve="predicate" />
-                <node concept="10QFUN" id="6H279bUTAtr" role="37wK5m">
-                  <node concept="3uibUv" id="6H279bUTAts" role="10QFUM">
-                    <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
-                  </node>
-                  <node concept="37vLTw" id="6H279bUTAtt" role="10QFUP">
-                    <ref role="3cqZAo" node="4xBopTznQGo" resolve="symbol" />
-                  </node>
-                </node>
-                <node concept="37vLTw" id="6H279bUTAtu" role="37wK5m">
-                  <ref role="3cqZAo" node="4xBopTznR4D" resolve="args" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6H279bUTQfF" role="3cqZAp">
-          <node concept="3cpWsn" id="6H279bUTQfG" role="3cpWs9">
-            <property role="TrG5h" value="invocation" />
-            <node concept="3uibUv" id="6H279bUTQfD" role="1tU5fm">
-              <ref role="3uigEE" node="6H279bUTJ1f" resolve="SessionSolver.Invocation" />
-            </node>
-            <node concept="2ShNRf" id="6H279bUTQfH" role="33vP2m">
-              <node concept="1pGfFk" id="6H279bUTQfI" role="2ShVmc">
-                <ref role="37wK5l" node="6H279bUTJFv" resolve="SessionSolver.Invocation" />
-                <node concept="37vLTw" id="6H279bUTQfJ" role="37wK5m">
-                  <ref role="3cqZAo" node="6H279bUTAtn" resolve="predicate" />
-                </node>
-                <node concept="2YIFZM" id="6H279bUTQfK" role="37wK5m">
-                  <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
-                  <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
-                  <node concept="37vLTw" id="6H279bUTQfL" role="37wK5m">
-                    <ref role="3cqZAo" node="4xBopTznR4D" resolve="args" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6H279bUU1Zj" role="3cqZAp" />
-        <node concept="3clFbF" id="6H279bUTQB5" role="3cqZAp">
-          <node concept="2OqwBi" id="6H279bUTQI5" role="3clFbG">
-            <node concept="37vLTw" id="6H279bUTQB3" role="2Oq$k0">
-              <ref role="3cqZAo" node="6H279bUT_CQ" resolve="solver" />
-            </node>
-            <node concept="liA8E" id="6H279bUTQNm" role="2OqNvi">
-              <ref role="37wK5l" node="2UGjFq4kyQU" resolve="tell" />
-              <node concept="37vLTw" id="6H279bUTQQH" role="37wK5m">
-                <ref role="3cqZAo" node="6H279bUTQfG" resolve="invocation" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="4xBopTznQGo" role="3clF46">
-        <property role="TrG5h" value="symbol" />
-        <node concept="3uibUv" id="5uFPQ7Cdut1" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$mzX" resolve="Symbol" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="4xBopTznR4D" role="3clF46">
-        <property role="TrG5h" value="args" />
-        <node concept="8X2XB" id="4xBopTznRwA" role="1tU5fm">
-          <node concept="3uibUv" id="4xBopTznRsM" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="P$JXv" id="6H279bV8a$3" role="lGtFl">
-        <node concept="TZ5HA" id="6H279bV8a$4" role="TZ5H$">
-          <node concept="1dT_AC" id="6H279bV8c6W" role="1dT_Ay">
-            <property role="1dT_AB" value="To be used internally. For testing pupposes. " />
-          </node>
-          <node concept="1dT_AC" id="6H279bV8a$5" role="1dT_Ay" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2tcGHBEqIuN" role="jymVt" />
-    <node concept="3clFb_" id="6MYr6JwonCY" role="jymVt">
-      <property role="TrG5h" value="queueIfBusy" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="37vLTG" id="6MYr6JwoqdW" role="3clF46">
-        <property role="TrG5h" value="runnable" />
-        <node concept="3uibUv" id="6MYr6Jwoq$S" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Runnable" resolve="Runnable" />
-        </node>
-      </node>
-      <node concept="10P_77" id="6MYr6JwookG" role="3clF45" />
-      <node concept="3Tm1VV" id="6MYr6JwonD1" role="1B3o_S" />
-      <node concept="3clFbS" id="6MYr6JwonD2" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="3eLgHzX3LvL" role="jymVt" />
-    <node concept="3clFb_" id="3eLgHzX3LYG" role="jymVt">
-      <property role="TrG5h" value="fail" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="37vLTG" id="3eLgHzX3MGO" role="3clF46">
-        <property role="TrG5h" value="message" />
-        <node concept="17QB3L" id="3eLgHzX3MXw" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="3eLgHzX3LYI" role="3clF45" />
-      <node concept="3Tm1VV" id="3eLgHzX3LYJ" role="1B3o_S" />
-      <node concept="3clFbS" id="3eLgHzX3LYK" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="6MYr6Jwol33" role="jymVt" />
-    <node concept="3clFb_" id="4xBopTzsxxs" role="jymVt">
-      <property role="TrG5h" value="lookupQueryable" />
-      <node concept="37vLTG" id="4xBopTzsxxt" role="3clF46">
-        <property role="TrG5h" value="clazz" />
-        <node concept="3uibUv" id="4xBopTzsxxu" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-          <node concept="3qTvmN" id="4xBopTzuGiG" role="11_B2D" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="5uFPQ7C2Dxl" role="3clF45">
-        <ref role="3uigEE" node="6Kcfpq7AYBh" resolve="Queryable" />
-      </node>
-      <node concept="3Tm1VV" id="4xBopTzsxxy" role="1B3o_S" />
-      <node concept="3clFbS" id="4xBopTzsxxz" role="3clF47">
-        <node concept="1DcWWT" id="4xBopTzs_7_" role="3cqZAp">
-          <node concept="3clFbS" id="4xBopTzs_7B" role="2LFqv$">
-            <node concept="3cpWs8" id="5uFPQ7C2I2o" role="3cqZAp">
-              <node concept="3cpWsn" id="5uFPQ7C2I2p" role="3cpWs9">
-                <property role="TrG5h" value="queryable" />
-                <node concept="3uibUv" id="5uFPQ7C2I2n" role="1tU5fm">
-                  <ref role="3uigEE" node="6Kcfpq7AYBh" resolve="Queryable" />
-                </node>
-                <node concept="2OqwBi" id="5uFPQ7C2I2q" role="33vP2m">
-                  <node concept="37vLTw" id="5uFPQ7C2I2r" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4xBopTzs_7D" resolve="e" />
-                  </node>
-                  <node concept="liA8E" id="5uFPQ7C2I2s" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~Map$Entry.getValue():java.lang.Object" resolve="getValue" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="4xBopTzs_ns" role="3cqZAp">
-              <node concept="3clFbS" id="4xBopTzs_nt" role="3clFbx">
-                <node concept="3cpWs6" id="4xBopTzsAE7" role="3cqZAp">
-                  <node concept="37vLTw" id="5uFPQ7C2I2u" role="3cqZAk">
-                    <ref role="3cqZAo" node="5uFPQ7C2I2p" resolve="queryable" />
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="4xBopTzs_sf" role="3clFbw">
-                <node concept="37vLTw" id="4xBopTzs_nM" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4xBopTzsxxt" resolve="clazz" />
-                </node>
-                <node concept="liA8E" id="4xBopTzs_AV" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Class.isAssignableFrom(java.lang.Class):boolean" resolve="isAssignableFrom" />
-                  <node concept="2OqwBi" id="4xBopTzs_JA" role="37wK5m">
-                    <node concept="37vLTw" id="5uFPQ7C2I2t" role="2Oq$k0">
-                      <ref role="3cqZAo" node="5uFPQ7C2I2p" resolve="queryable" />
-                    </node>
-                    <node concept="liA8E" id="5uFPQ7C2HoM" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="4xBopTzs_7D" role="1Duv9x">
-            <property role="TrG5h" value="e" />
-            <node concept="3uibUv" id="4xBopTzs_7H" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~Map$Entry" resolve="Map.Entry" />
-              <node concept="3uibUv" id="5uFPQ7C2FDE" role="11_B2D">
-                <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
-              </node>
-              <node concept="3uibUv" id="6H279bUOFxQ" role="11_B2D">
-                <ref role="3uigEE" node="6H279bUODvp" resolve="Solver" />
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="4xBopTzs_7K" role="1DdaDG">
-            <node concept="37vLTw" id="4xBopTzs_7L" role="2Oq$k0">
-              <ref role="3cqZAo" node="6Kcfpq7B51L" resolve="solvers" />
-            </node>
-            <node concept="liA8E" id="4xBopTzs_7M" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.entrySet():java.util.Set" resolve="entrySet" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="4xBopTzsDEr" role="3cqZAp">
-          <node concept="10Nm6u" id="4xBopTzsEPg" role="3cqZAk" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2tcGHBEveN9" role="jymVt" />
-    <node concept="3clFb_" id="2tcGHBEqJAf" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="solverClass" />
-      <property role="od$2w" value="false" />
-      <property role="DiZV1" value="false" />
-      <property role="2aFKle" value="false" />
-      <node concept="3clFbS" id="2tcGHBEqJAi" role="3clF47" />
-      <node concept="3Tm1VV" id="2tcGHBEqJbr" role="1B3o_S" />
-      <node concept="3uibUv" id="2tcGHBEqJz1" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-        <node concept="3qUE_q" id="2tcGHBEqJ$x" role="11_B2D">
-          <node concept="3uibUv" id="2tcGHBEqJ$D" role="3qUE_r">
-            <ref role="3uigEE" node="6Kcfpq7AYBh" resolve="Queryable" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="2tcGHBEqJZo" role="3clF46">
-        <property role="TrG5h" value="predicateSymbol" />
-        <node concept="3uibUv" id="2tcGHBEqJZn" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6Kcfpq7BSVl" role="jymVt" />
-    <node concept="3clFb_" id="2tcGHBEehCv" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="registerSymbol" />
-      <property role="od$2w" value="false" />
-      <property role="DiZV1" value="false" />
-      <property role="2aFKle" value="false" />
-      <node concept="3clFbS" id="2tcGHBEehCy" role="3clF47" />
-      <node concept="3Tmbuc" id="2tcGHBEeh8H" role="1B3o_S" />
-      <node concept="3cqZAl" id="2tcGHBEehCt" role="3clF45" />
-      <node concept="37vLTG" id="2tcGHBEeico" role="3clF46">
-        <property role="TrG5h" value="predicateSymbol" />
-        <node concept="3uibUv" id="2tcGHBEeicn" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2tcGHBEivC2" role="3clF46">
-        <property role="TrG5h" value="computingTracer" />
-        <node concept="3uibUv" id="2tcGHBEivRX" role="1tU5fm">
-          <ref role="3uigEE" node="24Vro6cQnrj" resolve="EvaluationTrace" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2tcGHBEeg_v" role="jymVt" />
-    <node concept="3clFb_" id="6Kcfpq7B2LV" role="jymVt">
-      <property role="TrG5h" value="registerSolver" />
-      <node concept="3cqZAl" id="6Kcfpq7B2LW" role="3clF45" />
-      <node concept="3Tmbuc" id="2tcGHBEe5yG" role="1B3o_S" />
-      <node concept="3clFbS" id="6Kcfpq7B2LY" role="3clF47">
-        <node concept="3clFbF" id="6Kcfpq7BcIe" role="3cqZAp">
-          <node concept="2OqwBi" id="6Kcfpq7BcN$" role="3clFbG">
-            <node concept="37vLTw" id="6Kcfpq7BcId" role="2Oq$k0">
-              <ref role="3cqZAo" node="6Kcfpq7B51L" resolve="solvers" />
-            </node>
-            <node concept="liA8E" id="6Kcfpq7BcWr" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object):java.lang.Object" resolve="put" />
-              <node concept="37vLTw" id="6Kcfpq7Bd4J" role="37wK5m">
-                <ref role="3cqZAo" node="6Kcfpq7B2LZ" resolve="constraint" />
-              </node>
-              <node concept="37vLTw" id="6Kcfpq7Bdi0" role="37wK5m">
-                <ref role="3cqZAo" node="6Kcfpq7B2M1" resolve="solver" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="6Kcfpq7B2LZ" role="3clF46">
-        <property role="TrG5h" value="constraint" />
-        <node concept="3uibUv" id="5uFPQ7C2Fvo" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="6Kcfpq7B2M1" role="3clF46">
-        <property role="TrG5h" value="solver" />
-        <node concept="3uibUv" id="6H279bUODH7" role="1tU5fm">
-          <ref role="3uigEE" node="6H279bUODvp" resolve="Solver" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4xBopTzsrrI" role="jymVt" />
-    <node concept="3clFb_" id="6Kcfpq7B0QC" role="jymVt">
-      <property role="TrG5h" value="handler" />
-      <node concept="3Tm6S6" id="2tcGHBEa2YX" role="1B3o_S" />
-      <node concept="37vLTG" id="6Kcfpq7B0U_" role="3clF46">
-        <property role="TrG5h" value="symbol" />
-        <node concept="3uibUv" id="5uFPQ7Cduzq" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$mzX" resolve="Symbol" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="6Kcfpq7B0SD" role="3clF45">
-        <ref role="3uigEE" node="6Kcfpq7AXVG" resolve="Instructible" />
-      </node>
-      <node concept="3clFbS" id="6Kcfpq7B0QG" role="3clF47">
-        <node concept="3clFbF" id="2tcGHBEe0QC" role="3cqZAp">
-          <node concept="1rXfSq" id="2tcGHBEe0QB" role="3clFbG">
-            <ref role="37wK5l" node="6Kcfpq7B10O" resolve="solver" />
-            <node concept="10QFUN" id="2tcGHBEe0UA" role="37wK5m">
-              <node concept="3uibUv" id="2tcGHBEe0U$" role="10QFUM">
-                <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
-              </node>
-              <node concept="37vLTw" id="2tcGHBEe0U_" role="10QFUP">
-                <ref role="3cqZAo" node="6Kcfpq7B0U_" resolve="symbol" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6Kcfpq7B13i" role="jymVt" />
-    <node concept="3clFb_" id="5jPBdK__lx" role="jymVt">
-      <property role="TrG5h" value="registerSymbols" />
-      <node concept="37vLTG" id="2tcGHBEisqB" role="3clF46">
-        <property role="TrG5h" value="predicateSymbols" />
-        <node concept="8X2XB" id="2tcGHBEisqC" role="1tU5fm">
-          <node concept="3uibUv" id="2tcGHBEisqD" role="8Xvag">
-            <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
-          </node>
-        </node>
-      </node>
-      <node concept="3cqZAl" id="5jPBdK__lz" role="3clF45" />
-      <node concept="3Tm6S6" id="2tcGHBEemsp" role="1B3o_S" />
-      <node concept="3clFbS" id="5jPBdK__l_" role="3clF47">
-        <node concept="1DcWWT" id="5mr7UHchfPx" role="3cqZAp">
-          <node concept="3clFbS" id="5mr7UHchfPz" role="2LFqv$">
-            <node concept="3clFbF" id="5jPBdK_AI8" role="3cqZAp">
-              <node concept="1rXfSq" id="5jPBdK_AI6" role="3clFbG">
-                <ref role="37wK5l" node="2tcGHBEehCv" resolve="registerSymbol" />
-                <node concept="37vLTw" id="5jPBdK_AJz" role="37wK5m">
-                  <ref role="3cqZAo" node="5mr7UHchfP_" resolve="symbol" />
-                </node>
-                <node concept="37vLTw" id="65oL76bXef4" role="37wK5m">
-                  <ref role="3cqZAo" node="65oL76bXcmr" resolve="tracer" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="5mr7UHchfP_" role="1Duv9x">
-            <property role="TrG5h" value="symbol" />
-            <node concept="3uibUv" id="5mr7UHchfPD" role="1tU5fm">
-              <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
-            </node>
-          </node>
-          <node concept="37vLTw" id="2tcGHBEisKZ" role="1DdaDG">
-            <ref role="3cqZAo" node="2tcGHBEisqB" resolve="predicateSymbols" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2tcGHBEeaCY" role="jymVt" />
-    <node concept="3clFb_" id="6Kcfpq7B10O" role="jymVt">
-      <property role="TrG5h" value="solver" />
-      <node concept="3Tm6S6" id="2tcGHBEa3qD" role="1B3o_S" />
-      <node concept="37vLTG" id="6Kcfpq7B10P" role="3clF46">
-        <property role="TrG5h" value="predicateSymbol" />
-        <node concept="3uibUv" id="5uFPQ7C5Y0t" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="6H279bUT_LD" role="3clF45">
-        <ref role="3uigEE" node="6H279bUODvp" resolve="Solver" />
-      </node>
-      <node concept="3clFbS" id="6Kcfpq7B10T" role="3clF47">
-        <node concept="3clFbJ" id="6Kcfpq7BaRr" role="3cqZAp">
-          <node concept="3clFbS" id="6Kcfpq7BaRs" role="3clFbx">
-            <node concept="YS8fn" id="6Kcfpq7BaRt" role="3cqZAp">
-              <node concept="2ShNRf" id="6Kcfpq7BaRu" role="YScLw">
-                <node concept="1pGfFk" id="6Kcfpq7BaRv" role="2ShVmc">
-                  <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
-                  <node concept="3cpWs3" id="6Kcfpq7BaRw" role="37wK5m">
-                    <node concept="37vLTw" id="6Kcfpq7BaRx" role="3uHU7w">
-                      <ref role="3cqZAo" node="6Kcfpq7B10P" resolve="predicateSymbol" />
-                    </node>
-                    <node concept="Xl_RD" id="6Kcfpq7BaRy" role="3uHU7B">
-                      <property role="Xl_RC" value="no handler: " />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3fqX7Q" id="6Kcfpq7BaRz" role="3clFbw">
-            <node concept="2OqwBi" id="6Kcfpq7BaR$" role="3fr31v">
-              <node concept="37vLTw" id="6Kcfpq7Bb2U" role="2Oq$k0">
-                <ref role="3cqZAo" node="6Kcfpq7B51L" resolve="solvers" />
-              </node>
-              <node concept="liA8E" id="6Kcfpq7BaRA" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Map.containsKey(java.lang.Object):boolean" resolve="containsKey" />
-                <node concept="37vLTw" id="6Kcfpq7BaRB" role="37wK5m">
-                  <ref role="3cqZAo" node="6Kcfpq7B10P" resolve="predicateSymbol" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6Kcfpq7BaRC" role="3cqZAp">
-          <node concept="2OqwBi" id="6Kcfpq7BaRD" role="3clFbG">
-            <node concept="37vLTw" id="6Kcfpq7Bb9h" role="2Oq$k0">
-              <ref role="3cqZAo" node="6Kcfpq7B51L" resolve="solvers" />
-            </node>
-            <node concept="liA8E" id="6Kcfpq7BaRF" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object):java.lang.Object" resolve="get" />
-              <node concept="37vLTw" id="6Kcfpq7BaRG" role="37wK5m">
-                <ref role="3cqZAo" node="6Kcfpq7B10P" resolve="predicateSymbol" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6H279bUTIvA" role="jymVt" />
-    <node concept="312cEu" id="6H279bUTJ1f" role="jymVt">
-      <property role="2bfB8j" value="false" />
-      <property role="TrG5h" value="Invocation" />
-      <node concept="2tJIrI" id="6H279bUTJCd" role="jymVt" />
-      <node concept="3clFbW" id="6H279bUTJFv" role="jymVt">
-        <node concept="37vLTG" id="6H279bUTJIC" role="3clF46">
-          <property role="TrG5h" value="predicate" />
-          <node concept="3uibUv" id="6H279bUTJKr" role="1tU5fm">
-            <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="6H279bUTK2z" role="3clF46">
-          <property role="TrG5h" value="args" />
-          <node concept="3uibUv" id="6H279bUTK7y" role="1tU5fm">
-            <ref role="3uigEE" to="33ny:~List" resolve="List" />
-            <node concept="3qTvmN" id="6H279bUTK8P" role="11_B2D" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="6H279bUTJFx" role="3clF45" />
-        <node concept="3Tm1VV" id="6H279bUTJFy" role="1B3o_S" />
-        <node concept="3clFbS" id="6H279bUTJFz" role="3clF47">
-          <node concept="3clFbF" id="6H279bUTJMo" role="3cqZAp">
-            <node concept="37vLTI" id="6H279bUTJMq" role="3clFbG">
-              <node concept="2OqwBi" id="6H279bUTJMu" role="37vLTJ">
-                <node concept="Xjq3P" id="6H279bUTJMx" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6H279bUTJMt" role="2OqNvi">
-                  <ref role="2Oxat5" node="6H279bUTJMk" resolve="predicate" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="6H279bUTJMy" role="37vLTx">
-                <ref role="3cqZAo" node="6H279bUTJIC" resolve="predicate" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="6H279bUTKaY" role="3cqZAp">
-            <node concept="37vLTI" id="6H279bUTKb0" role="3clFbG">
-              <node concept="2OqwBi" id="6H279bUTKb4" role="37vLTJ">
-                <node concept="Xjq3P" id="6H279bUTKb7" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6H279bUTKb3" role="2OqNvi">
-                  <ref role="2Oxat5" node="6H279bUTKaT" resolve="args" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="6H279bUTKb8" role="37vLTx">
-                <ref role="3cqZAo" node="6H279bUTK2z" resolve="args" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="6H279bUTJQm" role="jymVt" />
-      <node concept="3Tm6S6" id="6H279bUTKwT" role="1B3o_S" />
-      <node concept="3uibUv" id="6H279bUTJuN" role="EKbjA">
-        <ref role="3uigEE" node="49L2l3FhtS6" resolve="PredicateInvocation" />
-      </node>
-      <node concept="3clFb_" id="6H279bUTJzv" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="2aFKle" value="false" />
-        <property role="TrG5h" value="predicate" />
-        <node concept="3Tm1VV" id="6H279bUTJzx" role="1B3o_S" />
-        <node concept="3uibUv" id="6H279bUTJzy" role="3clF45">
-          <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
-        </node>
-        <node concept="3clFbS" id="6H279bUTJzz" role="3clF47">
-          <node concept="3clFbF" id="6H279bUTKhV" role="3cqZAp">
-            <node concept="37vLTw" id="6H279bUTKhU" role="3clFbG">
-              <ref role="3cqZAo" node="6H279bUTJMk" resolve="predicate" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="6H279bUTKiN" role="jymVt" />
-      <node concept="3clFb_" id="6H279bUTJzA" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="2aFKle" value="false" />
-        <property role="TrG5h" value="arguments" />
-        <node concept="3Tm1VV" id="6H279bUTJzC" role="1B3o_S" />
-        <node concept="3uibUv" id="6H279bUTJzD" role="3clF45">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3qTvmN" id="6H279bUTJzE" role="11_B2D" />
-        </node>
-        <node concept="3clFbS" id="6H279bUTJzF" role="3clF47">
-          <node concept="3clFbF" id="6H279bUTKuO" role="3cqZAp">
-            <node concept="37vLTw" id="6H279bUTKuN" role="3clFbG">
-              <ref role="3cqZAo" node="6H279bUTKaT" resolve="args" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="6H279bUTKo_" role="jymVt" />
-      <node concept="312cEg" id="6H279bUTJMk" role="jymVt">
-        <property role="TrG5h" value="predicate" />
-        <node concept="3Tm6S6" id="6H279bUTJMl" role="1B3o_S" />
-        <node concept="3uibUv" id="6H279bUTJMn" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
-        </node>
-      </node>
-      <node concept="312cEg" id="6H279bUTKaT" role="jymVt">
-        <property role="TrG5h" value="args" />
-        <node concept="3Tm6S6" id="6H279bUTKaU" role="1B3o_S" />
-        <node concept="3uibUv" id="6H279bUTKaW" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3qTvmN" id="6H279bUTKaX" role="11_B2D" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6Kcfpq7B2xY" role="jymVt" />
-    <node concept="312cEg" id="6Kcfpq7B51L" role="jymVt">
-      <property role="TrG5h" value="solvers" />
-      <node concept="3Tm6S6" id="6Kcfpq7B51M" role="1B3o_S" />
-      <node concept="3uibUv" id="6Kcfpq7B51N" role="1tU5fm">
-        <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-        <node concept="3uibUv" id="5uFPQ7C2EKI" role="11_B2D">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
-        </node>
-        <node concept="3uibUv" id="6H279bUODKE" role="11_B2D">
-          <ref role="3uigEE" node="6H279bUODvp" resolve="Solver" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="6Kcfpq7B51Q" role="33vP2m">
-        <node concept="1pGfFk" id="6Kcfpq7B51R" role="2ShVmc">
-          <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
-          <node concept="3uibUv" id="5uFPQ7C2F2J" role="1pMfVU">
-            <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
-          </node>
-          <node concept="3uibUv" id="6H279bUODW1" role="1pMfVU">
-            <ref role="3uigEE" node="6H279bUODvp" resolve="Solver" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="312cEg" id="65oL76bXcmr" role="jymVt">
-      <property role="34CwA1" value="false" />
-      <property role="eg7rD" value="false" />
-      <property role="TrG5h" value="tracer" />
-      <property role="3TUv4t" value="false" />
-      <node concept="3Tm6S6" id="65oL76bXbYK" role="1B3o_S" />
-      <node concept="3uibUv" id="65oL76bXcI6" role="1tU5fm">
-        <ref role="3uigEE" node="24Vro6cQnrj" resolve="EvaluationTrace" />
-      </node>
-      <node concept="10M0yZ" id="4ut_d$0E9$D" role="33vP2m">
-        <ref role="1PxDUh" node="24Vro6cQnrj" resolve="EvaluationTrace" />
-        <ref role="3cqZAo" node="4ut_d$0E9Px" resolve="NULL" />
-      </node>
-    </node>
-    <node concept="3Tm1VV" id="6Kcfpq7B0b1" role="1B3o_S" />
-    <node concept="3UR2Jj" id="6Kcfpq7CBOa" role="lGtFl">
-      <node concept="TZ5HA" id="6Kcfpq7CBOb" role="TZ5H$">
-        <node concept="1dT_AC" id="6Kcfpq7CBOc" role="1dT_Ay">
-          <property role="1dT_AB" value="Is used to provide an interface for handlers and solvers working together in a single session." />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3HP615" id="24Vro6cQnrj">
-    <property role="2bfB8j" value="true" />
-    <property role="TrG5h" value="EvaluationTrace" />
-    <node concept="2tJIrI" id="24Vro6cQoAz" role="jymVt" />
-    <node concept="3clFb_" id="1n2ZgJ3LbVz" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="activate" />
-      <node concept="37vLTG" id="1n2ZgJ3Lc9F" role="3clF46">
-        <property role="TrG5h" value="occurrence" />
-        <node concept="3uibUv" id="1n2ZgJ3LcdO" role="1tU5fm">
-          <ref role="3uigEE" node="5uFPQ7BZac$" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="1n2ZgJ3LbV_" role="3clF45" />
-      <node concept="3Tm1VV" id="1n2ZgJ3LbVA" role="1B3o_S" />
-      <node concept="3clFbS" id="1n2ZgJ3LbVB" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="1n2ZgJ3LbS8" role="jymVt" />
-    <node concept="3clFb_" id="1n2ZgJ3LchZ" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="reactivate" />
-      <node concept="37vLTG" id="1n2ZgJ3Lci0" role="3clF46">
-        <property role="TrG5h" value="occurrence" />
-        <node concept="3uibUv" id="1n2ZgJ3Lci1" role="1tU5fm">
-          <ref role="3uigEE" node="5uFPQ7BZac$" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="1n2ZgJ3Lci2" role="3clF45" />
-      <node concept="3Tm1VV" id="1n2ZgJ3Lci3" role="1B3o_S" />
-      <node concept="3clFbS" id="1n2ZgJ3Lci4" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="1n2ZgJ3LchY" role="jymVt" />
-    <node concept="3clFb_" id="1n2ZgJ3Lcwj" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="suspend" />
-      <node concept="37vLTG" id="1n2ZgJ3Lcwk" role="3clF46">
-        <property role="TrG5h" value="occurrence" />
-        <node concept="3uibUv" id="1n2ZgJ3Lcwl" role="1tU5fm">
-          <ref role="3uigEE" node="5uFPQ7BZac$" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="1n2ZgJ3Lcwm" role="3clF45" />
-      <node concept="3Tm1VV" id="1n2ZgJ3Lcwn" role="1B3o_S" />
-      <node concept="3clFbS" id="1n2ZgJ3Lcwo" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="1n2ZgJ3Lcwi" role="jymVt" />
-    <node concept="3clFb_" id="1n2ZgJ3LcII" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="discard" />
-      <node concept="37vLTG" id="1n2ZgJ3LcIJ" role="3clF46">
-        <property role="TrG5h" value="occurrence" />
-        <node concept="3uibUv" id="1n2ZgJ3LcIK" role="1tU5fm">
-          <ref role="3uigEE" node="5uFPQ7BZac$" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="1n2ZgJ3LcIL" role="3clF45" />
-      <node concept="3Tm1VV" id="1n2ZgJ3LcIM" role="1B3o_S" />
-      <node concept="3clFbS" id="1n2ZgJ3LcIN" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="1n2ZgJ3MfKC" role="jymVt" />
-    <node concept="3clFb_" id="1n2ZgJ3Mgj2" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="trying" />
-      <node concept="37vLTG" id="63ioh_TX0PH" role="3clF46">
-        <property role="TrG5h" value="matchRule" />
-        <node concept="3uibUv" id="63ioh_TX0PE" role="1tU5fm">
-          <ref role="3uigEE" node="63ioh_TWUlF" resolve="MatchRule" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="1n2ZgJ3Mgj4" role="3clF45" />
-      <node concept="3Tm1VV" id="1n2ZgJ3Mgj5" role="1B3o_S" />
-      <node concept="3clFbS" id="1n2ZgJ3Mgj6" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="2T1p0CFMGK3" role="jymVt" />
-    <node concept="3clFb_" id="2T1p0CFMG_4" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="reject" />
-      <node concept="37vLTG" id="2T1p0CFMG_5" role="3clF46">
-        <property role="TrG5h" value="matchRule" />
-        <node concept="3uibUv" id="2T1p0CFMG_6" role="1tU5fm">
-          <ref role="3uigEE" node="63ioh_TWUlF" resolve="MatchRule" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="2T1p0CFMG_7" role="3clF45" />
-      <node concept="3Tm1VV" id="2T1p0CFMG_8" role="1B3o_S" />
-      <node concept="3clFbS" id="2T1p0CFMG_9" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="2UGjFq488dU" role="jymVt" />
-    <node concept="3clFb_" id="2UGjFq4881h" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="trigger" />
-      <node concept="37vLTG" id="2UGjFq4881i" role="3clF46">
-        <property role="TrG5h" value="matchRule" />
-        <node concept="3uibUv" id="2UGjFq4881j" role="1tU5fm">
-          <ref role="3uigEE" node="63ioh_TWUlF" resolve="MatchRule" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="2UGjFq4881k" role="3clF45" />
-      <node concept="3Tm1VV" id="2UGjFq4881l" role="1B3o_S" />
-      <node concept="3clFbS" id="2UGjFq4881m" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="1n2ZgJ3Mib0" role="jymVt" />
-    <node concept="3clFb_" id="2_NfR5wgXZH" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="retry" />
-      <node concept="37vLTG" id="2_NfR5wgYUF" role="3clF46">
-        <property role="TrG5h" value="matchRule" />
-        <node concept="3uibUv" id="2_NfR5wh2rz" role="1tU5fm">
-          <ref role="3uigEE" node="63ioh_TWUlF" resolve="MatchRule" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="2_NfR5wgXZK" role="3clF45" />
-      <node concept="3Tm1VV" id="2_NfR5wgXZL" role="1B3o_S" />
-      <node concept="3clFbS" id="2_NfR5wgXZM" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="2_NfR5wh3WN" role="jymVt" />
-    <node concept="3clFb_" id="2UGjFq489cz" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="finish" />
-      <node concept="37vLTG" id="2UGjFq48eK9" role="3clF46">
-        <property role="TrG5h" value="matchRule" />
-        <node concept="3uibUv" id="2UGjFq48eKa" role="1tU5fm">
-          <ref role="3uigEE" node="63ioh_TWUlF" resolve="MatchRule" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="2UGjFq489c_" role="3clF45" />
-      <node concept="3Tm1VV" id="2UGjFq489cA" role="1B3o_S" />
-      <node concept="3clFbS" id="2UGjFq489cB" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="2UGjFq489pm" role="jymVt" />
-    <node concept="3clFb_" id="2UGjFq48i6t" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="tell" />
-      <node concept="37vLTG" id="2UGjFq48itQ" role="3clF46">
-        <property role="TrG5h" value="invocation" />
-        <node concept="3uibUv" id="2UGjFq48iBN" role="1tU5fm">
-          <ref role="3uigEE" node="49L2l3FhtS6" resolve="PredicateInvocation" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="2UGjFq48i6v" role="3clF45" />
-      <node concept="3Tm1VV" id="2UGjFq48i6w" role="1B3o_S" />
-      <node concept="3clFbS" id="2UGjFq48i6x" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="2UGjFq48iZt" role="jymVt" />
-    <node concept="3clFb_" id="2UGjFq48iLL" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="ask" />
-      <node concept="37vLTG" id="2UGjFq48jd3" role="3clF46">
-        <property role="TrG5h" value="result" />
-        <node concept="10P_77" id="2UGjFq48jnT" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="2UGjFq48iLM" role="3clF46">
-        <property role="TrG5h" value="invocation" />
-        <node concept="3uibUv" id="2UGjFq48iLN" role="1tU5fm">
-          <ref role="3uigEE" node="49L2l3FhtS6" resolve="PredicateInvocation" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="2UGjFq48iLO" role="3clF45" />
-      <node concept="3Tm1VV" id="2UGjFq48iLP" role="1B3o_S" />
-      <node concept="3clFbS" id="2UGjFq48iLQ" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="2_NfR5wgXWI" role="jymVt" />
-    <node concept="3clFb_" id="7vxJ_H4th$o" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="failure" />
-      <node concept="37vLTG" id="7vxJ_H4th$p" role="3clF46">
-        <property role="TrG5h" value="fail" />
-        <node concept="3uibUv" id="7vxJ_H4tn9n" role="1tU5fm">
-          <ref role="3uigEE" node="7vxJ_H4qn42" resolve="EvaluationFailureException" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="7vxJ_H4th$r" role="3clF45" />
-      <node concept="3Tm1VV" id="7vxJ_H4th$s" role="1B3o_S" />
-      <node concept="3clFbS" id="7vxJ_H4th$t" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="7vxJ_H4tlg_" role="jymVt" />
-    <node concept="3clFb_" id="7feMCq_cIni" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="reportFailure" />
-      <node concept="37vLTG" id="7feMCq_cIqW" role="3clF46">
-        <property role="TrG5h" value="message" />
-        <node concept="17QB3L" id="7feMCq_cIs6" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="7feMCq_cInl" role="3clF45" />
-      <node concept="3Tm1VV" id="7feMCq_cInm" role="1B3o_S" />
-      <node concept="3clFbS" id="7feMCq_cInn" role="3clF47" />
-      <node concept="2AHcQZ" id="7vxJ_H4tqK5" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7feMCq_cIlr" role="jymVt" />
-    <node concept="Wx3nA" id="4ut_d$0E9Px" role="jymVt">
-      <property role="3TUv4t" value="true" />
-      <property role="TrG5h" value="NULL" />
-      <node concept="3Tm1VV" id="4ut_d$0E9Pz" role="1B3o_S" />
-      <node concept="2ShNRf" id="4ut_d$0E9Tm" role="33vP2m">
-        <node concept="YeOm9" id="4ut_d$0EaY6" role="2ShVmc">
-          <node concept="1Y3b0j" id="4ut_d$0EaY9" role="YeSDq">
-            <property role="2bfB8j" value="true" />
-            <ref role="1Y3XeK" node="24Vro6cQnrj" resolve="EvaluationTrace" />
-            <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-            <node concept="3Tm1VV" id="4ut_d$0EaYa" role="1B3o_S" />
-            <node concept="2tJIrI" id="1n2ZgJ3Ldh5" role="jymVt" />
-            <node concept="3clFb_" id="1n2ZgJ3Ldiu" role="jymVt">
-              <property role="1EzhhJ" value="false" />
-              <property role="TrG5h" value="activate" />
-              <node concept="37vLTG" id="1n2ZgJ3Ldiv" role="3clF46">
-                <property role="TrG5h" value="occurrence" />
-                <node concept="3uibUv" id="1n2ZgJ3Ldiw" role="1tU5fm">
-                  <ref role="3uigEE" node="5uFPQ7BZac$" resolve="ConstraintOccurrence" />
-                </node>
-              </node>
-              <node concept="3cqZAl" id="1n2ZgJ3Ldix" role="3clF45" />
-              <node concept="3Tm1VV" id="1n2ZgJ3Ldiy" role="1B3o_S" />
-              <node concept="3clFbS" id="1n2ZgJ3Ldi_" role="3clF47" />
-            </node>
-            <node concept="3clFb_" id="1n2ZgJ3LdiA" role="jymVt">
-              <property role="1EzhhJ" value="false" />
-              <property role="TrG5h" value="reactivate" />
-              <node concept="37vLTG" id="1n2ZgJ3LdiB" role="3clF46">
-                <property role="TrG5h" value="occurrence" />
-                <node concept="3uibUv" id="1n2ZgJ3LdiC" role="1tU5fm">
-                  <ref role="3uigEE" node="5uFPQ7BZac$" resolve="ConstraintOccurrence" />
-                </node>
-              </node>
-              <node concept="3cqZAl" id="1n2ZgJ3LdiD" role="3clF45" />
-              <node concept="3Tm1VV" id="1n2ZgJ3LdiE" role="1B3o_S" />
-              <node concept="3clFbS" id="1n2ZgJ3LdiH" role="3clF47" />
-            </node>
-            <node concept="3clFb_" id="1n2ZgJ3LdiI" role="jymVt">
-              <property role="1EzhhJ" value="false" />
-              <property role="TrG5h" value="suspend" />
-              <node concept="37vLTG" id="1n2ZgJ3LdiJ" role="3clF46">
-                <property role="TrG5h" value="occurrence" />
-                <node concept="3uibUv" id="1n2ZgJ3LdiK" role="1tU5fm">
-                  <ref role="3uigEE" node="5uFPQ7BZac$" resolve="ConstraintOccurrence" />
-                </node>
-              </node>
-              <node concept="3cqZAl" id="1n2ZgJ3LdiL" role="3clF45" />
-              <node concept="3Tm1VV" id="1n2ZgJ3LdiM" role="1B3o_S" />
-              <node concept="3clFbS" id="1n2ZgJ3LdiP" role="3clF47" />
-            </node>
-            <node concept="3clFb_" id="1n2ZgJ3LdiQ" role="jymVt">
-              <property role="1EzhhJ" value="false" />
-              <property role="TrG5h" value="discard" />
-              <node concept="37vLTG" id="1n2ZgJ3LdiR" role="3clF46">
-                <property role="TrG5h" value="occurrence" />
-                <node concept="3uibUv" id="1n2ZgJ3LdiS" role="1tU5fm">
-                  <ref role="3uigEE" node="5uFPQ7BZac$" resolve="ConstraintOccurrence" />
-                </node>
-              </node>
-              <node concept="3cqZAl" id="1n2ZgJ3LdiT" role="3clF45" />
-              <node concept="3Tm1VV" id="1n2ZgJ3LdiU" role="1B3o_S" />
-              <node concept="3clFbS" id="1n2ZgJ3LdiX" role="3clF47" />
-            </node>
-            <node concept="3clFb_" id="2UGjFq48eVz" role="jymVt">
-              <property role="1EzhhJ" value="false" />
-              <property role="TrG5h" value="trying" />
-              <node concept="37vLTG" id="2UGjFq48eV$" role="3clF46">
-                <property role="TrG5h" value="matchRule" />
-                <node concept="3uibUv" id="2UGjFq48eV_" role="1tU5fm">
-                  <ref role="3uigEE" node="63ioh_TWUlF" resolve="MatchRule" />
-                </node>
-              </node>
-              <node concept="3cqZAl" id="2UGjFq48eVA" role="3clF45" />
-              <node concept="3Tm1VV" id="2UGjFq48eVB" role="1B3o_S" />
-              <node concept="3clFbS" id="2UGjFq48eVE" role="3clF47" />
-            </node>
-            <node concept="3clFb_" id="2T1p0CFMNza" role="jymVt">
-              <property role="1EzhhJ" value="false" />
-              <property role="TrG5h" value="reject" />
-              <node concept="37vLTG" id="2T1p0CFMNzb" role="3clF46">
-                <property role="TrG5h" value="matchRule" />
-                <node concept="3uibUv" id="2T1p0CFMNzc" role="1tU5fm">
-                  <ref role="3uigEE" node="63ioh_TWUlF" resolve="MatchRule" />
-                </node>
-              </node>
-              <node concept="3cqZAl" id="2T1p0CFMNzd" role="3clF45" />
-              <node concept="3Tm1VV" id="2T1p0CFMNze" role="1B3o_S" />
-              <node concept="3clFbS" id="2T1p0CFMNzh" role="3clF47" />
-            </node>
-            <node concept="3clFb_" id="1n2ZgJ3MiCW" role="jymVt">
-              <property role="1EzhhJ" value="false" />
-              <property role="TrG5h" value="trigger" />
-              <node concept="37vLTG" id="1n2ZgJ3MiCX" role="3clF46">
-                <property role="TrG5h" value="matchRule" />
-                <node concept="3uibUv" id="63ioh_TX0$q" role="1tU5fm">
-                  <ref role="3uigEE" node="63ioh_TWUlF" resolve="MatchRule" />
-                </node>
-              </node>
-              <node concept="3cqZAl" id="1n2ZgJ3MiCZ" role="3clF45" />
-              <node concept="3Tm1VV" id="1n2ZgJ3MiD0" role="1B3o_S" />
-              <node concept="3clFbS" id="1n2ZgJ3MiD3" role="3clF47" />
-            </node>
-            <node concept="3clFb_" id="2_NfR5whDCT" role="jymVt">
-              <property role="1EzhhJ" value="false" />
-              <property role="TrG5h" value="retry" />
-              <node concept="37vLTG" id="2_NfR5whDCU" role="3clF46">
-                <property role="TrG5h" value="matchRule" />
-                <node concept="3uibUv" id="2_NfR5whDCV" role="1tU5fm">
-                  <ref role="3uigEE" node="63ioh_TWUlF" resolve="MatchRule" />
-                </node>
-              </node>
-              <node concept="3cqZAl" id="2_NfR5whDCW" role="3clF45" />
-              <node concept="3Tm1VV" id="2_NfR5whDCX" role="1B3o_S" />
-              <node concept="3clFbS" id="2_NfR5whDD0" role="3clF47" />
-            </node>
-            <node concept="3clFb_" id="2UGjFq48eVF" role="jymVt">
-              <property role="1EzhhJ" value="false" />
-              <property role="TrG5h" value="finish" />
-              <node concept="37vLTG" id="2UGjFq48eVG" role="3clF46">
-                <property role="TrG5h" value="matchRule" />
-                <node concept="3uibUv" id="2UGjFq48eVH" role="1tU5fm">
-                  <ref role="3uigEE" node="63ioh_TWUlF" resolve="MatchRule" />
-                </node>
-              </node>
-              <node concept="3cqZAl" id="2UGjFq48eVI" role="3clF45" />
-              <node concept="3Tm1VV" id="2UGjFq48eVJ" role="1B3o_S" />
-              <node concept="3clFbS" id="2UGjFq48eVM" role="3clF47" />
-            </node>
-            <node concept="3clFb_" id="2UGjFq48jzt" role="jymVt">
-              <property role="1EzhhJ" value="false" />
-              <property role="TrG5h" value="tell" />
-              <node concept="37vLTG" id="2UGjFq48jzu" role="3clF46">
-                <property role="TrG5h" value="invocation" />
-                <node concept="3uibUv" id="2UGjFq48jzv" role="1tU5fm">
-                  <ref role="3uigEE" node="49L2l3FhtS6" resolve="PredicateInvocation" />
-                </node>
-              </node>
-              <node concept="3cqZAl" id="2UGjFq48jzw" role="3clF45" />
-              <node concept="3Tm1VV" id="2UGjFq48jzx" role="1B3o_S" />
-              <node concept="3clFbS" id="2UGjFq48jz$" role="3clF47" />
-            </node>
-            <node concept="3clFb_" id="2UGjFq48jz_" role="jymVt">
-              <property role="1EzhhJ" value="false" />
-              <property role="TrG5h" value="ask" />
-              <node concept="37vLTG" id="2UGjFq48jzA" role="3clF46">
-                <property role="TrG5h" value="result" />
-                <node concept="10P_77" id="2UGjFq48jzB" role="1tU5fm" />
-              </node>
-              <node concept="37vLTG" id="2UGjFq48jzC" role="3clF46">
-                <property role="TrG5h" value="invocation" />
-                <node concept="3uibUv" id="2UGjFq48jzD" role="1tU5fm">
-                  <ref role="3uigEE" node="49L2l3FhtS6" resolve="PredicateInvocation" />
-                </node>
-              </node>
-              <node concept="3cqZAl" id="2UGjFq48jzE" role="3clF45" />
-              <node concept="3Tm1VV" id="2UGjFq48jzF" role="1B3o_S" />
-              <node concept="3clFbS" id="2UGjFq48jzI" role="3clF47" />
-            </node>
-            <node concept="3clFb_" id="7vxJ_H4tnme" role="jymVt">
-              <property role="1EzhhJ" value="false" />
-              <property role="TrG5h" value="failure" />
-              <node concept="37vLTG" id="7vxJ_H4tnmf" role="3clF46">
-                <property role="TrG5h" value="fail" />
-                <node concept="3uibUv" id="7vxJ_H4tnmg" role="1tU5fm">
-                  <ref role="3uigEE" node="7vxJ_H4qn42" resolve="EvaluationFailureException" />
-                </node>
-              </node>
-              <node concept="3cqZAl" id="7vxJ_H4tnmh" role="3clF45" />
-              <node concept="3Tm1VV" id="7vxJ_H4tnmi" role="1B3o_S" />
-              <node concept="3clFbS" id="7vxJ_H4tnml" role="3clF47" />
-            </node>
-            <node concept="3clFb_" id="4ut_d$0EaYR" role="jymVt">
-              <property role="1EzhhJ" value="false" />
-              <property role="TrG5h" value="reportFailure" />
-              <node concept="37vLTG" id="4ut_d$0EaYS" role="3clF46">
-                <property role="TrG5h" value="message" />
-                <node concept="17QB3L" id="4ut_d$0EaYT" role="1tU5fm" />
-              </node>
-              <node concept="3cqZAl" id="4ut_d$0EaYU" role="3clF45" />
-              <node concept="3Tm1VV" id="4ut_d$0EaYV" role="1B3o_S" />
-              <node concept="3clFbS" id="4ut_d$0EaYX" role="3clF47" />
-            </node>
-            <node concept="2tJIrI" id="2UGjFq489sC" role="jymVt" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="4ut_d$0E9Re" role="1tU5fm">
-        <ref role="3uigEE" node="24Vro6cQnrj" resolve="EvaluationTrace" />
-      </node>
-    </node>
-    <node concept="3Tm1VV" id="24Vro6cQnrk" role="1B3o_S" />
-  </node>
-  <node concept="3HP615" id="5uFPQ7BZac$">
-    <property role="TrG5h" value="ConstraintOccurrence" />
-    <node concept="2tJIrI" id="5uFPQ7BZacM" role="jymVt" />
-    <node concept="3clFb_" id="5uFPQ7BZacZ" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="constraint" />
-      <node concept="3uibUv" id="5uFPQ7BZadj" role="3clF45">
-        <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
-      </node>
-      <node concept="3Tm1VV" id="5uFPQ7BZad2" role="1B3o_S" />
-      <node concept="3clFbS" id="5uFPQ7BZad3" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7BZadz" role="jymVt" />
-    <node concept="3clFb_" id="5uFPQ7BZafw" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="arguments" />
-      <node concept="3clFbS" id="5uFPQ7BZafz" role="3clF47" />
-      <node concept="3Tm1VV" id="5uFPQ7BZaf$" role="1B3o_S" />
-      <node concept="3uibUv" id="7HUwyZaBMTJ" role="3clF45">
-        <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3qTvmN" id="7HUwyZaBMTK" role="11_B2D" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7BZacR" role="jymVt" />
-    <node concept="3Tm1VV" id="5uFPQ7BZac_" role="1B3o_S" />
-  </node>
-  <node concept="312cEu" id="5uFPQ7BvN_d">
-    <property role="TrG5h" value="EvaluationSession" />
-    <property role="1sVAO0" value="true" />
-    <node concept="2tJIrI" id="7ISVfSIt5$" role="jymVt" />
-    <node concept="2YIFZL" id="5uFPQ7Bwt5n" role="jymVt">
-      <property role="TrG5h" value="current" />
-      <node concept="3uibUv" id="5uFPQ7Bwt68" role="3clF45">
-        <ref role="3uigEE" node="5uFPQ7BvN_d" resolve="EvaluationSession" />
-      </node>
-      <node concept="3Tm1VV" id="5uFPQ7Bwt5q" role="1B3o_S" />
-      <node concept="3clFbS" id="5uFPQ7Bwt5r" role="3clF47">
-        <node concept="3clFbJ" id="5uFPQ7BwtPK" role="3cqZAp">
-          <node concept="3clFbS" id="5uFPQ7BwtPL" role="3clFbx">
-            <node concept="YS8fn" id="5uFPQ7BwtSk" role="3cqZAp">
-              <node concept="2ShNRf" id="5uFPQ7BwtSH" role="YScLw">
-                <node concept="1pGfFk" id="5uFPQ7BwtY5" role="2ShVmc">
-                  <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
-                  <node concept="Xl_RD" id="5uFPQ7BwtYC" role="37wK5m">
-                    <property role="Xl_RC" value="no backend" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="5uFPQ7BwtR2" role="3clFbw">
-            <node concept="10Nm6u" id="5uFPQ7BwtRz" role="3uHU7w" />
-            <node concept="37vLTw" id="5uFPQ7BwtQm" role="3uHU7B">
-              <ref role="3cqZAo" node="5uFPQ7BwtFE" resolve="ourBackend" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5uFPQ7Bwu1N" role="3cqZAp">
-          <node concept="2OqwBi" id="5uFPQ7Bwu2C" role="3clFbG">
-            <node concept="37vLTw" id="5uFPQ7Bwu1L" role="2Oq$k0">
-              <ref role="3cqZAo" node="5uFPQ7BwtFE" resolve="ourBackend" />
-            </node>
-            <node concept="liA8E" id="5uFPQ7Bwu3O" role="2OqNvi">
-              <ref role="37wK5l" node="5uFPQ7BwtvO" resolve="current" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7Bwt4d" role="jymVt" />
-    <node concept="2YIFZL" id="7ISVfSIwfH" role="jymVt">
-      <property role="TrG5h" value="newSession" />
-      <node concept="37vLTG" id="6X5F0NgIkLY" role="3clF46">
-        <property role="TrG5h" value="program" />
-        <node concept="3uibUv" id="6X5F0NgIkO$" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="7ISVfSIw_G" role="3clF45">
-        <ref role="3uigEE" node="5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
-      </node>
-      <node concept="3Tm1VV" id="7ISVfSIwfK" role="1B3o_S" />
-      <node concept="3clFbS" id="7ISVfSIwfL" role="3clF47">
-        <node concept="3clFbJ" id="5mr7UHcbuz5" role="3cqZAp">
-          <node concept="3clFbS" id="5mr7UHcbuz6" role="3clFbx">
-            <node concept="YS8fn" id="5mr7UHcbuz7" role="3cqZAp">
-              <node concept="2ShNRf" id="5mr7UHcbuz8" role="YScLw">
-                <node concept="1pGfFk" id="5mr7UHcbuz9" role="2ShVmc">
-                  <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
-                  <node concept="Xl_RD" id="5mr7UHcbuza" role="37wK5m">
-                    <property role="Xl_RC" value="no backend" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="5mr7UHcbuzb" role="3clFbw">
-            <node concept="10Nm6u" id="5mr7UHcbuzc" role="3uHU7w" />
-            <node concept="37vLTw" id="5mr7UHcbuzf" role="3uHU7B">
-              <ref role="3cqZAo" node="5uFPQ7BwtFE" resolve="ourBackend" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5mr7UHcbuzh" role="3cqZAp">
-          <node concept="2OqwBi" id="5mr7UHcbuzi" role="3clFbG">
-            <node concept="37vLTw" id="5mr7UHcbuzm" role="2Oq$k0">
-              <ref role="3cqZAo" node="5uFPQ7BwtFE" resolve="ourBackend" />
-            </node>
-            <node concept="liA8E" id="5mr7UHcbuzj" role="2OqNvi">
-              <ref role="37wK5l" node="5mr7UHcbuF5" resolve="createConfig" />
-              <node concept="37vLTw" id="6X5F0NgIuxk" role="37wK5m">
-                <ref role="3cqZAo" node="6X5F0NgIkLY" resolve="program" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7ISVfSIvYI" role="jymVt" />
-    <node concept="312cEu" id="5uFPQ7Bwt8Z" role="jymVt">
-      <property role="2bfB8j" value="false" />
-      <property role="TrG5h" value="Config" />
-      <property role="1sVAO0" value="true" />
-      <node concept="2tJIrI" id="5uFPQ7BwtaY" role="jymVt" />
-      <node concept="3clFb_" id="5uFPQ7Bwu9Q" role="jymVt">
-        <property role="TrG5h" value="withPredicates" />
-        <property role="1EzhhJ" value="true" />
-        <node concept="37vLTG" id="5uFPQ7BwufO" role="3clF46">
-          <property role="TrG5h" value="predicateSymbols" />
-          <node concept="8X2XB" id="5uFPQ7BwuhP" role="1tU5fm">
-            <node concept="3uibUv" id="5uFPQ7BZb0v" role="8Xvag">
-              <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
-            </node>
-          </node>
-        </node>
-        <node concept="3uibUv" id="5uFPQ7Bwub9" role="3clF45">
-          <ref role="3uigEE" node="5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
-        </node>
-        <node concept="3Tm1VV" id="5uFPQ7Bwu9T" role="1B3o_S" />
-        <node concept="3clFbS" id="5uFPQ7Bwu9U" role="3clF47" />
-      </node>
-      <node concept="2tJIrI" id="5uFPQ7Bwvfj" role="jymVt" />
-      <node concept="3clFb_" id="5uFPQ7Bwvg_" role="jymVt">
-        <property role="TrG5h" value="withTrace" />
-        <property role="1EzhhJ" value="true" />
-        <node concept="37vLTG" id="5mr7UHcbrGT" role="3clF46">
-          <property role="TrG5h" value="computingTracer" />
-          <node concept="3uibUv" id="5mr7UHcbrPY" role="1tU5fm">
-            <ref role="3uigEE" node="24Vro6cQnrj" resolve="EvaluationTrace" />
-          </node>
-        </node>
-        <node concept="3uibUv" id="5uFPQ7Bwvia" role="3clF45">
-          <ref role="3uigEE" node="5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
-        </node>
-        <node concept="3Tm1VV" id="5uFPQ7BwvgC" role="1B3o_S" />
-        <node concept="3clFbS" id="5uFPQ7BwvgD" role="3clF47" />
-      </node>
-      <node concept="2tJIrI" id="5mr7UHcbcbV" role="jymVt" />
-      <node concept="3clFb_" id="5mr7UHcbbR2" role="jymVt">
-        <property role="TrG5h" value="withParam" />
-        <property role="1EzhhJ" value="true" />
-        <node concept="37vLTG" id="5mr7UHcbcpj" role="3clF46">
-          <property role="TrG5h" value="key" />
-          <node concept="17QB3L" id="5mr7UHcbcs$" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="5mr7UHcbctA" role="3clF46">
-          <property role="TrG5h" value="param" />
-          <node concept="3uibUv" id="5mr7UHcbcxl" role="1tU5fm">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-        <node concept="3uibUv" id="5mr7UHcbjuP" role="3clF45">
-          <ref role="3uigEE" node="5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
-        </node>
-        <node concept="3Tm1VV" id="5mr7UHcbbR5" role="1B3o_S" />
-        <node concept="3clFbS" id="5mr7UHcbbR6" role="3clF47" />
-      </node>
-      <node concept="2tJIrI" id="2UGjFq4L15w" role="jymVt" />
-      <node concept="3clFb_" id="2UGjFq4L12E" role="jymVt">
-        <property role="TrG5h" value="start" />
-        <property role="1EzhhJ" value="true" />
-        <node concept="37vLTG" id="2UGjFq4L16p" role="3clF46">
-          <property role="TrG5h" value="sessionSolver" />
-          <node concept="3uibUv" id="2UGjFq4L18l" role="1tU5fm">
-            <ref role="3uigEE" node="6Kcfpq7B0b0" resolve="SessionSolver" />
-          </node>
-        </node>
-        <node concept="3uibUv" id="2UGjFq4L12F" role="3clF45">
-          <ref role="3uigEE" node="5uFPQ7BvN_d" resolve="EvaluationSession" />
-        </node>
-        <node concept="3Tm1VV" id="2UGjFq4L12G" role="1B3o_S" />
-        <node concept="3clFbS" id="2UGjFq4L12H" role="3clF47" />
-      </node>
-      <node concept="3Tm1VV" id="5uFPQ7Bwt90" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="7ISVfSIWE1" role="jymVt" />
-    <node concept="3clFb_" id="5uFPQ7ClOzA" role="jymVt">
-      <property role="TrG5h" value="sessionSolver" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="5uFPQ7ClOB7" role="3clF45">
-        <ref role="3uigEE" node="6Kcfpq7B0b0" resolve="SessionSolver" />
-      </node>
-      <node concept="3Tm1VV" id="5uFPQ7ClOzD" role="1B3o_S" />
-      <node concept="3clFbS" id="5uFPQ7ClOzE" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7ClOwd" role="jymVt" />
-    <node concept="3clFb_" id="5uFPQ7BvQyO" role="jymVt">
-      <property role="TrG5h" value="constraintSymbols" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="5uFPQ7BZbFT" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-        <node concept="3uibUv" id="5uFPQ7BZbHe" role="11_B2D">
-          <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="5uFPQ7BvQyR" role="1B3o_S" />
-      <node concept="3clFbS" id="5uFPQ7BvQyS" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7BvQyt" role="jymVt" />
-    <node concept="3clFb_" id="5uFPQ7BvQxv" role="jymVt">
-      <property role="TrG5h" value="constraintOccurrences" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="5uFPQ7BZbCW" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-        <node concept="3uibUv" id="5uFPQ7BZbEd" role="11_B2D">
-          <ref role="3uigEE" node="5uFPQ7BZac$" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="5uFPQ7BvQxy" role="1B3o_S" />
-      <node concept="3clFbS" id="5uFPQ7BvQxz" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="5mr7UHccvSI" role="jymVt" />
-    <node concept="3clFb_" id="5mr7UHccvdG" role="jymVt">
-      <property role="TrG5h" value="constraintOccurrences" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="37vLTG" id="5mr7UHccvdH" role="3clF46">
-        <property role="TrG5h" value="symbol" />
-        <node concept="3uibUv" id="5mr7UHccvdI" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="5mr7UHccvdJ" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-        <node concept="3uibUv" id="5mr7UHccvdK" role="11_B2D">
-          <ref role="3uigEE" node="5uFPQ7BZac$" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="5mr7UHccvdL" role="1B3o_S" />
-      <node concept="3clFbS" id="5mr7UHccvdM" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7BZbRm" role="jymVt" />
-    <node concept="2YIFZL" id="5uFPQ7Bwt$y" role="jymVt">
-      <property role="TrG5h" value="setBackend" />
-      <node concept="37vLTG" id="5uFPQ7BwtBf" role="3clF46">
-        <property role="TrG5h" value="backend" />
-        <node concept="3uibUv" id="5uFPQ7BwtBM" role="1tU5fm">
-          <ref role="3uigEE" node="5uFPQ7BwtoR" resolve="EvaluationSession.Backend" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="5uFPQ7Bwt$$" role="3clF45" />
-      <node concept="3Tmbuc" id="5uFPQ7BwtAi" role="1B3o_S" />
-      <node concept="3clFbS" id="5uFPQ7Bwt$A" role="3clF47">
-        <node concept="3clFbJ" id="5uFPQ7Bwuvn" role="3cqZAp">
-          <node concept="3clFbS" id="5uFPQ7Bwuvp" role="3clFbx">
-            <node concept="YS8fn" id="5uFPQ7Bwuyw" role="3cqZAp">
-              <node concept="2ShNRf" id="5uFPQ7BwuyT" role="YScLw">
-                <node concept="1pGfFk" id="5uFPQ7BwuCf" role="2ShVmc">
-                  <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
-                  <node concept="Xl_RD" id="5uFPQ7BwuDj" role="37wK5m">
-                    <property role="Xl_RC" value="backend already assigned" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3y3z36" id="5uFPQ7BwuwV" role="3clFbw">
-            <node concept="10Nm6u" id="5uFPQ7Bwuxs" role="3uHU7w" />
-            <node concept="37vLTw" id="5uFPQ7Bwuw7" role="3uHU7B">
-              <ref role="3cqZAo" node="5uFPQ7BwtFE" resolve="ourBackend" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5uFPQ7Bwuqp" role="3cqZAp">
-          <node concept="37vLTI" id="5uFPQ7Bwur6" role="3clFbG">
-            <node concept="37vLTw" id="5uFPQ7BwurY" role="37vLTx">
-              <ref role="3cqZAo" node="5uFPQ7BwtBf" resolve="backend" />
-            </node>
-            <node concept="37vLTw" id="5uFPQ7Bwuqo" role="37vLTJ">
-              <ref role="3cqZAo" node="5uFPQ7BwtFE" resolve="ourBackend" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5jPBdK_J2T" role="jymVt" />
-    <node concept="2YIFZL" id="5jPBdK_JeZ" role="jymVt">
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <property role="TrG5h" value="clearBackend" />
-      <node concept="37vLTG" id="5jPBdK_JrA" role="3clF46">
-        <property role="TrG5h" value="backend" />
-        <node concept="3uibUv" id="5jPBdK_JrB" role="1tU5fm">
-          <ref role="3uigEE" node="5uFPQ7BwtoR" resolve="EvaluationSession.Backend" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="5jPBdK_J94" role="3clF47">
-        <node concept="3clFbJ" id="5jPBdK_JtX" role="3cqZAp">
-          <node concept="3clFbS" id="5jPBdK_JtY" role="3clFbx">
-            <node concept="YS8fn" id="5jPBdK_JtZ" role="3cqZAp">
-              <node concept="2ShNRf" id="5jPBdK_Ju0" role="YScLw">
-                <node concept="1pGfFk" id="5jPBdK_Ju1" role="2ShVmc">
-                  <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
-                  <node concept="Xl_RD" id="5jPBdK_Ju2" role="37wK5m">
-                    <property role="Xl_RC" value="illegal access" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3y3z36" id="5jPBdK_Ju3" role="3clFbw">
-            <node concept="37vLTw" id="5jPBdK_Jws" role="3uHU7w">
-              <ref role="3cqZAo" node="5jPBdK_JrA" resolve="backend" />
-            </node>
-            <node concept="37vLTw" id="5jPBdK_Ju7" role="3uHU7B">
-              <ref role="3cqZAo" node="5uFPQ7BwtFE" resolve="ourBackend" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5jPBdK_Ju9" role="3cqZAp">
-          <node concept="37vLTI" id="5jPBdK_Jua" role="3clFbG">
-            <node concept="10Nm6u" id="5jPBdK_JxG" role="37vLTx" />
-            <node concept="37vLTw" id="5jPBdK_Jue" role="37vLTJ">
-              <ref role="3cqZAo" node="5uFPQ7BwtFE" resolve="ourBackend" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3cqZAl" id="5jPBdK_J92" role="3clF45" />
-      <node concept="3Tmbuc" id="5jPBdK_Je4" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7BwtL0" role="jymVt" />
-    <node concept="3HP615" id="5uFPQ7BwtoR" role="jymVt">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Backend" />
-      <node concept="2tJIrI" id="5uFPQ7Bwtqx" role="jymVt" />
-      <node concept="3clFb_" id="5uFPQ7BwtvO" role="jymVt">
-        <property role="1EzhhJ" value="true" />
-        <property role="TrG5h" value="current" />
-        <node concept="3uibUv" id="5uFPQ7BwtwM" role="3clF45">
-          <ref role="3uigEE" node="5uFPQ7BvN_d" resolve="EvaluationSession" />
-        </node>
-        <node concept="3Tm1VV" id="5uFPQ7BwtvR" role="1B3o_S" />
-        <node concept="3clFbS" id="5uFPQ7BwtvS" role="3clF47" />
-      </node>
-      <node concept="2tJIrI" id="5uFPQ7Bwtvq" role="jymVt" />
-      <node concept="3clFb_" id="5mr7UHcbuF5" role="jymVt">
-        <property role="1EzhhJ" value="true" />
-        <property role="TrG5h" value="createConfig" />
-        <node concept="37vLTG" id="6X5F0NgIqn1" role="3clF46">
-          <property role="TrG5h" value="program" />
-          <node concept="3uibUv" id="6X5F0NgIqpx" role="1tU5fm">
-            <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
-          </node>
-        </node>
-        <node concept="3uibUv" id="5mr7UHcbuIP" role="3clF45">
-          <ref role="3uigEE" node="5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
-        </node>
-        <node concept="3Tm1VV" id="5mr7UHcbuF8" role="1B3o_S" />
-        <node concept="3clFbS" id="5mr7UHcbuF9" role="3clF47" />
-      </node>
-      <node concept="2tJIrI" id="5mr7UHcbuCs" role="jymVt" />
-      <node concept="3Tmbuc" id="5uFPQ7Bwtsc" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7BvQ$M" role="jymVt" />
-    <node concept="Wx3nA" id="5uFPQ7BwtFE" role="jymVt">
-      <property role="TrG5h" value="ourBackend" />
-      <node concept="3Tm6S6" id="5uFPQ7BwtFG" role="1B3o_S" />
-      <node concept="3uibUv" id="5uFPQ7BwtMM" role="1tU5fm">
-        <ref role="3uigEE" node="5uFPQ7BwtoR" resolve="EvaluationSession.Backend" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7BvNR8" role="jymVt" />
-    <node concept="3Tm1VV" id="5uFPQ7BvN_e" role="1B3o_S" />
-    <node concept="3UR2Jj" id="5uFPQ7BvQLO" role="lGtFl">
-      <node concept="TZ5HA" id="5uFPQ7BvQLP" role="TZ5H$">
-        <node concept="1dT_AC" id="5uFPQ7BvQLQ" role="1dT_Ay">
-          <property role="1dT_AB" value="AKA &quot;Handler&quot;" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3HP615" id="49L2l3FhtS6">
-    <property role="TrG5h" value="PredicateInvocation" />
-    <node concept="2tJIrI" id="49L2l3FhtSo" role="jymVt" />
-    <node concept="3clFb_" id="49L2l3FhtSL" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="predicate" />
-      <node concept="3clFbS" id="49L2l3FhtSO" role="3clF47" />
-      <node concept="3Tm1VV" id="49L2l3FhtSP" role="1B3o_S" />
-      <node concept="3uibUv" id="49L2l3FhtS_" role="3clF45">
-        <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="49L2l3FhtT5" role="jymVt" />
-    <node concept="3clFb_" id="49L2l3FhtTG" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="arguments" />
-      <node concept="3clFbS" id="49L2l3FhtTH" role="3clF47" />
-      <node concept="3Tm1VV" id="49L2l3FhtTI" role="1B3o_S" />
-      <node concept="3uibUv" id="49L2l3FhtTJ" role="3clF45">
-        <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3qTvmN" id="49L2l3FhtTK" role="11_B2D" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="49L2l3FhtSt" role="jymVt" />
-    <node concept="3Tm1VV" id="49L2l3FhtS7" role="1B3o_S" />
-  </node>
-  <node concept="3HP615" id="63ioh_TWUlF">
-    <property role="TrG5h" value="MatchRule" />
-    <node concept="2tJIrI" id="63ioh_TWUlT" role="jymVt" />
-    <node concept="3clFb_" id="63ioh_TWUmb" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="rule" />
-      <node concept="3uibUv" id="63ioh_TWUmw" role="3clF45">
-        <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
-      </node>
-      <node concept="3Tm1VV" id="63ioh_TWUme" role="1B3o_S" />
-      <node concept="3clFbS" id="63ioh_TWUmf" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="63ioh_TWUlY" role="jymVt" />
-    <node concept="3clFb_" id="63ioh_TWUn6" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="matchHeadKept" />
-      <node concept="3uibUv" id="63ioh_TWUpd" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-        <node concept="3uibUv" id="63ioh_TWUpj" role="11_B2D">
-          <ref role="3uigEE" node="5uFPQ7BZac$" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="63ioh_TWUn9" role="1B3o_S" />
-      <node concept="3clFbS" id="63ioh_TWUna" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="63ioh_TWUvz" role="jymVt" />
-    <node concept="3clFb_" id="63ioh_TWUu6" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="matchHeadReplaced" />
-      <node concept="3uibUv" id="63ioh_TWUu7" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-        <node concept="3uibUv" id="63ioh_TWUu8" role="11_B2D">
-          <ref role="3uigEE" node="5uFPQ7BZac$" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="63ioh_TWUu9" role="1B3o_S" />
-      <node concept="3clFbS" id="63ioh_TWUua" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="63ioh_TWUm2" role="jymVt" />
-    <node concept="3Tm1VV" id="63ioh_TWUlG" role="1B3o_S" />
-  </node>
-  <node concept="3HP615" id="6H279bUODvp">
-    <property role="TrG5h" value="Solver" />
-    <node concept="3Tm1VV" id="6H279bUODvq" role="1B3o_S" />
-    <node concept="3uibUv" id="6H279bUODvG" role="3HQHJm">
-      <ref role="3uigEE" node="6Kcfpq7AYBh" resolve="Queryable" />
-    </node>
-    <node concept="3uibUv" id="6H279bUODvT" role="3HQHJm">
-      <ref role="3uigEE" to="rchb:2UGjFq4fSyv" resolve="PredicateFactory" />
-    </node>
-  </node>
-  <node concept="312cEu" id="7vxJ_H4qn42">
-    <property role="TrG5h" value="EvaluationFailureException" />
-    <node concept="2tJIrI" id="7vxJ_H4qqkR" role="jymVt" />
-    <node concept="3clFbW" id="7vxJ_H4qql2" role="jymVt">
-      <node concept="37vLTG" id="7vxJ_H4qqle" role="3clF46">
-        <property role="TrG5h" value="message" />
-        <node concept="17QB3L" id="7vxJ_H4qqlj" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="7vxJ_H4qql4" role="3clF45" />
-      <node concept="3Tm1VV" id="7vxJ_H4qql5" role="1B3o_S" />
-      <node concept="3clFbS" id="7vxJ_H4qql6" role="3clF47">
-        <node concept="XkiVB" id="7vxJ_H4qqlI" role="3cqZAp">
-          <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
-          <node concept="37vLTw" id="7vxJ_H4qqlY" role="37wK5m">
-            <ref role="3cqZAo" node="7vxJ_H4qqle" resolve="message" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7vxJ_H4qqkW" role="jymVt" />
-    <node concept="3clFbW" id="7vxJ_H4qqnq" role="jymVt">
-      <node concept="3cqZAl" id="7vxJ_H4qqns" role="3clF45" />
-      <node concept="3Tm1VV" id="7vxJ_H4qqnt" role="1B3o_S" />
-      <node concept="3clFbS" id="7vxJ_H4qqnu" role="3clF47">
-        <node concept="XkiVB" id="7vxJ_H4qqom" role="3cqZAp">
-          <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.Throwable)" resolve="RuntimeException" />
-          <node concept="37vLTw" id="7vxJ_H4qqoA" role="37wK5m">
-            <ref role="3cqZAo" node="7vxJ_H4qqnW" resolve="cause" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="7vxJ_H4qqnW" role="3clF46">
-        <property role="TrG5h" value="cause" />
-        <node concept="3uibUv" id="7vxJ_H4qqnV" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7vxJ_H4qqn1" role="jymVt" />
-    <node concept="3Tm1VV" id="7vxJ_H4qn43" role="1B3o_S" />
-    <node concept="3uibUv" id="7vxJ_H4qqka" role="1zkMxy">
-      <ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
-    </node>
-  </node>
-</model>
-
diff --git a/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/logical.mps b/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/logical.mps
deleted file mode 100644
index 18fdd347..00000000
--- a/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/logical.mps
+++ /dev/null
@@ -1,1138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)">
-  <persistence version="9" />
-  <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-  </languages>
-  <imports>
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
-  </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
-        <child id="1068498886297" name="rValue" index="37vLTx" />
-        <child id="1068498886295" name="lValue" index="37vLTJ" />
-      </concept>
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
-      <concept id="1239714755177" name="jetbrains.mps.baseLanguage.structure.AbstractUnaryNumberOperation" flags="nn" index="2$Kvd9">
-        <child id="1239714902950" name="expression" index="2$L3a6" />
-      </concept>
-      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
-        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
-      </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
-        <child id="1188208488637" name="annotation" index="2AJF6D" />
-      </concept>
-      <concept id="1224848483129" name="jetbrains.mps.baseLanguage.structure.IBLDeprecatable" flags="ng" index="IEa8$">
-        <property id="1224848525476" name="isDeprecated" index="IEkAT" />
-      </concept>
-      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
-        <child id="1154032183016" name="body" index="2LFqv$" />
-      </concept>
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1197029447546" name="jetbrains.mps.baseLanguage.structure.FieldReferenceOperation" flags="nn" index="2OwXpG">
-        <reference id="1197029500499" name="fieldDeclaration" index="2Oxat5" />
-      </concept>
-      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
-        <child id="1145553007750" name="creator" index="2ShVmc" />
-      </concept>
-      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
-      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
-      <concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
-      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
-        <property id="1070475926801" name="value" index="Xl_RC" />
-      </concept>
-      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
-        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
-      </concept>
-      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
-        <reference id="1144433057691" name="classifier" index="1PxDUh" />
-      </concept>
-      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
-      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1070534760951" name="jetbrains.mps.baseLanguage.structure.ArrayType" flags="in" index="10Q1$e">
-        <child id="1070534760952" name="componentType" index="10Q1$1" />
-      </concept>
-      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg">
-        <property id="8606350594693632173" name="isTransient" index="eg7rD" />
-        <property id="1240249534625" name="isVolatile" index="34CwA1" />
-      </concept>
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
-        <child id="1165602531693" name="superclass" index="1zkMxy" />
-      </concept>
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <property id="1176718929932" name="isFinal" index="3TUv4t" />
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
-      <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ">
-        <child id="1214996921760" name="bound" index="3ztrMU" />
-      </concept>
-      <concept id="1109279851642" name="jetbrains.mps.baseLanguage.structure.GenericDeclaration" flags="ng" index="16eOlS">
-        <child id="1109279881614" name="typeVariableDeclaration" index="16eVyc" />
-      </concept>
-      <concept id="1109283449304" name="jetbrains.mps.baseLanguage.structure.TypeVariableReference" flags="in" index="16syzq">
-        <reference id="1109283546497" name="typeVariableDeclaration" index="16sUi3" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
-      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
-      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <property id="4276006055363816570" name="isSynchronized" index="od$2w" />
-        <property id="1181808852946" name="isFinal" index="DiZV1" />
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
-        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
-        <property id="1068580123138" name="value" index="3clFbU" />
-      </concept>
-      <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
-      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
-        <property id="1068580320021" name="value" index="3cmrfH" />
-      </concept>
-      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
-        <child id="1079359253376" name="expression" index="1eOMHV" />
-      </concept>
-      <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
-        <child id="1212687122400" name="typeParameter" index="1pMfVU" />
-      </concept>
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="1171903607971" name="jetbrains.mps.baseLanguage.structure.WildCardType" flags="in" index="3qTvmN" />
-      <concept id="7812454656619025416" name="jetbrains.mps.baseLanguage.structure.MethodDeclaration" flags="ng" index="1rXfSm">
-        <property id="8355037393041754995" name="isNative" index="2aFKle" />
-      </concept>
-      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-        <child id="1109201940907" name="parameter" index="11_B2D" />
-      </concept>
-      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
-        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
-        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
-      </concept>
-      <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
-      <concept id="1184950988562" name="jetbrains.mps.baseLanguage.structure.ArrayCreator" flags="nn" index="3$_iS1">
-        <child id="1184951007469" name="componentType" index="3$_nBY" />
-        <child id="1184952969026" name="dimensionExpression" index="3$GQph" />
-      </concept>
-      <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
-        <child id="1184953288404" name="expression" index="3$I4v7" />
-      </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
-        <child id="1144230900587" name="variable" index="1Duv9x" />
-      </concept>
-      <concept id="1144231330558" name="jetbrains.mps.baseLanguage.structure.ForStatement" flags="nn" index="1Dw8fO">
-        <child id="1144231399730" name="condition" index="1Dwp0S" />
-        <child id="1144231408325" name="iteration" index="1Dwrff" />
-      </concept>
-      <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615">
-        <child id="1107797138135" name="extendedInterface" index="3HQHJm" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
-    </language>
-    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="2546654756694997551" name="jetbrains.mps.baseLanguage.javadoc.structure.LinkInlineDocTag" flags="ng" index="92FcH">
-        <child id="2546654756694997556" name="reference" index="92FcQ" />
-        <child id="3106559687488913694" name="line" index="2XjZqd" />
-      </concept>
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
-      </concept>
-      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="2217234381367049075" name="jetbrains.mps.baseLanguage.javadoc.structure.CodeInlineDocTag" flags="ng" index="VVOAv">
-        <child id="3106559687488741665" name="line" index="2Xj1qM" />
-      </concept>
-      <concept id="2217234381367530212" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocReference" flags="ng" index="VXe08">
-        <reference id="2217234381367530213" name="classifier" index="VXe09" />
-      </concept>
-      <concept id="2217234381367530195" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocReference" flags="ng" index="VXe0Z">
-        <reference id="2217234381367530196" name="methodDeclaration" index="VXe0S" />
-      </concept>
-      <concept id="8970989240999019145" name="jetbrains.mps.baseLanguage.javadoc.structure.InlineTagCommentLinePart" flags="ng" index="1dT_AA">
-        <child id="6962838954693749192" name="tag" index="qph3F" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="3HP615" id="1mP5b6jQP$C">
-    <property role="TrG5h" value="Logical" />
-    <node concept="2tJIrI" id="1mP5b6jQPCY" role="jymVt" />
-    <node concept="3clFb_" id="677NV56hh2k" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="name" />
-      <node concept="17QB3L" id="677NV56hhoN" role="3clF45" />
-      <node concept="3Tm1VV" id="677NV56hh2n" role="1B3o_S" />
-      <node concept="3clFbS" id="677NV56hh2o" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="677NV56hgHJ" role="jymVt" />
-    <node concept="3clFb_" id="dfChU1eNVy" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="findRoot" />
-      <node concept="3uibUv" id="dfChU1eNWP" role="3clF45">
-        <ref role="3uigEE" node="1mP5b6jQP$C" resolve="Logical" />
-        <node concept="16syzq" id="dfChU1eNXI" role="11_B2D">
-          <ref role="16sUi3" node="1mP5b6jQPCW" resolve="T" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="dfChU1eNV_" role="1B3o_S" />
-      <node concept="3clFbS" id="dfChU1eNVA" role="3clF47" />
-      <node concept="P$JXv" id="20WMLipvC0g" role="lGtFl">
-        <node concept="TZ5HA" id="20WMLipvC0h" role="TZ5H$">
-          <node concept="1dT_AC" id="20WMLipvC0i" role="1dT_Ay">
-            <property role="1dT_AB" value="Returns the representative logical instance. " />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="20WMLipCwTD" role="TZ5H$">
-          <node concept="1dT_AC" id="20WMLipCwTE" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="20WMLipCwSk" role="TZ5H$">
-          <node concept="1dT_AC" id="20WMLipw525" role="1dT_Ay">
-            <property role="1dT_AB" value="TODO: rename to 'find()'" />
-          </node>
-          <node concept="1dT_AC" id="20WMLipCwSl" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="dfChU1eNUX" role="jymVt" />
-    <node concept="3clFb_" id="1mP5b6jQPMI" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="value" />
-      <node concept="3clFbS" id="1mP5b6jQPML" role="3clF47" />
-      <node concept="3Tm1VV" id="1mP5b6jQPMM" role="1B3o_S" />
-      <node concept="16syzq" id="1mP5b6jQPMn" role="3clF45">
-        <ref role="16sUi3" node="1mP5b6jQPCW" resolve="T" />
-      </node>
-      <node concept="P$JXv" id="20WMLipvrd$" role="lGtFl">
-        <node concept="TZ5HA" id="20WMLipvrd_" role="TZ5H$">
-          <node concept="1dT_AC" id="20WMLipvrdA" role="1dT_Ay">
-            <property role="1dT_AB" value="Returns the value associated with this logical instance. " />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="20WMLipvtfz" role="TZ5H$">
-          <node concept="1dT_AC" id="20WMLipvtf$" role="1dT_Ay">
-            <property role="1dT_AB" value="Can be null. " />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="20WMLipvtfD" role="TZ5H$">
-          <node concept="1dT_AC" id="20WMLipvtfE" role="1dT_Ay">
-            <property role="1dT_AB" value="Only the logical instance that is a representative can have value that is not null." />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="20WMLipvRYX" role="TZ5H$">
-          <node concept="1dT_AC" id="20WMLipvRYY" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="20WMLipvSos" role="TZ5H$">
-          <node concept="1dT_AC" id="20WMLipvSot" role="1dT_Ay">
-            <property role="1dT_AB" value="FIXME: must return the representative's value" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1mP5b6jQPM2" role="jymVt" />
-    <node concept="3clFb_" id="1mP5b6jQPKP" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="isBound" />
-      <node concept="10P_77" id="1mP5b6jQPLl" role="3clF45" />
-      <node concept="3Tm1VV" id="1mP5b6jQPKS" role="1B3o_S" />
-      <node concept="3clFbS" id="1mP5b6jQPKT" role="3clF47" />
-      <node concept="P$JXv" id="20WMLipv_O2" role="lGtFl">
-        <node concept="TZ5HA" id="20WMLipv_O3" role="TZ5H$">
-          <node concept="1dT_AC" id="20WMLipv_O4" role="1dT_Ay">
-            <property role="1dT_AB" value="True iff the representative has a non-null value." />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7jC45Kci9hZ" role="jymVt" />
-    <node concept="3clFb_" id="2DKqMqOiHjb" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="isWildcard" />
-      <property role="IEkAT" value="false" />
-      <node concept="3clFbS" id="2DKqMqOiHjc" role="3clF47" />
-      <node concept="3Tm1VV" id="2DKqMqOiHjd" role="1B3o_S" />
-      <node concept="10P_77" id="2DKqMqOiHje" role="3clF45" />
-    </node>
-    <node concept="2tJIrI" id="7MlQDeOxBQC" role="jymVt" />
-    <node concept="3clFb_" id="7HUwyZaOd5Y" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="metaLogical" />
-      <node concept="3clFbS" id="7HUwyZaOd61" role="3clF47" />
-      <node concept="3Tm1VV" id="7HUwyZaOd62" role="1B3o_S" />
-      <node concept="3uibUv" id="7HUwyZaOd4F" role="3clF45">
-        <ref role="3uigEE" node="7HUwyZauJhz" resolve="MetaLogical" />
-        <node concept="16syzq" id="20WMLipvHQ$" role="11_B2D">
-          <ref role="16sUi3" node="1mP5b6jQPCW" resolve="T" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7HUwyZaOcXk" role="jymVt" />
-    <node concept="3Tm1VV" id="1mP5b6jQP$D" role="1B3o_S" />
-    <node concept="16euLQ" id="1mP5b6jQPCW" role="16eVyc">
-      <property role="TrG5h" value="T" />
-    </node>
-  </node>
-  <node concept="312cEu" id="7HUwyZauJhz">
-    <property role="TrG5h" value="MetaLogical" />
-    <node concept="2tJIrI" id="7nPD14NXLNF" role="jymVt" />
-    <node concept="Wx3nA" id="7nPD14NON$z" role="jymVt">
-      <property role="3TUv4t" value="true" />
-      <property role="TrG5h" value="WILDCARD" />
-      <node concept="3Tm6S6" id="7nPD14NON$$" role="1B3o_S" />
-      <node concept="17QB3L" id="7nPD14NON$_" role="1tU5fm" />
-      <node concept="Xl_RD" id="7nPD14NON$A" role="33vP2m">
-        <property role="Xl_RC" value="_" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7nPD14NXR2x" role="jymVt" />
-    <node concept="3clFbW" id="7nPD14NON$C" role="jymVt">
-      <node concept="37vLTG" id="7nPD14NON$D" role="3clF46">
-        <property role="TrG5h" value="name" />
-        <node concept="17QB3L" id="7nPD14NON$E" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="7nPD14NON$F" role="3clF46">
-        <property role="TrG5h" value="type" />
-        <node concept="3uibUv" id="7nPD14NON$G" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-          <node concept="16syzq" id="7nPD14NON$H" role="11_B2D">
-            <ref role="16sUi3" node="49L2l3F7I8l" resolve="V" />
-          </node>
-        </node>
-      </node>
-      <node concept="3cqZAl" id="7nPD14NON$I" role="3clF45" />
-      <node concept="3Tm1VV" id="7nPD14NON$J" role="1B3o_S" />
-      <node concept="3clFbS" id="7nPD14NON$K" role="3clF47">
-        <node concept="3clFbF" id="7nPD14NON$L" role="3cqZAp">
-          <node concept="37vLTI" id="7nPD14NON$M" role="3clFbG">
-            <node concept="2OqwBi" id="7nPD14NON$N" role="37vLTJ">
-              <node concept="Xjq3P" id="7nPD14NON$O" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7nPD14NON$P" role="2OqNvi">
-                <ref role="2Oxat5" node="7nPD14NONAl" resolve="name" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="7nPD14NON$Q" role="37vLTx">
-              <ref role="3cqZAo" node="7nPD14NON$D" resolve="name" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7nPD14NON$R" role="3cqZAp">
-          <node concept="37vLTI" id="7nPD14NON$S" role="3clFbG">
-            <node concept="2OqwBi" id="7nPD14NON$T" role="37vLTJ">
-              <node concept="Xjq3P" id="7nPD14NON$U" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7nPD14NON$V" role="2OqNvi">
-                <ref role="2Oxat5" node="7nPD14NONAo" resolve="type" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="7nPD14NON$W" role="37vLTx">
-              <ref role="3cqZAo" node="7nPD14NON$F" resolve="type" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7nPD14NON$X" role="jymVt" />
-    <node concept="3clFbW" id="7nPD14NON$Y" role="jymVt">
-      <node concept="37vLTG" id="7nPD14NON$Z" role="3clF46">
-        <property role="TrG5h" value="type" />
-        <node concept="3uibUv" id="7nPD14NON_0" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-          <node concept="16syzq" id="7nPD14NON_1" role="11_B2D">
-            <ref role="16sUi3" node="49L2l3F7I8l" resolve="V" />
-          </node>
-        </node>
-      </node>
-      <node concept="3cqZAl" id="7nPD14NON_2" role="3clF45" />
-      <node concept="3Tm1VV" id="7nPD14NON_3" role="1B3o_S" />
-      <node concept="3clFbS" id="7nPD14NON_4" role="3clF47">
-        <node concept="3clFbF" id="7nPD14NON_5" role="3cqZAp">
-          <node concept="37vLTI" id="7nPD14NON_6" role="3clFbG">
-            <node concept="2OqwBi" id="7nPD14NON_7" role="37vLTJ">
-              <node concept="Xjq3P" id="7nPD14NON_8" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7nPD14NON_9" role="2OqNvi">
-                <ref role="2Oxat5" node="7nPD14NONAl" resolve="name" />
-              </node>
-            </node>
-            <node concept="3cpWs3" id="7nPD14NON_a" role="37vLTx">
-              <node concept="2YIFZM" id="7nPD14NON_b" role="3uHU7w">
-                <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
-                <ref role="37wK5l" to="wyt6:~System.identityHashCode(java.lang.Object):int" resolve="identityHashCode" />
-                <node concept="Xjq3P" id="7nPD14NON_c" role="37wK5m" />
-              </node>
-              <node concept="10M0yZ" id="7nPD14NXQzg" role="3uHU7B">
-                <ref role="1PxDUh" node="7HUwyZauJhz" resolve="MetaLogical" />
-                <ref role="3cqZAo" node="7nPD14NON$z" resolve="WILDCARD" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7nPD14NON_d" role="3cqZAp">
-          <node concept="37vLTI" id="7nPD14NON_e" role="3clFbG">
-            <node concept="2OqwBi" id="7nPD14NON_f" role="37vLTJ">
-              <node concept="Xjq3P" id="7nPD14NON_g" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7nPD14NON_h" role="2OqNvi">
-                <ref role="2Oxat5" node="7nPD14NONAo" resolve="type" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="7nPD14NON_i" role="37vLTx">
-              <ref role="3cqZAo" node="7nPD14NON$Z" resolve="type" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7nPD14NON_j" role="3cqZAp">
-          <node concept="37vLTI" id="7nPD14NON_k" role="3clFbG">
-            <node concept="3clFbT" id="7nPD14NON_l" role="37vLTx">
-              <property role="3clFbU" value="true" />
-            </node>
-            <node concept="2OqwBi" id="7nPD14NON_m" role="37vLTJ">
-              <node concept="Xjq3P" id="7nPD14NON_n" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7nPD14NON_o" role="2OqNvi">
-                <ref role="2Oxat5" node="7nPD14NONAs" resolve="wildcard" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7HUwyZauJhH" role="jymVt" />
-    <node concept="3clFb_" id="7HUwyZauJkq" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="name" />
-      <node concept="17QB3L" id="7HUwyZauJkr" role="3clF45" />
-      <node concept="3Tm1VV" id="7HUwyZauJks" role="1B3o_S" />
-      <node concept="3clFbS" id="7HUwyZauJkt" role="3clF47">
-        <node concept="3clFbF" id="7nPD14NXMwa" role="3cqZAp">
-          <node concept="37vLTw" id="7nPD14NXMw9" role="3clFbG">
-            <ref role="3cqZAo" node="7nPD14NONAl" resolve="name" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7HUwyZauJku" role="jymVt" />
-    <node concept="3clFb_" id="7HUwyZauJox" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="isWildcard" />
-      <property role="IEkAT" value="false" />
-      <node concept="3clFbS" id="7HUwyZauJoy" role="3clF47">
-        <node concept="3clFbF" id="7nPD14NXM$I" role="3cqZAp">
-          <node concept="37vLTw" id="7nPD14NXM$H" role="3clFbG">
-            <ref role="3cqZAo" node="7nPD14NONAs" resolve="wildcard" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7HUwyZauJoz" role="1B3o_S" />
-      <node concept="10P_77" id="7HUwyZauJo$" role="3clF45" />
-    </node>
-    <node concept="2tJIrI" id="7HUwyZaC53m" role="jymVt" />
-    <node concept="3clFb_" id="7HUwyZaC3Q7" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="type" />
-      <node concept="3uibUv" id="7HUwyZaC3XA" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-        <node concept="16syzq" id="49L2l3F7I8L" role="11_B2D">
-          <ref role="16sUi3" node="49L2l3F7I8l" resolve="V" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7HUwyZaC3Qa" role="1B3o_S" />
-      <node concept="3clFbS" id="7HUwyZaC3Qb" role="3clF47">
-        <node concept="3clFbF" id="7nPD14NXMDo" role="3cqZAp">
-          <node concept="37vLTw" id="7nPD14NXMDn" role="3clFbG">
-            <ref role="3cqZAo" node="7nPD14NONAo" resolve="type" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7nPD14NXMHM" role="jymVt" />
-    <node concept="3clFb_" id="6XBR7US9Exp" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="toString" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="3Tm1VV" id="6XBR7US9Exq" role="1B3o_S" />
-      <node concept="3uibUv" id="6XBR7US9Exs" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-      </node>
-      <node concept="3clFbS" id="6XBR7US9Ext" role="3clF47">
-        <node concept="3clFbF" id="6XBR7US9EUp" role="3cqZAp">
-          <node concept="37vLTw" id="6XBR7US9EUo" role="3clFbG">
-            <ref role="3cqZAo" node="7nPD14NONAl" resolve="name" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="6XBR7US9Exu" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6XBR7US9ELi" role="jymVt" />
-    <node concept="312cEg" id="7nPD14NONAl" role="jymVt">
-      <property role="TrG5h" value="name" />
-      <node concept="3Tm6S6" id="7nPD14NONAm" role="1B3o_S" />
-      <node concept="17QB3L" id="7nPD14NONAn" role="1tU5fm" />
-    </node>
-    <node concept="312cEg" id="7nPD14NONAo" role="jymVt">
-      <property role="TrG5h" value="type" />
-      <node concept="3Tm6S6" id="7nPD14NONAp" role="1B3o_S" />
-      <node concept="3uibUv" id="7nPD14NONAq" role="1tU5fm">
-        <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-        <node concept="16syzq" id="7nPD14NONAr" role="11_B2D">
-          <ref role="16sUi3" node="49L2l3F7I8l" resolve="V" />
-        </node>
-      </node>
-    </node>
-    <node concept="312cEg" id="7nPD14NONAs" role="jymVt">
-      <property role="34CwA1" value="false" />
-      <property role="eg7rD" value="false" />
-      <property role="TrG5h" value="wildcard" />
-      <property role="3TUv4t" value="false" />
-      <node concept="3Tm6S6" id="7nPD14NONAt" role="1B3o_S" />
-      <node concept="10P_77" id="7nPD14NONAu" role="1tU5fm" />
-      <node concept="3clFbT" id="7nPD14NONAv" role="33vP2m">
-        <property role="3clFbU" value="false" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7HUwyZaC3Pw" role="jymVt" />
-    <node concept="3Tm1VV" id="7HUwyZauJh$" role="1B3o_S" />
-    <node concept="16euLQ" id="49L2l3F7I8l" role="16eVyc">
-      <property role="TrG5h" value="V" />
-    </node>
-  </node>
-  <node concept="312cEu" id="7HUwyZaNIC5">
-    <property role="TrG5h" value="MultiMetaLogical" />
-    <node concept="2tJIrI" id="7HUwyZaNICj" role="jymVt" />
-    <node concept="3clFbW" id="7nPD14NOOvW" role="jymVt">
-      <node concept="3cqZAl" id="7nPD14NOOvX" role="3clF45" />
-      <node concept="3Tm1VV" id="7nPD14NOOvY" role="1B3o_S" />
-      <node concept="3clFbS" id="7nPD14NOOvZ" role="3clF47">
-        <node concept="XkiVB" id="7nPD14NOOw0" role="3cqZAp">
-          <ref role="37wK5l" node="7nPD14NON$C" resolve="MetaLogical" />
-          <node concept="37vLTw" id="7nPD14NOOw1" role="37wK5m">
-            <ref role="3cqZAo" node="7nPD14NOOwb" resolve="name" />
-          </node>
-          <node concept="37vLTw" id="7nPD14NOOw2" role="37wK5m">
-            <ref role="3cqZAo" node="7nPD14NOOwd" resolve="type" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="7nPD14NOOw3" role="3cqZAp">
-          <node concept="37vLTI" id="7nPD14NOOw4" role="3clFbG">
-            <node concept="2OqwBi" id="7nPD14NOOw5" role="37vLTJ">
-              <node concept="Xjq3P" id="7nPD14NOOw6" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7nPD14NOOw7" role="2OqNvi">
-                <ref role="2Oxat5" node="7nPD14NOOxv" resolve="cardinality" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="7nPD14NOOw8" role="37vLTx">
-              <ref role="3cqZAo" node="7nPD14NOOwg" resolve="cardinality" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7nPD14NOOw9" role="3cqZAp">
-          <node concept="1rXfSq" id="7nPD14NOOwa" role="3clFbG">
-            <ref role="37wK5l" node="7nPD14NOOwV" resolve="init" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="7nPD14NOOwb" role="3clF46">
-        <property role="TrG5h" value="name" />
-        <node concept="17QB3L" id="7nPD14NOOwc" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="7nPD14NOOwd" role="3clF46">
-        <property role="TrG5h" value="type" />
-        <node concept="3uibUv" id="7nPD14NOOwe" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-          <node concept="16syzq" id="7nPD14NOOwf" role="11_B2D">
-            <ref role="16sUi3" node="49L2l3F82WZ" resolve="V" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="7nPD14NOOwg" role="3clF46">
-        <property role="TrG5h" value="cardinality" />
-        <node concept="10Oyi0" id="7nPD14NOOwh" role="1tU5fm" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7nPD14NXRGo" role="jymVt" />
-    <node concept="3clFb_" id="7HUwyZaC4ZZ" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="cardinality" />
-      <property role="IEkAT" value="false" />
-      <node concept="3clFbS" id="7HUwyZaC500" role="3clF47">
-        <node concept="3clFbF" id="7nPD14NXS__" role="3cqZAp">
-          <node concept="37vLTw" id="7nPD14NXS_$" role="3clFbG">
-            <ref role="3cqZAo" node="7nPD14NOOxv" resolve="cardinality" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7HUwyZaC501" role="1B3o_S" />
-      <node concept="10Oyi0" id="7HUwyZaC5T7" role="3clF45" />
-    </node>
-    <node concept="2tJIrI" id="7HUwyZaNHWd" role="jymVt" />
-    <node concept="3clFb_" id="7HUwyZaNHY_" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="logicalAt" />
-      <node concept="37vLTG" id="7HUwyZaNIPJ" role="3clF46">
-        <property role="TrG5h" value="idx" />
-        <node concept="10Oyi0" id="7HUwyZaNIQ1" role="1tU5fm" />
-      </node>
-      <node concept="3clFbS" id="7HUwyZaNHYC" role="3clF47">
-        <node concept="3clFbF" id="7nPD14NOOwx" role="3cqZAp">
-          <node concept="2OqwBi" id="7nPD14NOOwy" role="3clFbG">
-            <node concept="37vLTw" id="7nPD14NOOwz" role="2Oq$k0">
-              <ref role="3cqZAo" node="7nPD14NOOxz" resolve="metaLogicals" />
-            </node>
-            <node concept="liA8E" id="7nPD14NOOw$" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
-              <node concept="37vLTw" id="7nPD14NOOw_" role="37wK5m">
-                <ref role="3cqZAo" node="7HUwyZaNIPJ" resolve="idx" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7HUwyZaNHYD" role="1B3o_S" />
-      <node concept="3uibUv" id="7HUwyZaNIPg" role="3clF45">
-        <ref role="3uigEE" node="7HUwyZauJhz" resolve="MetaLogical" />
-        <node concept="16syzq" id="49L2l3F82XS" role="11_B2D">
-          <ref role="16sUi3" node="49L2l3F82WZ" resolve="V" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7HUwyZbfyU2" role="jymVt" />
-    <node concept="3clFb_" id="7HUwyZbfyWk" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="toArray" />
-      <node concept="3clFbS" id="7HUwyZbfyWn" role="3clF47">
-        <node concept="3cpWs8" id="7nPD14NOOwG" role="3cqZAp">
-          <node concept="3cpWsn" id="7nPD14NOOwH" role="3cpWs9">
-            <property role="TrG5h" value="array" />
-            <node concept="10Q1$e" id="7nPD14NOOwI" role="1tU5fm">
-              <node concept="3uibUv" id="7nPD14NOOwJ" role="10Q1$1">
-                <ref role="3uigEE" node="7HUwyZauJhz" resolve="MetaLogical" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="7nPD14NOOwK" role="33vP2m">
-              <node concept="3$_iS1" id="7nPD14NOOwL" role="2ShVmc">
-                <node concept="3$GHV9" id="7nPD14NOOwM" role="3$GQph">
-                  <node concept="37vLTw" id="7nPD14NOOwN" role="3$I4v7">
-                    <ref role="3cqZAo" node="7nPD14NOOxv" resolve="cardinality" />
-                  </node>
-                </node>
-                <node concept="3uibUv" id="7nPD14NOOwO" role="3$_nBY">
-                  <ref role="3uigEE" node="7HUwyZauJhz" resolve="MetaLogical" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7nPD14NOOwP" role="3cqZAp">
-          <node concept="2OqwBi" id="7nPD14NOOwQ" role="3clFbG">
-            <node concept="37vLTw" id="7nPD14NOOwR" role="2Oq$k0">
-              <ref role="3cqZAo" node="7nPD14NOOxz" resolve="metaLogicals" />
-            </node>
-            <node concept="liA8E" id="7nPD14NOOwS" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~List.toArray(java.lang.Object[]):java.lang.Object[]" resolve="toArray" />
-              <node concept="37vLTw" id="7nPD14NOOwT" role="37wK5m">
-                <ref role="3cqZAo" node="7nPD14NOOwH" resolve="array" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7HUwyZbfyWo" role="1B3o_S" />
-      <node concept="10Q1$e" id="7HUwyZbfyVX" role="3clF45">
-        <node concept="3uibUv" id="7HUwyZbfyV8" role="10Q1$1">
-          <ref role="3uigEE" node="7HUwyZauJhz" resolve="MetaLogical" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6XBR7US9FHD" role="jymVt" />
-    <node concept="3clFb_" id="7nPD14NOOwV" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="init" />
-      <property role="od$2w" value="false" />
-      <property role="DiZV1" value="false" />
-      <property role="2aFKle" value="false" />
-      <node concept="3clFbS" id="7nPD14NOOwW" role="3clF47">
-        <node concept="1Dw8fO" id="7nPD14NOOwX" role="3cqZAp">
-          <node concept="3uNrnE" id="7nPD14NOOwY" role="1Dwrff">
-            <node concept="37vLTw" id="7nPD14NOOwZ" role="2$L3a6">
-              <ref role="3cqZAo" node="7nPD14NOOx0" resolve="i" />
-            </node>
-          </node>
-          <node concept="3cpWsn" id="7nPD14NOOx0" role="1Duv9x">
-            <property role="TrG5h" value="i" />
-            <node concept="10Oyi0" id="7nPD14NOOx1" role="1tU5fm" />
-            <node concept="3cmrfG" id="7nPD14NOOx2" role="33vP2m">
-              <property role="3cmrfH" value="0" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="7nPD14NOOx3" role="2LFqv$">
-            <node concept="3clFbF" id="7nPD14NOOx4" role="3cqZAp">
-              <node concept="2OqwBi" id="7nPD14NOOx5" role="3clFbG">
-                <node concept="37vLTw" id="7nPD14NOOx6" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7nPD14NOOxz" resolve="metaLogicals" />
-                </node>
-                <node concept="liA8E" id="7nPD14NOOx7" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
-                  <node concept="2ShNRf" id="7nPD14NOOx8" role="37wK5m">
-                    <node concept="1pGfFk" id="7nPD14NOOx9" role="2ShVmc">
-                      <ref role="37wK5l" node="7nPD14NON$C" resolve="MetaLogical" />
-                      <node concept="3cpWs3" id="7nPD14NOOxa" role="37wK5m">
-                        <node concept="3cpWs3" id="7nPD14NOOxb" role="3uHU7B">
-                          <node concept="1rXfSq" id="7nPD14NOOxc" role="3uHU7B">
-                            <ref role="37wK5l" node="7HUwyZauJkq" resolve="name" />
-                          </node>
-                          <node concept="Xl_RD" id="7nPD14NOOxd" role="3uHU7w">
-                            <property role="Xl_RC" value="_" />
-                          </node>
-                        </node>
-                        <node concept="1eOMI4" id="7nPD14NOOxe" role="3uHU7w">
-                          <node concept="3cpWs3" id="7nPD14NOOxf" role="1eOMHV">
-                            <node concept="37vLTw" id="7nPD14NOOxg" role="3uHU7B">
-                              <ref role="3cqZAo" node="7nPD14NOOx0" resolve="i" />
-                            </node>
-                            <node concept="3cmrfG" id="7nPD14NOOxh" role="3uHU7w">
-                              <property role="3cmrfH" value="1" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="1rXfSq" id="7nPD14NOOxi" role="37wK5m">
-                        <ref role="37wK5l" node="7HUwyZaC3Q7" resolve="type" />
-                      </node>
-                      <node concept="16syzq" id="7nPD14NOOxj" role="1pMfVU">
-                        <ref role="16sUi3" node="49L2l3F82WZ" resolve="V" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3eOVzh" id="7nPD14NOOxk" role="1Dwp0S">
-            <node concept="37vLTw" id="7nPD14NOOxl" role="3uHU7w">
-              <ref role="3cqZAo" node="7nPD14NOOxv" resolve="cardinality" />
-            </node>
-            <node concept="37vLTw" id="7nPD14NOOxm" role="3uHU7B">
-              <ref role="3cqZAo" node="7nPD14NOOx0" resolve="i" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="7nPD14NOOxn" role="1B3o_S" />
-      <node concept="3cqZAl" id="7nPD14NOOxo" role="3clF45" />
-    </node>
-    <node concept="2tJIrI" id="7nPD14NOOxp" role="jymVt" />
-    <node concept="312cEg" id="7nPD14NOOxv" role="jymVt">
-      <property role="TrG5h" value="cardinality" />
-      <node concept="3Tm6S6" id="7nPD14NOOxw" role="1B3o_S" />
-      <node concept="10Oyi0" id="7nPD14NOOxx" role="1tU5fm" />
-    </node>
-    <node concept="312cEg" id="7nPD14NOOxz" role="jymVt">
-      <property role="34CwA1" value="false" />
-      <property role="eg7rD" value="false" />
-      <property role="TrG5h" value="metaLogicals" />
-      <property role="3TUv4t" value="false" />
-      <node concept="3Tm6S6" id="7nPD14NOOx$" role="1B3o_S" />
-      <node concept="3uibUv" id="7nPD14NOOx_" role="1tU5fm">
-        <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3uibUv" id="7nPD14NOOxA" role="11_B2D">
-          <ref role="3uigEE" node="7HUwyZauJhz" resolve="MetaLogical" />
-          <node concept="16syzq" id="7nPD14NOOxB" role="11_B2D">
-            <ref role="16sUi3" node="49L2l3F82WZ" resolve="V" />
-          </node>
-        </node>
-      </node>
-      <node concept="2ShNRf" id="7nPD14NOOxC" role="33vP2m">
-        <node concept="1pGfFk" id="7nPD14NOOxD" role="2ShVmc">
-          <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
-          <node concept="3uibUv" id="7nPD14NOOxE" role="1pMfVU">
-            <ref role="3uigEE" node="7HUwyZauJhz" resolve="MetaLogical" />
-            <node concept="16syzq" id="7nPD14NOOxF" role="11_B2D">
-              <ref role="16sUi3" node="49L2l3F82WZ" resolve="V" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3Tm1VV" id="7HUwyZaNIC6" role="1B3o_S" />
-    <node concept="16euLQ" id="49L2l3F82WZ" role="16eVyc">
-      <property role="TrG5h" value="V" />
-    </node>
-    <node concept="3uibUv" id="7nPD14NXUx0" role="1zkMxy">
-      <ref role="3uigEE" node="7HUwyZauJhz" resolve="MetaLogical" />
-      <node concept="16syzq" id="7nPD14NXVnh" role="11_B2D">
-        <ref role="16sUi3" node="49L2l3F82WZ" resolve="V" />
-      </node>
-    </node>
-  </node>
-  <node concept="3HP615" id="7IvepusY4Ez">
-    <property role="TrG5h" value="LogicalContext" />
-    <node concept="2tJIrI" id="7IvepusY4EL" role="jymVt" />
-    <node concept="3clFb_" id="7IvepusY4EY" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="variable" />
-      <node concept="37vLTG" id="7IvepusY4FP" role="3clF46">
-        <property role="TrG5h" value="metaLogical" />
-        <node concept="3uibUv" id="7IvepusY4G3" role="1tU5fm">
-          <ref role="3uigEE" node="7HUwyZauJhz" resolve="MetaLogical" />
-          <node concept="16syzq" id="49L2l3Fdntd" role="11_B2D">
-            <ref role="16sUi3" node="49L2l3Fdns_" resolve="V" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="4TCblo5LRy4" role="3clF45">
-        <ref role="3uigEE" node="1mP5b6jQP$C" resolve="Logical" />
-        <node concept="16syzq" id="4TCblo5LRyo" role="11_B2D">
-          <ref role="16sUi3" node="49L2l3Fdns_" resolve="V" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7IvepusY4F1" role="1B3o_S" />
-      <node concept="3clFbS" id="7IvepusY4F2" role="3clF47" />
-      <node concept="16euLQ" id="49L2l3Fdns_" role="16eVyc">
-        <property role="TrG5h" value="V" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7IvepusY4EQ" role="jymVt" />
-    <node concept="3Tm1VV" id="7IvepusY4E$" role="1B3o_S" />
-  </node>
-  <node concept="3HP615" id="6MYr6JwxYwB">
-    <property role="TrG5h" value="SolverLogical" />
-    <node concept="2tJIrI" id="6MYr6JwxYRu" role="jymVt" />
-    <node concept="3clFb_" id="429xoyqB1jp" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="findRoot" />
-      <node concept="3uibUv" id="429xoyqB1jq" role="3clF45">
-        <ref role="3uigEE" node="6MYr6JwxYwB" resolve="SolverLogical" />
-        <node concept="16syzq" id="429xoyqB1jr" role="11_B2D">
-          <ref role="16sUi3" node="6MYr6JwxYR6" resolve="T" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="429xoyqB1js" role="1B3o_S" />
-      <node concept="3clFbS" id="429xoyqB1jt" role="3clF47" />
-      <node concept="P$JXv" id="20WMLipvdb2" role="lGtFl">
-        <node concept="TZ5HA" id="20WMLipvdb3" role="TZ5H$">
-          <node concept="1dT_AC" id="20WMLipvdb4" role="1dT_Ay">
-            <property role="1dT_AB" value="Covariant override." />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="20WMLipvO7K" role="jymVt" />
-    <node concept="3clFb_" id="20WMLipvYTD" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="union" />
-      <node concept="3clFbS" id="20WMLipvYTG" role="3clF47" />
-      <node concept="3Tm1VV" id="20WMLipvYTH" role="1B3o_S" />
-      <node concept="3cqZAl" id="20WMLipvXXM" role="3clF45" />
-      <node concept="37vLTG" id="20WMLipvZYi" role="3clF46">
-        <property role="TrG5h" value="other" />
-        <node concept="3uibUv" id="20WMLipvZYh" role="1tU5fm">
-          <ref role="3uigEE" node="6MYr6JwxYwB" resolve="SolverLogical" />
-          <node concept="16syzq" id="20WMLipw0I7" role="11_B2D">
-            <ref role="16sUi3" node="6MYr6JwxYR6" resolve="T" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="20WMLipwvci" role="3clF46">
-        <property role="TrG5h" value="reconciler" />
-        <node concept="3uibUv" id="20WMLipwvPf" role="1tU5fm">
-          <ref role="3uigEE" node="20WMLipwnLy" resolve="SolverLogical.ValueReconciler" />
-          <node concept="16syzq" id="20WMLipwwCe" role="11_B2D">
-            <ref role="16sUi3" node="6MYr6JwxYR6" resolve="T" />
-          </node>
-        </node>
-      </node>
-      <node concept="P$JXv" id="20WMLipw3de" role="lGtFl">
-        <node concept="TZ5HA" id="20WMLipw3dn" role="TZ5H$">
-          <node concept="1dT_AC" id="20WMLipw3do" role="1dT_Ay">
-            <property role="1dT_AB" value="Unions two equivalence classes of logicals. " />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="20WMLipw4Ad" role="TZ5H$">
-          <node concept="1dT_AC" id="20WMLipw4Ae" role="1dT_Ay">
-            <property role="1dT_AB" value="Both the receiver and the " />
-          </node>
-          <node concept="1dT_AA" id="20WMLipw4AO" role="1dT_Ay">
-            <node concept="VVOAv" id="20WMLipw4Bc" role="qph3F">
-              <node concept="TZ5HA" id="20WMLipw4Be" role="2Xj1qM">
-                <node concept="1dT_AC" id="20WMLipw4B_" role="1dT_Ay">
-                  <property role="1dT_AB" value="other" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1dT_AC" id="20WMLipw4AN" role="1dT_Ay">
-            <property role="1dT_AB" value=" parameter are expected to be representatives." />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="20WMLipw4$T" role="TZ5H$">
-          <node concept="1dT_AC" id="20WMLipw4$U" role="1dT_Ay">
-            <property role="1dT_AB" value="The one with the highest rank becomes the representative for the new class." />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="20WMLipwu8B" role="jymVt" />
-    <node concept="3clFb_" id="20WMLipwsV4" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="union" />
-      <node concept="3clFbS" id="20WMLipwsV5" role="3clF47" />
-      <node concept="3Tm1VV" id="20WMLipwsV6" role="1B3o_S" />
-      <node concept="3cqZAl" id="20WMLipwsV7" role="3clF45" />
-      <node concept="37vLTG" id="20WMLipwsV8" role="3clF46">
-        <property role="TrG5h" value="other" />
-        <node concept="3uibUv" id="20WMLipwsV9" role="1tU5fm">
-          <ref role="3uigEE" node="6MYr6JwxYwB" resolve="SolverLogical" />
-          <node concept="16syzq" id="20WMLipwsVa" role="11_B2D">
-            <ref role="16sUi3" node="6MYr6JwxYR6" resolve="T" />
-          </node>
-        </node>
-      </node>
-      <node concept="P$JXv" id="20WMLipwsVb" role="lGtFl">
-        <node concept="TZ5HA" id="20WMLipwsVc" role="TZ5H$">
-          <node concept="1dT_AC" id="20WMLipwsVd" role="1dT_Ay">
-            <property role="1dT_AB" value="Calls " />
-          </node>
-          <node concept="1dT_AA" id="20WMLipwz1f" role="1dT_Ay">
-            <node concept="92FcH" id="20WMLipwzsF" role="qph3F">
-              <node concept="TZ5HA" id="20WMLipwzsH" role="2XjZqd" />
-              <node concept="VXe0Z" id="20WMLipwAdm" role="92FcQ">
-                <ref role="VXe0S" node="20WMLipvYTD" resolve="union" />
-              </node>
-            </node>
-          </node>
-          <node concept="1dT_AC" id="20WMLipwz1e" role="1dT_Ay">
-            <property role="1dT_AB" value=" with the default value reconciler." />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="20WMLipwFsv" role="TZ5H$">
-          <node concept="1dT_AC" id="20WMLipwFsw" role="1dT_Ay">
-            <property role="1dT_AB" value="The default reconciler throws " />
-          </node>
-          <node concept="1dT_AA" id="20WMLipwFsF" role="1dT_Ay">
-            <node concept="92FcH" id="20WMLipwFsL" role="qph3F">
-              <node concept="TZ5HA" id="20WMLipwFsN" role="2XjZqd" />
-              <node concept="VXe08" id="20WMLipwHMk" role="92FcQ">
-                <ref role="VXe09" to="wyt6:~IllegalArgumentException" resolve="IllegalArgumentException" />
-              </node>
-            </node>
-          </node>
-          <node concept="1dT_AC" id="20WMLipwFsE" role="1dT_Ay">
-            <property role="1dT_AB" value=" if the two values are not equal." />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="20WMLipvX1X" role="jymVt" />
-    <node concept="3clFb_" id="6MYr6Jwy05T" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="setValue" />
-      <node concept="3clFbS" id="6MYr6Jwy05W" role="3clF47" />
-      <node concept="3Tm1VV" id="6MYr6Jwy05X" role="1B3o_S" />
-      <node concept="3cqZAl" id="6MYr6Jwy05f" role="3clF45" />
-      <node concept="37vLTG" id="6MYr6Jwy09e" role="3clF46">
-        <property role="TrG5h" value="newValue" />
-        <node concept="16syzq" id="6MYr6Jwy09d" role="1tU5fm">
-          <ref role="16sUi3" node="6MYr6JwxYR6" resolve="T" />
-        </node>
-      </node>
-      <node concept="P$JXv" id="20WMLipviCp" role="lGtFl">
-        <node concept="TZ5HA" id="20WMLipviCq" role="TZ5H$">
-          <node concept="1dT_AC" id="20WMLipviCr" role="1dT_Ay">
-            <property role="1dT_AB" value="Should only be called on a representative. " />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6MYr6Jwy0hW" role="jymVt" />
-    <node concept="3HP615" id="20WMLipwnLy" role="jymVt">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="ValueReconciler" />
-      <node concept="2tJIrI" id="20WMLipwpsa" role="jymVt" />
-      <node concept="3clFb_" id="20WMLipwqq1" role="jymVt">
-        <property role="1EzhhJ" value="true" />
-        <property role="TrG5h" value="reconcile" />
-        <node concept="37vLTG" id="20WMLipwrvJ" role="3clF46">
-          <property role="TrG5h" value="valueA" />
-          <node concept="16syzq" id="20WMLipwssf" role="1tU5fm">
-            <ref role="16sUi3" node="20WMLipwrDF" resolve="T" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="20WMLipwsA8" role="3clF46">
-          <property role="TrG5h" value="valueB" />
-          <node concept="16syzq" id="20WMLipwsKa" role="1tU5fm">
-            <ref role="16sUi3" node="20WMLipwrDF" resolve="T" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="20WMLipwqq3" role="3clF45" />
-        <node concept="3Tm1VV" id="20WMLipwqq4" role="1B3o_S" />
-        <node concept="3clFbS" id="20WMLipwqq5" role="3clF47" />
-      </node>
-      <node concept="2tJIrI" id="20WMLipwpV3" role="jymVt" />
-      <node concept="3Tm1VV" id="20WMLipwnLz" role="1B3o_S" />
-      <node concept="16euLQ" id="20WMLipwrDF" role="16eVyc">
-        <property role="TrG5h" value="T" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="20WMLipwmJv" role="jymVt" />
-    <node concept="3uibUv" id="6MYr6JwxYAu" role="3HQHJm">
-      <ref role="3uigEE" node="1mP5b6jQP$C" resolve="Logical" />
-      <node concept="16syzq" id="6MYr6JwxYRr" role="11_B2D">
-        <ref role="16sUi3" node="6MYr6JwxYR6" resolve="T" />
-      </node>
-    </node>
-    <node concept="16euLQ" id="6MYr6JwxYR6" role="16eVyc">
-      <property role="TrG5h" value="T" />
-    </node>
-    <node concept="3Tm1VV" id="6MYr6JwxYVS" role="1B3o_S" />
-  </node>
-  <node concept="3HP615" id="6MYr6JwANOa">
-    <property role="TrG5h" value="LogicalUnification" />
-    <node concept="2tJIrI" id="6MYr6JwANU0" role="jymVt" />
-    <node concept="3clFb_" id="6MYr6JwAODW" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="asRoot" />
-      <node concept="37vLTG" id="6MYr6JwAPmj" role="3clF46">
-        <property role="TrG5h" value="term" />
-        <node concept="16syzq" id="6MYr6JwBkII" role="1tU5fm">
-          <ref role="16sUi3" node="6MYr6JwB0_J" resolve="TERM" />
-        </node>
-      </node>
-      <node concept="16syzq" id="6MYr6JwB166" role="3clF45">
-        <ref role="16sUi3" node="6MYr6JwB0_J" resolve="TERM" />
-      </node>
-      <node concept="3Tm1VV" id="6MYr6JwAODZ" role="1B3o_S" />
-      <node concept="3clFbS" id="6MYr6JwAOE0" role="3clF47" />
-      <node concept="16euLQ" id="6MYr6JwB0_J" role="16eVyc">
-        <property role="TrG5h" value="TERM" />
-        <node concept="3uibUv" id="7IX7qCc9wOJ" role="3ztrMU">
-          <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6MYr6JwANU5" role="jymVt" />
-    <node concept="3clFb_" id="6MYr6JwAPxG" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="logical" />
-      <node concept="37vLTG" id="6MYr6JwARmP" role="3clF46">
-        <property role="TrG5h" value="var" />
-        <node concept="16syzq" id="6MYr6JwBl0o" role="1tU5fm">
-          <ref role="16sUi3" node="6MYr6JwAQYt" resolve="TERM" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="6MYr6JwAPBA" role="3clF45">
-        <ref role="3uigEE" node="6MYr6JwxYwB" resolve="SolverLogical" />
-        <node concept="16syzq" id="6MYr6JwARmw" role="11_B2D">
-          <ref role="16sUi3" node="6MYr6JwAQYt" resolve="TERM" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="6MYr6JwAPxJ" role="1B3o_S" />
-      <node concept="3clFbS" id="6MYr6JwAPxK" role="3clF47" />
-      <node concept="16euLQ" id="6MYr6JwAQYt" role="16eVyc">
-        <property role="TrG5h" value="TERM" />
-        <node concept="3uibUv" id="7IX7qCc9wRy" role="3ztrMU">
-          <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6MYr6JwSFky" role="jymVt" />
-    <node concept="3clFb_" id="6MYr6JwRKzQ" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="isLogical" />
-      <node concept="37vLTG" id="6MYr6JwRKNo" role="3clF46">
-        <property role="TrG5h" value="term" />
-        <node concept="3uibUv" id="7IX7qCc9wSf" role="1tU5fm">
-          <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
-        </node>
-      </node>
-      <node concept="10P_77" id="6MYr6JwRKDe" role="3clF45" />
-      <node concept="3Tm1VV" id="6MYr6JwRKzT" role="1B3o_S" />
-      <node concept="3clFbS" id="6MYr6JwRKzU" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="6MYr6JwSESa" role="jymVt" />
-    <node concept="3Tm1VV" id="6MYr6JwANOb" role="1B3o_S" />
-  </node>
-  <node concept="3HP615" id="46l0wJhtOD_">
-    <property role="TrG5h" value="LogicalOwner" />
-    <node concept="2tJIrI" id="7HUwyZaOczR" role="jymVt" />
-    <node concept="3clFb_" id="46l0wJhtXlr" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="logical" />
-      <node concept="3uibUv" id="46l0wJhtXpb" role="3clF45">
-        <ref role="3uigEE" node="1mP5b6jQP$C" resolve="Logical" />
-        <node concept="3qTvmN" id="46l0wJhtXxO" role="11_B2D" />
-      </node>
-      <node concept="3Tm1VV" id="46l0wJhtXlu" role="1B3o_S" />
-      <node concept="3clFbS" id="46l0wJhtXlv" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="46l0wJhtOHe" role="jymVt" />
-    <node concept="3Tm1VV" id="46l0wJhtODA" role="1B3o_S" />
-  </node>
-</model>
-
diff --git a/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/program.mps b/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/program.mps
deleted file mode 100644
index de78a843..00000000
--- a/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/program.mps
+++ /dev/null
@@ -1,1348 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)">
-  <persistence version="9" />
-  <languages>
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
-  </languages>
-  <imports>
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
-  </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
-      <concept id="1219920932475" name="jetbrains.mps.baseLanguage.structure.VariableArityType" flags="in" index="8X2XB">
-        <child id="1219921048460" name="componentType" index="8Xvag" />
-      </concept>
-      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
-        <child id="1068498886297" name="rValue" index="37vLTx" />
-        <child id="1068498886295" name="lValue" index="37vLTJ" />
-      </concept>
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
-      <concept id="1173175405605" name="jetbrains.mps.baseLanguage.structure.ArrayAccessExpression" flags="nn" index="AH0OO">
-        <child id="1173175577737" name="index" index="AHEQo" />
-        <child id="1173175590490" name="array" index="AHHXb" />
-      </concept>
-      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
-        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
-      </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
-        <child id="1188208488637" name="annotation" index="2AJF6D" />
-      </concept>
-      <concept id="1188220165133" name="jetbrains.mps.baseLanguage.structure.ArrayLiteral" flags="nn" index="2BsdOp">
-        <child id="1188220173759" name="item" index="2BsfMF" />
-      </concept>
-      <concept id="1224848483129" name="jetbrains.mps.baseLanguage.structure.IBLDeprecatable" flags="ng" index="IEa8$">
-        <property id="1224848525476" name="isDeprecated" index="IEkAT" />
-      </concept>
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1197029447546" name="jetbrains.mps.baseLanguage.structure.FieldReferenceOperation" flags="nn" index="2OwXpG">
-        <reference id="1197029500499" name="fieldDeclaration" index="2Oxat5" />
-      </concept>
-      <concept id="1083245097125" name="jetbrains.mps.baseLanguage.structure.EnumClass" flags="ig" index="Qs71p">
-        <child id="1083245396908" name="enumConstant" index="Qtgdg" />
-      </concept>
-      <concept id="1083245299891" name="jetbrains.mps.baseLanguage.structure.EnumConstantDeclaration" flags="ig" index="QsSxf" />
-      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
-        <child id="1145553007750" name="creator" index="2ShVmc" />
-      </concept>
-      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
-      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
-      <concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
-      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
-        <property id="1070475926801" name="value" index="Xl_RC" />
-      </concept>
-      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
-      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
-        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
-      </concept>
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
-      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1070534760951" name="jetbrains.mps.baseLanguage.structure.ArrayType" flags="in" index="10Q1$e">
-        <child id="1070534760952" name="componentType" index="10Q1$1" />
-      </concept>
-      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
-        <child id="1070534934091" name="type" index="10QFUM" />
-        <child id="1070534934092" name="expression" index="10QFUP" />
-      </concept>
-      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
-        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
-        <child id="1165602531693" name="superclass" index="1zkMxy" />
-      </concept>
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <property id="1176718929932" name="isFinal" index="3TUv4t" />
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
-      <concept id="1092119917967" name="jetbrains.mps.baseLanguage.structure.MulExpression" flags="nn" index="17qRlL" />
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
-      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
-      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <property id="1181808852946" name="isFinal" index="DiZV1" />
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
-        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
-      </concept>
-      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
-      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1068580123160" name="condition" index="3clFbw" />
-        <child id="1068580123161" name="ifTrue" index="3clFbx" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
-        <property id="1068580123138" name="value" index="3clFbU" />
-      </concept>
-      <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
-      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
-        <property id="1068580320021" name="value" index="3cmrfH" />
-      </concept>
-      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
-        <child id="1068581517676" name="expression" index="3cqZAk" />
-      </concept>
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
-        <child id="1079359253376" name="expression" index="1eOMHV" />
-      </concept>
-      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
-        <child id="1081516765348" name="expression" index="3fr31v" />
-      </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="1171903607971" name="jetbrains.mps.baseLanguage.structure.WildCardType" flags="in" index="3qTvmN" />
-      <concept id="1171903916106" name="jetbrains.mps.baseLanguage.structure.UpperBoundType" flags="in" index="3qUE_q">
-        <child id="1171903916107" name="bound" index="3qUE_r" />
-      </concept>
-      <concept id="7812454656619025416" name="jetbrains.mps.baseLanguage.structure.MethodDeclaration" flags="ng" index="1rXfSm">
-        <property id="8355037393041754995" name="isNative" index="2aFKle" />
-      </concept>
-      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-        <child id="1109201940907" name="parameter" index="11_B2D" />
-      </concept>
-      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
-        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
-        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
-      </concept>
-      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615">
-        <child id="1107797138135" name="extendedInterface" index="3HQHJm" />
-      </concept>
-      <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
-        <child id="1163668914799" name="condition" index="3K4Cdx" />
-        <child id="1163668922816" name="ifTrue" index="3K4E3e" />
-        <child id="1163668934364" name="ifFalse" index="3K4GZi" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
-      <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
-    </language>
-    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
-      </concept>
-      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
-      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="312cEu" id="5uFPQ7BvNzE">
-    <property role="TrG5h" value="Program" />
-    <property role="1sVAO0" value="true" />
-    <node concept="2tJIrI" id="5uFPQ7BvN_2" role="jymVt" />
-    <node concept="3clFb_" id="78CwJJcTOB4" role="jymVt">
-      <property role="TrG5h" value="name" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="17QB3L" id="78CwJJcTPfl" role="3clF45" />
-      <node concept="3Tm1VV" id="78CwJJcTOB7" role="1B3o_S" />
-      <node concept="3clFbS" id="78CwJJcTOB8" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="6X5F0Ngiptw" role="jymVt" />
-    <node concept="3clFb_" id="78CwJJcOw2K" role="jymVt">
-      <property role="TrG5h" value="constraintSymbols" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="78CwJJcOw3v" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-        <node concept="3uibUv" id="78CwJJcOw3H" role="11_B2D">
-          <ref role="3uigEE" node="54i3FxcZHHF" resolve="ConstraintSymbol" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="78CwJJcOw2N" role="1B3o_S" />
-      <node concept="3clFbS" id="78CwJJcOw2O" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="78CwJJcOw4k" role="jymVt" />
-    <node concept="3clFb_" id="5uFPQ7BvNRv" role="jymVt">
-      <property role="TrG5h" value="constraintArgumentTypes" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="37vLTG" id="5uFPQ7BvTv5" role="3clF46">
-        <property role="TrG5h" value="constraintSymbol" />
-        <node concept="3uibUv" id="5uFPQ7BvTvh" role="1tU5fm">
-          <ref role="3uigEE" node="54i3FxcZHHF" resolve="ConstraintSymbol" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="78CwJJcXgYY" role="3clF45">
-        <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3uibUv" id="78CwJJcXh4G" role="11_B2D">
-          <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-          <node concept="3qTvmN" id="78CwJJcXha0" role="11_B2D" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="5uFPQ7BvNRy" role="1B3o_S" />
-      <node concept="3clFbS" id="5uFPQ7BvNRz" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="78CwJJcOL7R" role="jymVt" />
-    <node concept="3clFb_" id="78CwJJcOKJw" role="jymVt">
-      <property role="TrG5h" value="predicateSymbols" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="78CwJJcOL6F" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-        <node concept="3uibUv" id="78CwJJcOL6L" role="11_B2D">
-          <ref role="3uigEE" node="5uFPQ7B$$3f" resolve="PredicateSymbol" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="78CwJJcOKJz" role="1B3o_S" />
-      <node concept="3clFbS" id="78CwJJcOKJ$" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7BvNSh" role="jymVt" />
-    <node concept="3clFb_" id="78CwJJcTsEO" role="jymVt">
-      <property role="TrG5h" value="rules" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="78CwJJcTtiP" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-        <node concept="3uibUv" id="78CwJJcTtiV" role="11_B2D">
-          <ref role="3uigEE" node="7eGEHDlc$9y" resolve="Rule" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="78CwJJcTsER" role="1B3o_S" />
-      <node concept="3clFbS" id="78CwJJcTsES" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="78CwJJcXHyD" role="jymVt" />
-    <node concept="2tJIrI" id="2tcGHBDZ69W" role="jymVt" />
-    <node concept="3Tm1VV" id="5uFPQ7BvNzF" role="1B3o_S" />
-  </node>
-  <node concept="3HP615" id="5uFPQ7B$Pn9">
-    <property role="TrG5h" value="AndItem" />
-    <node concept="2tJIrI" id="5uFPQ7B$Pnr" role="jymVt" />
-    <node concept="3clFb_" id="5uFPQ7BE$9i" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="symbol" />
-      <node concept="3uibUv" id="5uFPQ7BE$a5" role="3clF45">
-        <ref role="3uigEE" node="5uFPQ7B$mzX" resolve="Symbol" />
-      </node>
-      <node concept="3Tm1VV" id="5uFPQ7BE$9l" role="1B3o_S" />
-      <node concept="3clFbS" id="5uFPQ7BE$9m" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7BE$8W" role="jymVt" />
-    <node concept="3clFb_" id="5uFPQ7B_b06" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="arguments" />
-      <node concept="3uibUv" id="5uFPQ7B_b23" role="3clF45">
-        <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-        <node concept="3qTvmN" id="7HUwyZaBH9P" role="11_B2D" />
-      </node>
-      <node concept="3Tm1VV" id="5uFPQ7B_b09" role="1B3o_S" />
-      <node concept="3clFbS" id="5uFPQ7B_b0a" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7B$Pnw" role="jymVt" />
-    <node concept="3Tm1VV" id="5uFPQ7B$Pna" role="1B3o_S" />
-  </node>
-  <node concept="3HP615" id="6Kcfpq7Bj7q">
-    <property role="TrG5h" value="Predicate" />
-    <node concept="2tJIrI" id="4xBopTzlOs8" role="jymVt" />
-    <node concept="3clFb_" id="6Kcfpq7Bjgi" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="symbol" />
-      <node concept="3uibUv" id="5uFPQ7BE$hP" role="3clF45">
-        <ref role="3uigEE" node="5uFPQ7B$$3f" resolve="PredicateSymbol" />
-      </node>
-      <node concept="3Tm1VV" id="6Kcfpq7Bjgl" role="1B3o_S" />
-      <node concept="3clFbS" id="6Kcfpq7Bjgm" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="6Kcfpq7Bjku" role="jymVt" />
-    <node concept="3clFb_" id="4TCblo5TXaZ" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="invocationArguments" />
-      <node concept="37vLTG" id="4TCblo5TXb0" role="3clF46">
-        <property role="TrG5h" value="logicalContext" />
-        <node concept="3uibUv" id="4TCblo5TXb1" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:7IvepusY4Ez" resolve="LogicalContext" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="4TCblo5TXb2" role="3clF47" />
-      <node concept="3Tm1VV" id="4TCblo5TXb3" role="1B3o_S" />
-      <node concept="3uibUv" id="4TCblo5TXb4" role="3clF45">
-        <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-        <node concept="3qTvmN" id="4TCblo5TXb5" role="11_B2D" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4TCblo5TW7x" role="jymVt" />
-    <node concept="2tJIrI" id="4TCblo5TXdG" role="jymVt" />
-    <node concept="3Tm1VV" id="6Kcfpq7Bj7r" role="1B3o_S" />
-    <node concept="3uibUv" id="5uFPQ7B_ama" role="3HQHJm">
-      <ref role="3uigEE" node="5uFPQ7B$Pn9" resolve="AndItem" />
-    </node>
-    <node concept="3UR2Jj" id="6Kcfpq7C_PM" role="lGtFl">
-      <node concept="TZ5HA" id="6Kcfpq7C_PN" role="TZ5H$">
-        <node concept="1dT_AC" id="6Kcfpq7C_PO" role="1dT_Ay">
-          <property role="1dT_AB" value="A predicate that is provided by a solver. Can be either told or asked. " />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3HP615" id="6Kcfpq7BfEn">
-    <property role="TrG5h" value="Constraint" />
-    <node concept="2tJIrI" id="6Kcfpq7Bg6c" role="jymVt" />
-    <node concept="3clFb_" id="5uFPQ7B_aTC" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="symbol" />
-      <node concept="3uibUv" id="5uFPQ7B_aVj" role="3clF45">
-        <ref role="3uigEE" node="54i3FxcZHHF" resolve="ConstraintSymbol" />
-      </node>
-      <node concept="3Tm1VV" id="5uFPQ7B_aTF" role="1B3o_S" />
-      <node concept="3clFbS" id="5uFPQ7B_aTG" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7B_aZ9" role="jymVt" />
-    <node concept="3clFb_" id="78CwJJcOwWR" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="argumentTypes" />
-      <node concept="3uibUv" id="78CwJJcOxpB" role="3clF45">
-        <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3uibUv" id="78CwJJcOxzF" role="11_B2D">
-          <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-          <node concept="3qTvmN" id="78CwJJcOx$p" role="11_B2D" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="78CwJJcOwWU" role="1B3o_S" />
-      <node concept="3clFbS" id="78CwJJcOwWV" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="78CwJJcOwxN" role="jymVt" />
-    <node concept="3Tm1VV" id="6Kcfpq7BfEo" role="1B3o_S" />
-    <node concept="3uibUv" id="5uFPQ7B$Pog" role="3HQHJm">
-      <ref role="3uigEE" node="5uFPQ7B$Pn9" resolve="AndItem" />
-    </node>
-    <node concept="3UR2Jj" id="6Kcfpq7C_QP" role="lGtFl">
-      <node concept="TZ5HA" id="6Kcfpq7C_QQ" role="TZ5H$">
-        <node concept="1dT_AC" id="6Kcfpq7C_QR" role="1dT_Ay">
-          <property role="1dT_AB" value="A constraint provided by a handler. Can only be told." />
-        </node>
-      </node>
-    </node>
-    <node concept="3clFb_" id="4TCblo5M5qP" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="occurrenceArguments" />
-      <node concept="37vLTG" id="4TCblo5Nrp7" role="3clF46">
-        <property role="TrG5h" value="logicalContext" />
-        <node concept="3uibUv" id="4TCblo5Nrr2" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:7IvepusY4Ez" resolve="LogicalContext" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="4TCblo5M5qS" role="3clF47" />
-      <node concept="3Tm1VV" id="4TCblo5M5qT" role="1B3o_S" />
-      <node concept="3uibUv" id="4TCblo5M5pS" role="3clF45">
-        <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-        <node concept="3qTvmN" id="4TCblo5M5qH" role="11_B2D" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4sSe4$oZtfm" role="jymVt" />
-    <node concept="3clFb_" id="4sSe4$oZtuv" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="patternPredicates" />
-      <node concept="37vLTG" id="6v0X_XJLN7q" role="3clF46">
-        <property role="TrG5h" value="occurrenceArgs" />
-        <node concept="3uibUv" id="6v0X_XJLNp1" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-          <node concept="3qTvmN" id="6v0X_XJLNPD" role="11_B2D" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="4sSe4$oZtHO" role="3clF45">
-        <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-        <node concept="3qUE_q" id="4sSe4$oZu9a" role="11_B2D">
-          <node concept="3uibUv" id="4sSe4$oZumo" role="3qUE_r">
-            <ref role="3uigEE" node="6Kcfpq7Bj7q" resolve="Predicate" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="4sSe4$oZtuy" role="1B3o_S" />
-      <node concept="3clFbS" id="4sSe4$oZtuz" role="3clF47" />
-      <node concept="P$JXv" id="4sSe4$oZw72" role="lGtFl">
-        <node concept="TZ5HA" id="4sSe4$oZw73" role="TZ5H$">
-          <node concept="1dT_AC" id="4sSe4$oZw74" role="1dT_Ay">
-            <property role="1dT_AB" value="Returns the collection of predicates that need to be applied after a successful match of this collection by a" />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="4sSe4$oZCyB" role="TZ5H$">
-          <node concept="1dT_AC" id="4sSe4$oZCyC" role="1dT_Ay">
-            <property role="1dT_AB" value="rule's head. " />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="4sSe4$oZDYi" role="TZ5H$">
-          <node concept="1dT_AC" id="4sSe4$oZEbq" role="1dT_Ay">
-            <property role="1dT_AB" value="This method only returns meaningful results for constraints that serve as patterns in a rule's head. " />
-          </node>
-          <node concept="1dT_AC" id="4sSe4$oZDYj" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4sSe4$oYwIg" role="jymVt" />
-  </node>
-  <node concept="312cEu" id="7Oc59RSHJnv">
-    <property role="TrG5h" value="InvalidConstraintException" />
-    <node concept="2tJIrI" id="7Oc59RSHJEo" role="jymVt" />
-    <node concept="3clFbW" id="7Oc59RSHJEw" role="jymVt">
-      <node concept="3cqZAl" id="7Oc59RSHJEy" role="3clF45" />
-      <node concept="3Tm1VV" id="7Oc59RSHJEz" role="1B3o_S" />
-      <node concept="3clFbS" id="7Oc59RSHJE$" role="3clF47">
-        <node concept="XkiVB" id="7Oc59RSHJFi" role="3cqZAp">
-          <ref role="37wK5l" to="wyt6:~Exception.&lt;init&gt;(java.lang.String)" resolve="Exception" />
-          <node concept="37vLTw" id="7Oc59RSHJFF" role="37wK5m">
-            <ref role="3cqZAo" node="7Oc59RSHJEI" resolve="message" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="7Oc59RSHJEI" role="3clF46">
-        <property role="TrG5h" value="message" />
-        <node concept="17QB3L" id="7Oc59RSHJEH" role="1tU5fm" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7Oc59RSHJQ8" role="jymVt" />
-    <node concept="3clFbW" id="7Oc59RSHJLP" role="jymVt">
-      <node concept="3cqZAl" id="7Oc59RSHJLQ" role="3clF45" />
-      <node concept="3Tm1VV" id="7Oc59RSHJLR" role="1B3o_S" />
-      <node concept="3clFbS" id="7Oc59RSHJLS" role="3clF47">
-        <node concept="XkiVB" id="7Oc59RSHJLT" role="3cqZAp">
-          <ref role="37wK5l" to="wyt6:~Exception.&lt;init&gt;(java.lang.String,java.lang.Throwable)" resolve="Exception" />
-          <node concept="37vLTw" id="7Oc59RSHJLU" role="37wK5m">
-            <ref role="3cqZAo" node="7Oc59RSHJLV" resolve="message" />
-          </node>
-          <node concept="37vLTw" id="7Oc59RSHJTY" role="37wK5m">
-            <ref role="3cqZAo" node="7Oc59RSHJRg" resolve="ex" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="7Oc59RSHJLV" role="3clF46">
-        <property role="TrG5h" value="message" />
-        <node concept="17QB3L" id="7Oc59RSHJLW" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="7Oc59RSHJRg" role="3clF46">
-        <property role="TrG5h" value="ex" />
-        <node concept="3uibUv" id="7Oc59RSHJRN" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7Oc59RSHJS0" role="jymVt" />
-    <node concept="3Tm1VV" id="7Oc59RSHJnw" role="1B3o_S" />
-    <node concept="3uibUv" id="7Oc59RSHJnS" role="1zkMxy">
-      <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
-    </node>
-  </node>
-  <node concept="312cEu" id="7eGEHDlc$9y">
-    <property role="TrG5h" value="Rule" />
-    <property role="1sVAO0" value="true" />
-    <node concept="2tJIrI" id="7eGEHDlc$9z" role="jymVt" />
-    <node concept="3clFb_" id="7eGEHDlc$9$" role="jymVt">
-      <property role="TrG5h" value="kind" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="7eGEHDlc$9_" role="3clF45">
-        <ref role="3uigEE" node="7eGEHDlc$a2" resolve="Rule.Kind" />
-      </node>
-      <node concept="3Tm1VV" id="7eGEHDlc$9A" role="1B3o_S" />
-      <node concept="3clFbS" id="7eGEHDlc$9B" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="6lpwCiZj$A4" role="jymVt" />
-    <node concept="3clFb_" id="6lpwCiZj$RR" role="jymVt">
-      <property role="TrG5h" value="tag" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="17QB3L" id="6lpwCiZj$UX" role="3clF45" />
-      <node concept="3Tm1VV" id="6lpwCiZj$RU" role="1B3o_S" />
-      <node concept="3clFbS" id="6lpwCiZj$RV" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="6lpwCiZj$Ij" role="jymVt" />
-    <node concept="3clFb_" id="7eGEHDlc$9D" role="jymVt">
-      <property role="TrG5h" value="headKept" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="7eGEHDlc$9E" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-        <node concept="3uibUv" id="5uFPQ7BHcst" role="11_B2D">
-          <ref role="3uigEE" node="6Kcfpq7BfEn" resolve="Constraint" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7eGEHDlc$9G" role="1B3o_S" />
-      <node concept="3clFbS" id="7eGEHDlc$9H" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="7eGEHDlc$9I" role="jymVt" />
-    <node concept="3clFb_" id="7eGEHDlc$9J" role="jymVt">
-      <property role="TrG5h" value="headReplaced" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="7eGEHDlc$9K" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-        <node concept="3uibUv" id="5uFPQ7BHcu4" role="11_B2D">
-          <ref role="3uigEE" node="6Kcfpq7BfEn" resolve="Constraint" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7eGEHDlc$9M" role="1B3o_S" />
-      <node concept="3clFbS" id="7eGEHDlc$9N" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="7eGEHDlc$9O" role="jymVt" />
-    <node concept="3clFb_" id="7eGEHDlc$9P" role="jymVt">
-      <property role="TrG5h" value="guard" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="7eGEHDlc$9Q" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-        <node concept="3uibUv" id="5uFPQ7BHbI_" role="11_B2D">
-          <ref role="3uigEE" node="6Kcfpq7Bj7q" resolve="Predicate" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7eGEHDlc$9S" role="1B3o_S" />
-      <node concept="3clFbS" id="7eGEHDlc$9T" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="7eGEHDlc$9U" role="jymVt" />
-    <node concept="3clFb_" id="7eGEHDlc$9V" role="jymVt">
-      <property role="TrG5h" value="body" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="7eGEHDlc$9W" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-        <node concept="3uibUv" id="5uFPQ7BHbcx" role="11_B2D">
-          <ref role="3uigEE" node="5uFPQ7B$Pn9" resolve="AndItem" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7eGEHDlc$9Y" role="1B3o_S" />
-      <node concept="3clFbS" id="7eGEHDlc$9Z" role="3clF47" />
-      <node concept="2AHcQZ" id="TYqmVPFYGv" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="TYqmVPFWXY" role="jymVt" />
-    <node concept="3clFb_" id="TYqmVPFWVP" role="jymVt">
-      <property role="TrG5h" value="bodyAlternation" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="TYqmVPFWVQ" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-        <node concept="3qUE_q" id="2_NfR5wkJA_" role="11_B2D">
-          <node concept="3uibUv" id="TYqmVPFYK7" role="3qUE_r">
-            <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-            <node concept="3uibUv" id="TYqmVPFYL1" role="11_B2D">
-              <ref role="3uigEE" node="5uFPQ7B$Pn9" resolve="AndItem" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="TYqmVPFWVS" role="1B3o_S" />
-      <node concept="3clFbS" id="TYqmVPFWVT" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="TYqmVPFWUX" role="jymVt" />
-    <node concept="3clFb_" id="7eGEHDldrDm" role="jymVt">
-      <property role="TrG5h" value="all" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="7eGEHDldrDn" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-        <node concept="3uibUv" id="5uFPQ7BHaCF" role="11_B2D">
-          <ref role="3uigEE" node="5uFPQ7B$Pn9" resolve="AndItem" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7eGEHDldrDp" role="1B3o_S" />
-      <node concept="3clFbS" id="7eGEHDldrDq" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="7eGEHDldrKO" role="jymVt" />
-    <node concept="Qs71p" id="7eGEHDlc$a2" role="jymVt">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Kind" />
-      <node concept="QsSxf" id="7eGEHDlc$a3" role="Qtgdg">
-        <property role="TrG5h" value="SIMPLIFICATION" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-      </node>
-      <node concept="QsSxf" id="7eGEHDlc$a4" role="Qtgdg">
-        <property role="TrG5h" value="PROPAGATION" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-      </node>
-      <node concept="QsSxf" id="7eGEHDlc$a5" role="Qtgdg">
-        <property role="TrG5h" value="SIMPAGATION" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-      </node>
-      <node concept="3Tm1VV" id="7eGEHDlc$a6" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="7eGEHDlcUpl" role="jymVt" />
-    <node concept="3Tm1VV" id="7eGEHDlc$a7" role="1B3o_S" />
-  </node>
-  <node concept="312cEu" id="7Oc59RS$wKP">
-    <property role="TrG5h" value="InvalidRuleException" />
-    <node concept="2tJIrI" id="7Oc59RS$y8_" role="jymVt" />
-    <node concept="3clFbW" id="7Oc59RS$xFc" role="jymVt">
-      <node concept="37vLTG" id="7Oc59RS$xFs" role="3clF46">
-        <property role="TrG5h" value="message" />
-        <node concept="17QB3L" id="7Oc59RS$xF_" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="7Oc59RS$xFe" role="3clF45" />
-      <node concept="3Tm1VV" id="7Oc59RS$xFf" role="1B3o_S" />
-      <node concept="3clFbS" id="7Oc59RS$xFg" role="3clF47">
-        <node concept="XkiVB" id="7Oc59RS$xG2" role="3cqZAp">
-          <ref role="37wK5l" to="wyt6:~Exception.&lt;init&gt;(java.lang.String)" resolve="Exception" />
-          <node concept="37vLTw" id="7Oc59RS$xGT" role="37wK5m">
-            <ref role="3cqZAo" node="7Oc59RS$xFs" resolve="message" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7Oc59RS$yMj" role="jymVt" />
-    <node concept="3clFbW" id="7Oc59RS$yHZ" role="jymVt">
-      <node concept="37vLTG" id="7Oc59RS$yI0" role="3clF46">
-        <property role="TrG5h" value="message" />
-        <node concept="17QB3L" id="7Oc59RS$yI1" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="7Oc59RS$yNs" role="3clF46">
-        <property role="TrG5h" value="throwable" />
-        <node concept="3uibUv" id="7Oc59RS$yO0" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="7Oc59RS$yI2" role="3clF45" />
-      <node concept="3Tm1VV" id="7Oc59RS$yI3" role="1B3o_S" />
-      <node concept="3clFbS" id="7Oc59RS$yI4" role="3clF47">
-        <node concept="XkiVB" id="7Oc59RS$yI5" role="3cqZAp">
-          <ref role="37wK5l" to="wyt6:~Exception.&lt;init&gt;(java.lang.String,java.lang.Throwable)" resolve="Exception" />
-          <node concept="37vLTw" id="7Oc59RS$yI6" role="37wK5m">
-            <ref role="3cqZAo" node="7Oc59RS$yI0" resolve="message" />
-          </node>
-          <node concept="37vLTw" id="7Oc59RS$yPj" role="37wK5m">
-            <ref role="3cqZAo" node="7Oc59RS$yNs" resolve="throwable" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7Oc59RS$xOV" role="jymVt" />
-    <node concept="3Tm1VV" id="7Oc59RS$wKQ" role="1B3o_S" />
-    <node concept="3uibUv" id="7Oc59RS$x3f" role="1zkMxy">
-      <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
-    </node>
-  </node>
-  <node concept="312cEu" id="5uFPQ7B$mzX">
-    <property role="TrG5h" value="Symbol" />
-    <property role="1sVAO0" value="true" />
-    <node concept="2tJIrI" id="5uFPQ7B$mC8" role="jymVt" />
-    <node concept="3clFbW" id="5uFPQ7B$oXn" role="jymVt">
-      <node concept="37vLTG" id="5uFPQ7B$p1M" role="3clF46">
-        <property role="TrG5h" value="id" />
-        <node concept="17QB3L" id="5uFPQ7B$p5R" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="5uFPQ7B$ywe" role="3clF46">
-        <property role="TrG5h" value="arity" />
-        <node concept="10Oyi0" id="5uFPQ7B$yCi" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="5uFPQ7B$oXp" role="3clF45" />
-      <node concept="3Tmbuc" id="5uFPQ7BEzkm" role="1B3o_S" />
-      <node concept="3clFbS" id="5uFPQ7B$oXr" role="3clF47">
-        <node concept="3clFbF" id="5uFPQ7B$pad" role="3cqZAp">
-          <node concept="37vLTI" id="5uFPQ7B$pdS" role="3clFbG">
-            <node concept="37vLTw" id="5uFPQ7B$pgh" role="37vLTx">
-              <ref role="3cqZAo" node="5uFPQ7B$p1M" resolve="id" />
-            </node>
-            <node concept="2OqwBi" id="5uFPQ7B$pat" role="37vLTJ">
-              <node concept="Xjq3P" id="5uFPQ7B$pac" role="2Oq$k0" />
-              <node concept="2OwXpG" id="5uFPQ7B$pbA" role="2OqNvi">
-                <ref role="2Oxat5" node="54i3FxcZMvF" resolve="id" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5uFPQ7B$w67" role="3cqZAp">
-          <node concept="37vLTI" id="5uFPQ7B$we4" role="3clFbG">
-            <node concept="37vLTw" id="5uFPQ7B$yIb" role="37vLTx">
-              <ref role="3cqZAo" node="5uFPQ7B$ywe" resolve="arity" />
-            </node>
-            <node concept="2OqwBi" id="5uFPQ7B$w6O" role="37vLTJ">
-              <node concept="Xjq3P" id="5uFPQ7B$w65" role="2Oq$k0" />
-              <node concept="2OwXpG" id="5uFPQ7B$w81" role="2OqNvi">
-                <ref role="2Oxat5" node="54i3FxcZMvI" resolve="arity" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7B$oT4" role="jymVt" />
-    <node concept="3Tm1VV" id="5uFPQ7B$mzY" role="1B3o_S" />
-    <node concept="3clFb_" id="54i3FxcZMvt" role="jymVt">
-      <property role="TrG5h" value="id" />
-      <node concept="17QB3L" id="54i3FxcZMvu" role="3clF45" />
-      <node concept="3Tm1VV" id="54i3FxcZMvv" role="1B3o_S" />
-      <node concept="3clFbS" id="54i3FxcZMvw" role="3clF47">
-        <node concept="3clFbF" id="54i3FxcZMvx" role="3cqZAp">
-          <node concept="37vLTw" id="54i3FxcZMvy" role="3clFbG">
-            <ref role="3cqZAo" node="54i3FxcZMvF" resolve="id" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7B$zLN" role="jymVt" />
-    <node concept="3clFb_" id="54i3FxcZMv$" role="jymVt">
-      <property role="TrG5h" value="arity" />
-      <node concept="10Oyi0" id="54i3FxcZMv_" role="3clF45" />
-      <node concept="3Tm1VV" id="54i3FxcZMvA" role="1B3o_S" />
-      <node concept="3clFbS" id="54i3FxcZMvB" role="3clF47">
-        <node concept="3clFbF" id="54i3FxcZMvC" role="3cqZAp">
-          <node concept="37vLTw" id="54i3FxcZMvD" role="3clFbG">
-            <ref role="3cqZAo" node="54i3FxcZMvI" resolve="arity" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7B$oOM" role="jymVt" />
-    <node concept="3clFb_" id="54i3Fxd17cS" role="jymVt">
-      <property role="TrG5h" value="hashCode" />
-      <node concept="10Oyi0" id="54i3Fxd17cT" role="3clF45" />
-      <node concept="3Tm1VV" id="54i3Fxd17cU" role="1B3o_S" />
-      <node concept="3clFbS" id="54i3Fxd17cV" role="3clF47">
-        <node concept="3cpWs8" id="54i3Fxd17cX" role="3cqZAp">
-          <node concept="3cpWsn" id="54i3Fxd17cY" role="3cpWs9">
-            <property role="TrG5h" value="result" />
-            <node concept="10Oyi0" id="54i3Fxd17cZ" role="1tU5fm" />
-            <node concept="3cmrfG" id="54i3Fxd17d0" role="33vP2m">
-              <property role="3cmrfH" value="17" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="54i3Fxd17da" role="3cqZAp">
-          <node concept="37vLTI" id="54i3Fxd17db" role="3clFbG">
-            <node concept="37vLTw" id="54i3Fxd17dc" role="37vLTJ">
-              <ref role="3cqZAo" node="54i3Fxd17cY" resolve="result" />
-            </node>
-            <node concept="3cpWs3" id="54i3Fxd17dd" role="37vLTx">
-              <node concept="17qRlL" id="54i3Fxd17d6" role="3uHU7B">
-                <node concept="3cmrfG" id="54i3Fxd17d7" role="3uHU7B">
-                  <property role="3cmrfH" value="43" />
-                </node>
-                <node concept="37vLTw" id="54i3Fxd17d1" role="3uHU7w">
-                  <ref role="3cqZAo" node="54i3Fxd17cY" resolve="result" />
-                </node>
-              </node>
-              <node concept="1eOMI4" id="54i3Fxd17de" role="3uHU7w">
-                <node concept="3K4zz7" id="54i3Fxd17df" role="1eOMHV">
-                  <node concept="3cmrfG" id="54i3Fxd17dg" role="3K4GZi">
-                    <property role="3cmrfH" value="0" />
-                  </node>
-                  <node concept="3y3z36" id="54i3Fxd17dh" role="3K4Cdx">
-                    <node concept="37vLTw" id="5uFPQ7B$wJh" role="3uHU7B">
-                      <ref role="3cqZAo" node="54i3FxcZMvF" resolve="id" />
-                    </node>
-                    <node concept="10Nm6u" id="54i3Fxd17di" role="3uHU7w" />
-                  </node>
-                  <node concept="2OqwBi" id="54i3Fxd17dj" role="3K4E3e">
-                    <node concept="2YIFZM" id="54i3Fxd17dk" role="2Oq$k0">
-                      <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                      <node concept="37vLTw" id="5uFPQ7B$wL3" role="37wK5m">
-                        <ref role="3cqZAo" node="54i3FxcZMvF" resolve="id" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="54i3Fxd17dl" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.hashCode():int" resolve="hashCode" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="54i3Fxd17dq" role="3cqZAp">
-          <node concept="37vLTI" id="54i3Fxd17dr" role="3clFbG">
-            <node concept="37vLTw" id="54i3Fxd17ds" role="37vLTJ">
-              <ref role="3cqZAo" node="54i3Fxd17cY" resolve="result" />
-            </node>
-            <node concept="3cpWs3" id="54i3Fxd17dt" role="37vLTx">
-              <node concept="17qRlL" id="54i3Fxd1hT$" role="3uHU7w">
-                <node concept="3cmrfG" id="54i3Fxd1hTP" role="3uHU7B">
-                  <property role="3cmrfH" value="37" />
-                </node>
-                <node concept="37vLTw" id="54i3Fxd17dp" role="3uHU7w">
-                  <ref role="3cqZAo" node="54i3FxcZMvI" resolve="arity" />
-                </node>
-              </node>
-              <node concept="17qRlL" id="54i3Fxd17dm" role="3uHU7B">
-                <node concept="3cmrfG" id="54i3Fxd17dn" role="3uHU7B">
-                  <property role="3cmrfH" value="31" />
-                </node>
-                <node concept="37vLTw" id="54i3Fxd17do" role="3uHU7w">
-                  <ref role="3cqZAo" node="54i3Fxd17cY" resolve="result" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="54i3Fxd17du" role="3cqZAp">
-          <node concept="37vLTw" id="54i3Fxd17dv" role="3clFbG">
-            <ref role="3cqZAo" node="54i3Fxd17cY" resolve="result" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="54i3Fxd17cW" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7B$tTa" role="jymVt" />
-    <node concept="3clFb_" id="54i3Fxd17bK" role="jymVt">
-      <property role="TrG5h" value="equals" />
-      <node concept="10P_77" id="54i3Fxd17bL" role="3clF45" />
-      <node concept="3Tm1VV" id="54i3Fxd17bM" role="1B3o_S" />
-      <node concept="3clFbS" id="54i3Fxd17bN" role="3clF47">
-        <node concept="3clFbJ" id="54i3Fxd17bO" role="3cqZAp">
-          <node concept="3clFbS" id="54i3Fxd17bP" role="3clFbx">
-            <node concept="3cpWs6" id="54i3Fxd17bQ" role="3cqZAp">
-              <node concept="3clFbT" id="54i3Fxd17bR" role="3cqZAk">
-                <property role="3clFbU" value="true" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="54i3Fxd17bS" role="3clFbw">
-            <node concept="Xjq3P" id="54i3Fxd17bJ" role="3uHU7B" />
-            <node concept="37vLTw" id="54i3Fxd17bT" role="3uHU7w">
-              <ref role="3cqZAo" node="54i3Fxd17cg" resolve="o" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="54i3Fxd17bU" role="3cqZAp">
-          <node concept="3clFbS" id="54i3Fxd17bV" role="3clFbx">
-            <node concept="3cpWs6" id="54i3Fxd17bW" role="3cqZAp">
-              <node concept="3clFbT" id="54i3Fxd17bX" role="3cqZAk">
-                <property role="3clFbU" value="false" />
-              </node>
-            </node>
-          </node>
-          <node concept="22lmx$" id="54i3Fxd17bY" role="3clFbw">
-            <node concept="3clFbC" id="54i3Fxd17bZ" role="3uHU7B">
-              <node concept="37vLTw" id="54i3Fxd17c0" role="3uHU7B">
-                <ref role="3cqZAo" node="54i3Fxd17cg" resolve="o" />
-              </node>
-              <node concept="10Nm6u" id="54i3Fxd17c1" role="3uHU7w" />
-            </node>
-            <node concept="3y3z36" id="54i3Fxd17c2" role="3uHU7w">
-              <node concept="2OqwBi" id="54i3Fxd17c3" role="3uHU7B">
-                <node concept="Xjq3P" id="54i3Fxd17c4" role="2Oq$k0" />
-                <node concept="liA8E" id="54i3Fxd17c5" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="54i3Fxd17c6" role="3uHU7w">
-                <node concept="37vLTw" id="54i3Fxd17c7" role="2Oq$k0">
-                  <ref role="3cqZAo" node="54i3Fxd17cg" resolve="o" />
-                </node>
-                <node concept="liA8E" id="54i3Fxd17c8" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="54i3Fxd17c9" role="3cqZAp" />
-        <node concept="3cpWs8" id="54i3Fxd17ca" role="3cqZAp">
-          <node concept="3cpWsn" id="54i3Fxd17cb" role="3cpWs9">
-            <property role="TrG5h" value="that" />
-            <node concept="3uibUv" id="5uFPQ7B$x_B" role="1tU5fm">
-              <ref role="3uigEE" node="5uFPQ7B$mzX" resolve="Symbol" />
-            </node>
-            <node concept="10QFUN" id="54i3Fxd17cd" role="33vP2m">
-              <node concept="3uibUv" id="5uFPQ7B$xEk" role="10QFUM">
-                <ref role="3uigEE" node="5uFPQ7B$mzX" resolve="Symbol" />
-              </node>
-              <node concept="37vLTw" id="54i3Fxd17cf" role="10QFUP">
-                <ref role="3cqZAo" node="54i3Fxd17cg" resolve="o" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="54i3Fxd17cq" role="3cqZAp">
-          <node concept="3clFbS" id="54i3Fxd17cr" role="3clFbx">
-            <node concept="3cpWs6" id="54i3Fxd17cs" role="3cqZAp">
-              <node concept="3clFbT" id="54i3Fxd17ct" role="3cqZAk">
-                <property role="3clFbU" value="false" />
-              </node>
-            </node>
-          </node>
-          <node concept="3K4zz7" id="54i3Fxd17cu" role="3clFbw">
-            <node concept="3fqX7Q" id="54i3Fxd17cv" role="3K4E3e">
-              <node concept="2OqwBi" id="54i3Fxd17cw" role="3fr31v">
-                <node concept="liA8E" id="54i3Fxd17cx" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
-                  <node concept="2OqwBi" id="54i3Fxd17cy" role="37wK5m">
-                    <node concept="37vLTw" id="54i3Fxd17cj" role="2Oq$k0">
-                      <ref role="3cqZAo" node="54i3Fxd17cb" resolve="that" />
-                    </node>
-                    <node concept="liA8E" id="5uFPQ7B$pQg" role="2OqNvi">
-                      <ref role="37wK5l" node="54i3FxcZMvt" resolve="id" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTw" id="5uFPQ7B$y3J" role="2Oq$k0">
-                  <ref role="3cqZAo" node="54i3FxcZMvF" resolve="id" />
-                </node>
-              </node>
-            </node>
-            <node concept="3y3z36" id="54i3Fxd17cA" role="3K4Cdx">
-              <node concept="10Nm6u" id="54i3Fxd17cB" role="3uHU7w" />
-              <node concept="37vLTw" id="5uFPQ7B$y6_" role="3uHU7B">
-                <ref role="3cqZAo" node="54i3FxcZMvF" resolve="id" />
-              </node>
-            </node>
-            <node concept="3y3z36" id="54i3Fxd17cC" role="3K4GZi">
-              <node concept="10Nm6u" id="54i3Fxd17cD" role="3uHU7w" />
-              <node concept="2OqwBi" id="54i3Fxd17cE" role="3uHU7B">
-                <node concept="37vLTw" id="54i3Fxd17cF" role="2Oq$k0">
-                  <ref role="3cqZAo" node="54i3Fxd17cb" resolve="that" />
-                </node>
-                <node concept="2OwXpG" id="5uFPQ7B$xOb" role="2OqNvi">
-                  <ref role="2Oxat5" node="54i3FxcZMvF" resolve="id" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="54i3Fxd17cI" role="3cqZAp">
-          <node concept="3y3z36" id="54i3Fxd17cJ" role="3clFbw">
-            <node concept="2OqwBi" id="5uFPQ7B$xoZ" role="3uHU7w">
-              <node concept="37vLTw" id="54i3Fxd17cL" role="2Oq$k0">
-                <ref role="3cqZAo" node="54i3Fxd17cb" resolve="that" />
-              </node>
-              <node concept="2OwXpG" id="5uFPQ7B$ytS" role="2OqNvi">
-                <ref role="2Oxat5" node="54i3FxcZMvI" resolve="arity" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="54i3Fxd17cH" role="3uHU7B">
-              <ref role="3cqZAo" node="54i3FxcZMvI" resolve="arity" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="54i3Fxd17cM" role="3clFbx">
-            <node concept="3cpWs6" id="54i3Fxd17cN" role="3cqZAp">
-              <node concept="3clFbT" id="54i3Fxd17cO" role="3cqZAk">
-                <property role="3clFbU" value="false" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="54i3Fxd17cP" role="3cqZAp" />
-        <node concept="3clFbF" id="54i3Fxd17cQ" role="3cqZAp">
-          <node concept="3clFbT" id="54i3Fxd17cR" role="3clFbG">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="54i3Fxd17cg" role="3clF46">
-        <property role="TrG5h" value="o" />
-        <node concept="3uibUv" id="54i3Fxd17ch" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="54i3Fxd17ci" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7B$vaH" role="jymVt" />
-    <node concept="312cEg" id="54i3FxcZMvF" role="jymVt">
-      <property role="TrG5h" value="id" />
-      <node concept="3Tm6S6" id="54i3FxcZMvG" role="1B3o_S" />
-      <node concept="17QB3L" id="54i3FxcZMvH" role="1tU5fm" />
-    </node>
-    <node concept="312cEg" id="54i3FxcZMvI" role="jymVt">
-      <property role="TrG5h" value="arity" />
-      <node concept="3Tm6S6" id="54i3FxcZMvJ" role="1B3o_S" />
-      <node concept="10Oyi0" id="54i3FxcZMvK" role="1tU5fm" />
-    </node>
-  </node>
-  <node concept="312cEu" id="54i3FxcZHHF">
-    <property role="TrG5h" value="ConstraintSymbol" />
-    <node concept="2tJIrI" id="54i3FxcZQ1e" role="jymVt" />
-    <node concept="2YIFZL" id="54i3FxcZQAb" role="jymVt">
-      <property role="TrG5h" value="symbol" />
-      <node concept="37vLTG" id="54i3FxcZQYa" role="3clF46">
-        <property role="TrG5h" value="id" />
-        <node concept="17QB3L" id="54i3FxcZQZ9" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="54i3FxcZR22" role="3clF46">
-        <property role="TrG5h" value="arity" />
-        <node concept="10Oyi0" id="54i3FxcZR6r" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="54i3FxcZQQ8" role="3clF45">
-        <ref role="3uigEE" node="54i3FxcZHHF" resolve="ConstraintSymbol" />
-      </node>
-      <node concept="3Tm1VV" id="54i3FxcZQAe" role="1B3o_S" />
-      <node concept="3clFbS" id="54i3FxcZQAf" role="3clF47">
-        <node concept="3clFbF" id="54i3FxcZR8B" role="3cqZAp">
-          <node concept="2ShNRf" id="54i3FxcZR8_" role="3clFbG">
-            <node concept="1pGfFk" id="54i3FxcZSuF" role="2ShVmc">
-              <ref role="37wK5l" node="54i3FxcZMv0" resolve="ConstraintSymbol" />
-              <node concept="37vLTw" id="54i3FxcZVfR" role="37wK5m">
-                <ref role="3cqZAo" node="54i3FxcZQYa" resolve="id" />
-              </node>
-              <node concept="37vLTw" id="54i3FxcZZrc" role="37wK5m">
-                <ref role="3cqZAo" node="54i3FxcZR22" resolve="arity" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7BMJYr" role="jymVt" />
-    <node concept="3clFbW" id="54i3FxcZMv0" role="jymVt">
-      <node concept="37vLTG" id="54i3FxcZMv1" role="3clF46">
-        <property role="TrG5h" value="id" />
-        <node concept="17QB3L" id="54i3FxcZMv2" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="54i3FxcZMv3" role="3clF46">
-        <property role="TrG5h" value="arity" />
-        <node concept="10Oyi0" id="54i3FxcZMv4" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="54i3FxcZMv5" role="3clF45" />
-      <node concept="3Tm1VV" id="5uFPQ7CgjUp" role="1B3o_S" />
-      <node concept="3clFbS" id="54i3FxcZMv7" role="3clF47">
-        <node concept="XkiVB" id="5uFPQ7B$pk2" role="3cqZAp">
-          <ref role="37wK5l" node="5uFPQ7B$oXn" resolve="Symbol" />
-          <node concept="37vLTw" id="5uFPQ7B$pXy" role="37wK5m">
-            <ref role="3cqZAo" node="54i3FxcZMv1" resolve="id" />
-          </node>
-          <node concept="37vLTw" id="5uFPQ7B$w2z" role="37wK5m">
-            <ref role="3cqZAo" node="54i3FxcZMv3" resolve="arity" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="30XHGaPaLYs" role="jymVt" />
-    <node concept="3clFb_" id="54i3Fxd6LvH" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="toString" />
-      <property role="DiZV1" value="false" />
-      <property role="IEkAT" value="false" />
-      <node concept="3Tm1VV" id="54i3Fxd6LvI" role="1B3o_S" />
-      <node concept="17QB3L" id="6tTPqJZ120k" role="3clF45" />
-      <node concept="3clFbS" id="54i3Fxd6LvL" role="3clF47">
-        <node concept="3clFbF" id="54i3Fxd6ORN" role="3cqZAp">
-          <node concept="3cpWs3" id="5uFPQ7B$$Ji" role="3clFbG">
-            <node concept="1rXfSq" id="5uFPQ7B$$Lw" role="3uHU7w">
-              <ref role="37wK5l" node="54i3FxcZMv$" resolve="arity" />
-            </node>
-            <node concept="3cpWs3" id="5uFPQ7B$$FI" role="3uHU7B">
-              <node concept="1rXfSq" id="5uFPQ7B$pFA" role="3uHU7B">
-                <ref role="37wK5l" node="54i3FxcZMvt" resolve="id" />
-              </node>
-              <node concept="Xl_RD" id="5uFPQ7B$$G1" role="3uHU7w">
-                <property role="Xl_RC" value="/" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="54i3Fxd6LvM" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="54i3FxcZIpZ" role="jymVt" />
-    <node concept="3Tm1VV" id="54i3FxcZHHG" role="1B3o_S" />
-    <node concept="3UR2Jj" id="30XHGaPaDFt" role="lGtFl">
-      <node concept="TZ5HA" id="30XHGaPaDFu" role="TZ5H$">
-        <node concept="1dT_AC" id="30XHGaPaDFv" role="1dT_Ay">
-          <property role="1dT_AB" value="TODO: move to the constraint model" />
-        </node>
-      </node>
-    </node>
-    <node concept="3uibUv" id="5uFPQ7B$nqr" role="1zkMxy">
-      <ref role="3uigEE" node="5uFPQ7B$mzX" resolve="Symbol" />
-    </node>
-  </node>
-  <node concept="312cEu" id="5uFPQ7B$$3f">
-    <property role="TrG5h" value="PredicateSymbol" />
-    <node concept="2tJIrI" id="5uFPQ7B$$fL" role="jymVt" />
-    <node concept="3clFbW" id="5uFPQ7B$$fT" role="jymVt">
-      <node concept="3cqZAl" id="5uFPQ7B$$fV" role="3clF45" />
-      <node concept="3Tm1VV" id="5uFPQ7B$$fW" role="1B3o_S" />
-      <node concept="3clFbS" id="5uFPQ7B$$fX" role="3clF47">
-        <node concept="XkiVB" id="5uFPQ7C8Aan" role="3cqZAp">
-          <ref role="37wK5l" node="5uFPQ7B$oXn" resolve="Symbol" />
-          <node concept="37vLTw" id="5uFPQ7C8AbT" role="37wK5m">
-            <ref role="3cqZAo" node="5uFPQ7B$$ga" resolve="id" />
-          </node>
-          <node concept="37vLTw" id="5uFPQ7C8Ad2" role="37wK5m">
-            <ref role="3cqZAo" node="5uFPQ7B$$k9" resolve="arity" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="5uFPQ7B$$ga" role="3clF46">
-        <property role="TrG5h" value="id" />
-        <node concept="17QB3L" id="5uFPQ7B$$g9" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="5uFPQ7B$$k9" role="3clF46">
-        <property role="TrG5h" value="arity" />
-        <node concept="10Oyi0" id="5uFPQ7B$$o8" role="1tU5fm" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7BMI$z" role="jymVt" />
-    <node concept="3clFb_" id="5uFPQ7B$$w_" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="toString" />
-      <property role="DiZV1" value="false" />
-      <property role="IEkAT" value="false" />
-      <node concept="3Tm1VV" id="5uFPQ7B$$wA" role="1B3o_S" />
-      <node concept="17QB3L" id="5uFPQ7B$$wB" role="3clF45" />
-      <node concept="3clFbS" id="5uFPQ7B$$wC" role="3clF47">
-        <node concept="3clFbF" id="5uFPQ7B$$wD" role="3cqZAp">
-          <node concept="3cpWs3" id="5uFPQ7B$$XY" role="3clFbG">
-            <node concept="1rXfSq" id="5uFPQ7B$$ZY" role="3uHU7w">
-              <ref role="37wK5l" node="54i3FxcZMv$" resolve="arity" />
-            </node>
-            <node concept="3cpWs3" id="5uFPQ7B$$Pw" role="3uHU7B">
-              <node concept="1rXfSq" id="5uFPQ7B$$wE" role="3uHU7B">
-                <ref role="37wK5l" node="54i3FxcZMvt" resolve="id" />
-              </node>
-              <node concept="Xl_RD" id="5uFPQ7B$$QF" role="3uHU7w">
-                <property role="Xl_RC" value="()/" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5uFPQ7B$$wF" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7B$$w9" role="jymVt" />
-    <node concept="3Tm1VV" id="5uFPQ7B$$3g" role="1B3o_S" />
-    <node concept="3uibUv" id="5uFPQ7Cb2zZ" role="1zkMxy">
-      <ref role="3uigEE" node="5uFPQ7B$mzX" resolve="Symbol" />
-    </node>
-  </node>
-  <node concept="312cEu" id="5uFPQ7BMJeJ">
-    <property role="TrG5h" value="JavaPredicateSymbol" />
-    <node concept="2tJIrI" id="1ggxSI7rFeb" role="jymVt" />
-    <node concept="Wx3nA" id="1ggxSI7vUYU" role="jymVt">
-      <property role="TrG5h" value="EXPRESSION0" />
-      <property role="3TUv4t" value="true" />
-      <node concept="3Tm1VV" id="1ggxSI7vUZA" role="1B3o_S" />
-      <node concept="3uibUv" id="1ggxSI7vUZH" role="1tU5fm">
-        <ref role="3uigEE" node="5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
-      </node>
-      <node concept="2ShNRf" id="1ggxSI7vV0D" role="33vP2m">
-        <node concept="1pGfFk" id="1ggxSI7vV0C" role="2ShVmc">
-          <ref role="37wK5l" node="5uFPQ7BMJfy" resolve="JavaPredicateSymbol" />
-          <node concept="3cmrfG" id="1ggxSI7vV15" role="37wK5m">
-            <property role="3cmrfH" value="1" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1ggxSI7vV8K" role="jymVt" />
-    <node concept="Wx3nA" id="1ggxSI7vV1O" role="jymVt">
-      <property role="TrG5h" value="EXPRESSION1" />
-      <property role="3TUv4t" value="true" />
-      <node concept="3Tm1VV" id="1ggxSI7vV1P" role="1B3o_S" />
-      <node concept="3uibUv" id="1ggxSI7vV1Q" role="1tU5fm">
-        <ref role="3uigEE" node="5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
-      </node>
-      <node concept="2ShNRf" id="1ggxSI7vV1R" role="33vP2m">
-        <node concept="1pGfFk" id="1ggxSI7vV1S" role="2ShVmc">
-          <ref role="37wK5l" node="5uFPQ7BMJfy" resolve="JavaPredicateSymbol" />
-          <node concept="3cmrfG" id="1ggxSI7vV1T" role="37wK5m">
-            <property role="3cmrfH" value="2" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1ggxSI7vVaG" role="jymVt" />
-    <node concept="Wx3nA" id="1ggxSI7vV3x" role="jymVt">
-      <property role="TrG5h" value="EXPRESSION2" />
-      <property role="3TUv4t" value="true" />
-      <node concept="3Tm1VV" id="1ggxSI7vV3y" role="1B3o_S" />
-      <node concept="3uibUv" id="1ggxSI7vV3z" role="1tU5fm">
-        <ref role="3uigEE" node="5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
-      </node>
-      <node concept="2ShNRf" id="1ggxSI7vV3$" role="33vP2m">
-        <node concept="1pGfFk" id="1ggxSI7vV3_" role="2ShVmc">
-          <ref role="37wK5l" node="5uFPQ7BMJfy" resolve="JavaPredicateSymbol" />
-          <node concept="3cmrfG" id="1ggxSI7vV3A" role="37wK5m">
-            <property role="3cmrfH" value="3" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1ggxSI7vVcD" role="jymVt" />
-    <node concept="Wx3nA" id="1ggxSI7vV5$" role="jymVt">
-      <property role="TrG5h" value="EXPRESSION3" />
-      <property role="3TUv4t" value="true" />
-      <node concept="3Tm1VV" id="1ggxSI7vV5_" role="1B3o_S" />
-      <node concept="3uibUv" id="1ggxSI7vV5A" role="1tU5fm">
-        <ref role="3uigEE" node="5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
-      </node>
-      <node concept="2ShNRf" id="1ggxSI7vV5B" role="33vP2m">
-        <node concept="1pGfFk" id="1ggxSI7vV5C" role="2ShVmc">
-          <ref role="37wK5l" node="5uFPQ7BMJfy" resolve="JavaPredicateSymbol" />
-          <node concept="3cmrfG" id="1ggxSI7vV5D" role="37wK5m">
-            <property role="3cmrfH" value="4" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1ggxSI7vUXN" role="jymVt" />
-    <node concept="Wx3nA" id="1ggxSI7rFbi" role="jymVt">
-      <property role="3TUv4t" value="true" />
-      <property role="TrG5h" value="EXPRESSION" />
-      <node concept="3Tm6S6" id="1ggxSI7rFbf" role="1B3o_S" />
-      <node concept="17QB3L" id="1ggxSI7rFbg" role="1tU5fm" />
-      <node concept="Xl_RD" id="1ggxSI7rFbh" role="33vP2m">
-        <property role="Xl_RC" value="expression" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7BMJfq" role="jymVt" />
-    <node concept="Wx3nA" id="2UGjFq4gN_5" role="jymVt">
-      <property role="TrG5h" value="KNOWN_SYMBOLS" />
-      <node concept="3Tm6S6" id="2UGjFq4gN_7" role="1B3o_S" />
-      <node concept="10Q1$e" id="2UGjFq4gNBB" role="1tU5fm">
-        <node concept="3uibUv" id="2UGjFq4gNBm" role="10Q1$1">
-          <ref role="3uigEE" node="5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
-        </node>
-      </node>
-      <node concept="2BsdOp" id="2UGjFq4gNCR" role="33vP2m">
-        <node concept="37vLTw" id="2UGjFq4gNDU" role="2BsfMF">
-          <ref role="3cqZAo" node="1ggxSI7vUYU" resolve="EXPRESSION0" />
-        </node>
-        <node concept="37vLTw" id="2UGjFq4gNGm" role="2BsfMF">
-          <ref role="3cqZAo" node="1ggxSI7vV1O" resolve="EXPRESSION1" />
-        </node>
-        <node concept="37vLTw" id="2UGjFq4gNIf" role="2BsfMF">
-          <ref role="3cqZAo" node="1ggxSI7vV3x" resolve="EXPRESSION2" />
-        </node>
-        <node concept="37vLTw" id="2UGjFq4gNKk" role="2BsfMF">
-          <ref role="3cqZAo" node="1ggxSI7vV5$" resolve="EXPRESSION3" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2UGjFq4gNuX" role="jymVt" />
-    <node concept="2YIFZL" id="2UGjFq4gNPT" role="jymVt">
-      <property role="TrG5h" value="withArity" />
-      <node concept="37vLTG" id="2UGjFq4gNT1" role="3clF46">
-        <property role="TrG5h" value="arity" />
-        <node concept="10Oyi0" id="2UGjFq4gNTi" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="2UGjFq4gNSY" role="3clF45">
-        <ref role="3uigEE" node="5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
-      </node>
-      <node concept="3Tm1VV" id="2UGjFq4gNPW" role="1B3o_S" />
-      <node concept="3clFbS" id="2UGjFq4gNPX" role="3clF47">
-        <node concept="3clFbF" id="2UGjFq4gNUq" role="3cqZAp">
-          <node concept="AH0OO" id="2UGjFq4gNVG" role="3clFbG">
-            <node concept="37vLTw" id="2UGjFq4gNX3" role="AHEQo">
-              <ref role="3cqZAo" node="2UGjFq4gNT1" resolve="arity" />
-            </node>
-            <node concept="37vLTw" id="2UGjFq4gNUp" role="AHHXb">
-              <ref role="3cqZAo" node="2UGjFq4gN_5" resolve="KNOWN_SYMBOLS" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2UGjFq4gNMW" role="jymVt" />
-    <node concept="3clFbW" id="5uFPQ7BMJfy" role="jymVt">
-      <node concept="37vLTG" id="5uFPQ7BMJvR" role="3clF46">
-        <property role="TrG5h" value="arity" />
-        <node concept="10Oyi0" id="5uFPQ7BMJwr" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="5uFPQ7BMJf$" role="3clF45" />
-      <node concept="3Tm6S6" id="2UGjFq4gNn6" role="1B3o_S" />
-      <node concept="3clFbS" id="5uFPQ7BMJfA" role="3clF47">
-        <node concept="XkiVB" id="5uFPQ7BMJhW" role="3cqZAp">
-          <ref role="37wK5l" node="5uFPQ7B$$fT" resolve="PredicateSymbol" />
-          <node concept="37vLTw" id="1ggxSI7rFbl" role="37wK5m">
-            <ref role="3cqZAo" node="1ggxSI7rFbi" resolve="EXPRESSION" />
-          </node>
-          <node concept="37vLTw" id="5uFPQ7BMJxB" role="37wK5m">
-            <ref role="3cqZAo" node="5uFPQ7BMJvR" resolve="arity" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1ggxSI7s$b5" role="jymVt" />
-    <node concept="3Tm1VV" id="5uFPQ7BMJeK" role="1B3o_S" />
-    <node concept="3uibUv" id="5uFPQ7BMJfe" role="1zkMxy">
-      <ref role="3uigEE" node="5uFPQ7B$$3f" resolve="PredicateSymbol" />
-    </node>
-  </node>
-  <node concept="3HP615" id="2UGjFq4fSyv">
-    <property role="TrG5h" value="PredicateFactory" />
-    <node concept="2tJIrI" id="2UGjFq4fSy_" role="jymVt" />
-    <node concept="3clFb_" id="2UGjFq4fSE9" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="predicate" />
-      <node concept="37vLTG" id="2UGjFq4fSED" role="3clF46">
-        <property role="TrG5h" value="predicateSymbol" />
-        <node concept="3uibUv" id="2UGjFq4fSFd" role="1tU5fm">
-          <ref role="3uigEE" node="5uFPQ7B$$3f" resolve="PredicateSymbol" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2UGjFq4fSFr" role="3clF46">
-        <property role="TrG5h" value="args" />
-        <node concept="8X2XB" id="2UGjFq4fSGv" role="1tU5fm">
-          <node concept="3uibUv" id="2UGjFq4fSG3" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="2UGjFq4gUNm" role="3clF45">
-        <ref role="3uigEE" node="6Kcfpq7Bj7q" resolve="Predicate" />
-      </node>
-      <node concept="3Tm1VV" id="2UGjFq4fSEc" role="1B3o_S" />
-      <node concept="3clFbS" id="2UGjFq4fSEd" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="2UGjFq4fSyE" role="jymVt" />
-    <node concept="3Tm1VV" id="2UGjFq4fSyw" role="1B3o_S" />
-  </node>
-</model>
-
diff --git a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
index 04d77ae1..96c789e4 100644
--- a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
+++ b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
@@ -13,7 +13,7 @@
     <import index="n4y8" ref="b189d6c6-9397-4d64-88af-1ac73760a4f5/java:org.mockito(jetbrains.mps.logic.test/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
     <import index="98" ref="b189d6c6-9397-4d64-88af-1ac73760a4f5/java:org.mockito.stubbing(jetbrains.mps.logic.test/)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
@@ -2886,7 +2886,7 @@
         <node concept="10P_77" id="2DKqMqOqLTM" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="2DKqMqOqkb3" role="3clF45">
-        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
         <node concept="3uibUv" id="2DKqMqOquKp" role="11_B2D">
           <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
@@ -2925,7 +2925,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="2DKqMqOq_PE" role="3clF45">
-        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
         <node concept="3uibUv" id="2DKqMqOq_PF" role="11_B2D">
           <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
@@ -2962,7 +2962,7 @@
             <node concept="3cpWsn" id="2DKqMqOqvLQ" role="3cpWs9">
               <property role="TrG5h" value="wildcard" />
               <node concept="3uibUv" id="2DKqMqOqvLI" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqvLL" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -2979,7 +2979,7 @@
             <node concept="3cpWsn" id="2DKqMqOqw8M" role="3cpWs9">
               <property role="TrG5h" value="anon1" />
               <node concept="3uibUv" id="2DKqMqOqw8y" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqw8_" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -2996,7 +2996,7 @@
             <node concept="3cpWsn" id="2DKqMqOqzLa" role="3cpWs9">
               <property role="TrG5h" value="anon2" />
               <node concept="3uibUv" id="2DKqMqOqzLb" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqzLc" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -3026,7 +3026,7 @@
                 <ref role="3cqZAo" node="2DKqMqOqvLQ" resolve="wildcard" />
               </node>
               <node concept="liA8E" id="5kEUewdxCBF" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
             <node concept="2OqwBi" id="5kEUewdxCDl" role="3tpDZA">
@@ -3034,7 +3034,7 @@
                 <ref role="3cqZAo" node="2DKqMqOqw8M" resolve="anon1" />
               </node>
               <node concept="liA8E" id="5kEUewdxCGe" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
           </node>
@@ -3044,7 +3044,7 @@
                 <ref role="3cqZAo" node="2DKqMqOqw8M" resolve="anon1" />
               </node>
               <node concept="liA8E" id="5kEUewdxCNz" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
             <node concept="2OqwBi" id="5kEUewdxCPd" role="3tpDZA">
@@ -3052,7 +3052,7 @@
                 <ref role="3cqZAo" node="2DKqMqOqzLa" resolve="anon2" />
               </node>
               <node concept="liA8E" id="5kEUewdxCUU" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
           </node>
@@ -3067,7 +3067,7 @@
             <node concept="3cpWsn" id="2DKqMqOqEKK" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="2DKqMqOqEKD" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqEKG" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -3091,7 +3091,7 @@
             <node concept="3cpWsn" id="2DKqMqOqEO9" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="2DKqMqOqEOa" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqEOb" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -3115,7 +3115,7 @@
             <node concept="3cpWsn" id="2DKqMqOqFhe" role="3cpWs9">
               <property role="TrG5h" value="c" />
               <node concept="3uibUv" id="2DKqMqOqFhf" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqFhg" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -3142,7 +3142,7 @@
             <node concept="3cpWsn" id="5kEUewdxWe5" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="5kEUewdxWdZ" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="5kEUewdxWe2" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -3159,7 +3159,7 @@
             <node concept="3cpWsn" id="5kEUewdy0lU" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="5kEUewdy0lV" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="5kEUewdy0lW" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -3189,7 +3189,7 @@
                 <ref role="3cqZAo" node="2DKqMqOqEKK" resolve="a" />
               </node>
               <node concept="liA8E" id="5kEUewdxFDZ" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
             <node concept="2OqwBi" id="5kEUewdxFFM" role="3tpDZA">
@@ -3197,7 +3197,7 @@
                 <ref role="3cqZAo" node="2DKqMqOqEO9" resolve="b" />
               </node>
               <node concept="liA8E" id="5kEUewdxFMZ" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
           </node>
@@ -3251,7 +3251,7 @@
                   <ref role="3cqZAo" node="2DKqMqOqEKK" resolve="a" />
                 </node>
                 <node concept="liA8E" id="5kEUewdxPYk" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
                 </node>
               </node>
               <node concept="liA8E" id="2DKqMqOqFDj" role="2OqNvi">
@@ -3261,7 +3261,7 @@
                     <ref role="3cqZAo" node="2DKqMqOqFhe" resolve="c" />
                   </node>
                   <node concept="liA8E" id="5kEUewdxQ6z" role="2OqNvi">
-                    <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                    <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
                   </node>
                 </node>
               </node>
@@ -3287,7 +3287,7 @@
                   <ref role="3cqZAo" node="2DKqMqOqEKK" resolve="a" />
                 </node>
                 <node concept="liA8E" id="5kEUewdxXjx" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
                 </node>
               </node>
               <node concept="liA8E" id="5kEUewdxXxg" role="2OqNvi">
@@ -3297,7 +3297,7 @@
                     <ref role="3cqZAo" node="5kEUewdxWe5" resolve="x" />
                   </node>
                   <node concept="liA8E" id="5kEUewdxXDu" role="2OqNvi">
-                    <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                    <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
                   </node>
                 </node>
               </node>
@@ -3342,7 +3342,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="6yEjedm6GEk" role="3clF45">
-        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
         <node concept="3uibUv" id="6yEjedm6GEG" role="11_B2D">
           <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
@@ -3373,7 +3373,7 @@
             <node concept="3cpWsn" id="6yEjedm6PYc" role="3cpWs9">
               <property role="TrG5h" value="Node" />
               <node concept="3uibUv" id="6yEjedm6PY7" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6PYa" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -3465,7 +3465,7 @@
             <node concept="3cpWsn" id="6yEjedm6Hog" role="3cpWs9">
               <property role="TrG5h" value="Node1" />
               <node concept="3uibUv" id="6yEjedm6Hob" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6Hoe" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -3490,7 +3490,7 @@
             <node concept="3cpWsn" id="6yEjedm6QC3" role="3cpWs9">
               <property role="TrG5h" value="Node2" />
               <node concept="3uibUv" id="6yEjedm6QBT" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6QBW" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -3615,7 +3615,7 @@
             <node concept="3cpWsn" id="6yEjedm6IgR" role="3cpWs9">
               <property role="TrG5h" value="Node" />
               <node concept="3uibUv" id="6yEjedm6IgL" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6IgO" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -3727,7 +3727,7 @@
             <node concept="3cpWsn" id="6yEjedm6JaM" role="3cpWs9">
               <property role="TrG5h" value="Node" />
               <node concept="3uibUv" id="6yEjedm6JaG" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6JaJ" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -3839,7 +3839,7 @@
             <node concept="3cpWsn" id="6yEjedm6JV3" role="3cpWs9">
               <property role="TrG5h" value="Node" />
               <node concept="3uibUv" id="6yEjedm6JUY" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6JV1" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -3917,7 +3917,7 @@
             <node concept="3cpWsn" id="6yEjedm6Kt$" role="3cpWs9">
               <property role="TrG5h" value="Role" />
               <node concept="3uibUv" id="6yEjedm6Ktu" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6Ktx" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -4011,7 +4011,7 @@
             <node concept="3cpWsn" id="6yEjedm6L2x" role="3cpWs9">
               <property role="TrG5h" value="Role" />
               <node concept="3uibUv" id="6yEjedm6L2s" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6L2v" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
diff --git a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
index b30c576c..c0d70970 100644
--- a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
+++ b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
@@ -11,9 +11,9 @@
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
-    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
-    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
+    <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
     <import index="omn0" ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)" />
@@ -152,8 +152,8 @@
       <node concept="3clFbS" id="7ISVfSIf0n" role="3clF47">
         <node concept="3clFbF" id="7ISVfSIf2T" role="3cqZAp">
           <node concept="2YIFZM" id="7ISVfSIf4g" role="3clFbG">
-            <ref role="37wK5l" to="qrld:5uFPQ7Bwt$y" resolve="setBackend" />
-            <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+            <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+            <ref role="37wK5l" to="w7la:~EvaluationSession.setBackend(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Backend):void" resolve="setBackend" />
             <node concept="37vLTw" id="5jPBdK_KfE" role="37wK5m">
               <ref role="3cqZAo" node="5jPBdK_KfB" resolve="ourBackend" />
             </node>
@@ -169,8 +169,8 @@
       <node concept="3clFbS" id="5jPBdK_KqE" role="3clF47">
         <node concept="3clFbF" id="5jPBdK_KqF" role="3cqZAp">
           <node concept="2YIFZM" id="5jPBdK_KEq" role="3clFbG">
-            <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-            <ref role="37wK5l" to="qrld:5jPBdK_JeZ" resolve="clearBackend" />
+            <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+            <ref role="37wK5l" to="w7la:~EvaluationSession.clearBackend(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Backend):void" resolve="clearBackend" />
             <node concept="37vLTw" id="5jPBdK_KEr" role="37wK5m">
               <ref role="3cqZAo" node="5jPBdK_KfB" resolve="ourBackend" />
             </node>
@@ -208,7 +208,7 @@
       <node concept="37vLTG" id="5jPBdK_qV5" role="3clF46">
         <property role="TrG5h" value="sessionSolver" />
         <node concept="3uibUv" id="5jPBdK_qV4" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
       </node>
     </node>
@@ -217,7 +217,7 @@
       <property role="TrG5h" value="sessionSolver" />
       <property role="1EzhhJ" value="false" />
       <node concept="3uibUv" id="5jPBdK_dWB" role="3clF45">
-        <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
       </node>
       <node concept="3Tm1VV" id="5jPBdK_dWC" role="1B3o_S" />
       <node concept="3clFbS" id="5jPBdK_dWE" role="3clF47">
@@ -235,7 +235,7 @@
       <node concept="3uibUv" id="5jPBdK_dX2" role="3clF45">
         <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
         <node concept="3uibUv" id="5jPBdK_dX3" role="11_B2D">
-          <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
         </node>
       </node>
       <node concept="3Tm1VV" id="5jPBdK_dX4" role="1B3o_S" />
@@ -251,7 +251,7 @@
       <node concept="3uibUv" id="5jPBdK_dXa" role="3clF45">
         <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
         <node concept="3uibUv" id="5jPBdK_dXb" role="11_B2D">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3Tm1VV" id="5jPBdK_dXc" role="1B3o_S" />
@@ -267,13 +267,13 @@
       <node concept="37vLTG" id="5jPBdK_dXi" role="3clF46">
         <property role="TrG5h" value="symbol" />
         <node concept="3uibUv" id="5jPBdK_dXj" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
         </node>
       </node>
       <node concept="3uibUv" id="5jPBdK_dXk" role="3clF45">
         <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
         <node concept="3uibUv" id="5jPBdK_dXl" role="11_B2D">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3Tm1VV" id="5jPBdK_dXm" role="1B3o_S" />
@@ -289,13 +289,13 @@
       <property role="TrG5h" value="Config" />
       <node concept="3Tm1VV" id="5jPBdK_mRp" role="1B3o_S" />
       <node concept="3uibUv" id="5jPBdK_n1a" role="1zkMxy">
-        <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
+        <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
       </node>
       <node concept="3clFbW" id="6X5F0NgIsD1" role="jymVt">
         <node concept="37vLTG" id="6X5F0NgIsWe" role="3clF46">
           <property role="TrG5h" value="program" />
           <node concept="3uibUv" id="6X5F0NgIt0n" role="1tU5fm">
-            <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+            <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
           </node>
         </node>
         <node concept="3cqZAl" id="6X5F0NgIsD3" role="3clF45" />
@@ -323,12 +323,12 @@
           <property role="TrG5h" value="predicateSymbols" />
           <node concept="8X2XB" id="5jPBdK_npk" role="1tU5fm">
             <node concept="3uibUv" id="5jPBdK_npl" role="8Xvag">
-              <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+              <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
             </node>
           </node>
         </node>
         <node concept="3uibUv" id="5jPBdK_npm" role="3clF45">
-          <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
+          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
         </node>
         <node concept="3Tm1VV" id="5jPBdK_npn" role="1B3o_S" />
         <node concept="3clFbS" id="5jPBdK_npp" role="3clF47">
@@ -356,11 +356,11 @@
         <node concept="37vLTG" id="5jPBdK_npt" role="3clF46">
           <property role="TrG5h" value="computingTracer" />
           <node concept="3uibUv" id="5jPBdK_npu" role="1tU5fm">
-            <ref role="3uigEE" to="qrld:24Vro6cQnrj" resolve="EvaluationTrace" />
+            <ref role="3uigEE" to="w7la:~EvaluationTrace" resolve="EvaluationTrace" />
           </node>
         </node>
         <node concept="3uibUv" id="5jPBdK_npv" role="3clF45">
-          <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
+          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
         </node>
         <node concept="3Tm1VV" id="5jPBdK_npw" role="1B3o_S" />
         <node concept="3clFbS" id="5jPBdK_npy" role="3clF47">
@@ -383,7 +383,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="5jPBdK_npE" role="3clF45">
-          <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
+          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
         </node>
         <node concept="3Tm1VV" id="5jPBdK_npF" role="1B3o_S" />
         <node concept="3clFbS" id="5jPBdK_npH" role="3clF47">
@@ -398,11 +398,11 @@
         <node concept="37vLTG" id="2UGjFq4L4SD" role="3clF46">
           <property role="TrG5h" value="sessionSolver" />
           <node concept="3uibUv" id="2UGjFq4L4SE" role="1tU5fm">
-            <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+            <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
           </node>
         </node>
         <node concept="3uibUv" id="2UGjFq4L4SF" role="3clF45">
-          <ref role="3uigEE" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+          <ref role="3uigEE" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
         </node>
         <node concept="3Tm1VV" id="2UGjFq4L4SG" role="1B3o_S" />
         <node concept="3clFbS" id="2UGjFq4L4SI" role="3clF47">
@@ -426,7 +426,7 @@
                 <ref role="3cqZAo" node="2tcGHBEewJ_" resolve="csession" />
               </node>
               <node concept="liA8E" id="5jPBdK_Bhd" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:2tcGHBEeol1" resolve="init" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.init(jetbrains.mps.logic.reactor.program.PredicateSymbol...):void" resolve="init" />
                 <node concept="2OqwBi" id="2tcGHBEex4W" role="37wK5m">
                   <node concept="Xjq3P" id="2tcGHBEex4X" role="2Oq$k0" />
                   <node concept="2OwXpG" id="2tcGHBEex4Y" role="2OqNvi">
@@ -458,7 +458,7 @@
         <node concept="3Tm6S6" id="5jPBdK_qdC" role="1B3o_S" />
         <node concept="10Q1$e" id="5jPBdK_qn0" role="1tU5fm">
           <node concept="3uibUv" id="5jPBdK_qdF" role="10Q1$1">
-            <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+            <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
           </node>
         </node>
       </node>
@@ -466,7 +466,7 @@
         <property role="TrG5h" value="program" />
         <node concept="3Tm6S6" id="6X5F0NgIt2R" role="1B3o_S" />
         <node concept="3uibUv" id="6X5F0NgIt2T" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+          <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
         </node>
       </node>
     </node>
@@ -476,14 +476,14 @@
       <property role="TrG5h" value="Backend" />
       <node concept="3Tm1VV" id="5jPBdK_dKe" role="1B3o_S" />
       <node concept="3uibUv" id="5jPBdK_dR3" role="EKbjA">
-        <ref role="3uigEE" to="qrld:5uFPQ7BwtoR" resolve="EvaluationSession.Backend" />
+        <ref role="3uigEE" to="w7la:~EvaluationSession$Backend" resolve="EvaluationSession.Backend" />
       </node>
       <node concept="2tJIrI" id="5jPBdK_dUF" role="jymVt" />
       <node concept="3clFb_" id="5jPBdK_dRk" role="jymVt">
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="current" />
         <node concept="3uibUv" id="5jPBdK_dRl" role="3clF45">
-          <ref role="3uigEE" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+          <ref role="3uigEE" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
         </node>
         <node concept="3Tm1VV" id="5jPBdK_dRm" role="1B3o_S" />
         <node concept="3clFbS" id="5jPBdK_dRo" role="3clF47">
@@ -501,11 +501,11 @@
         <node concept="37vLTG" id="6X5F0NgIslG" role="3clF46">
           <property role="TrG5h" value="program" />
           <node concept="3uibUv" id="6X5F0NgIsrs" role="1tU5fm">
-            <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+            <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
           </node>
         </node>
         <node concept="3uibUv" id="5jPBdK_dSi" role="3clF45">
-          <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
+          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
         </node>
         <node concept="3Tm1VV" id="5jPBdK_dSj" role="1B3o_S" />
         <node concept="3clFbS" id="5jPBdK_dSl" role="3clF47">
@@ -524,13 +524,13 @@
     </node>
     <node concept="3Tm1VV" id="5jPBdK_dIT" role="1B3o_S" />
     <node concept="3uibUv" id="5jPBdK_dJd" role="1zkMxy">
-      <ref role="3uigEE" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+      <ref role="3uigEE" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
     </node>
     <node concept="312cEg" id="5jPBdK_qYD" role="jymVt">
       <property role="TrG5h" value="sessionSolver" />
       <node concept="3Tm6S6" id="5jPBdK_qYE" role="1B3o_S" />
       <node concept="3uibUv" id="5jPBdK_qYG" role="1tU5fm">
-        <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
       </node>
     </node>
   </node>
@@ -542,19 +542,19 @@
       <node concept="37vLTG" id="3FIATxbQcKV" role="3clF46">
         <property role="TrG5h" value="logicalUnification" />
         <node concept="3uibUv" id="3FIATxbQcPk" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:6MYr6JwANOa" resolve="LogicalUnification" />
+          <ref role="3uigEE" to="bj13:~LogicalUnification" resolve="LogicalUnification" />
         </node>
       </node>
       <node concept="37vLTG" id="4xBopTzo15x" role="3clF46">
         <property role="TrG5h" value="sessionSolver" />
         <node concept="3uibUv" id="4xBopTzo1oi" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
       </node>
       <node concept="37vLTG" id="24Vro6cS3w6" role="3clF46">
         <property role="TrG5h" value="tracer" />
         <node concept="3uibUv" id="24Vro6cS3NX" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:24Vro6cQnrj" resolve="EvaluationTrace" />
+          <ref role="3uigEE" to="w7la:~EvaluationTrace" resolve="EvaluationTrace" />
         </node>
       </node>
       <node concept="3cqZAl" id="6yEjedm5WI9" role="3clF45" />
@@ -648,7 +648,7 @@
       <node concept="37vLTG" id="5p8T3QHE69z" role="3clF46">
         <property role="TrG5h" value="sessionSolver" />
         <node concept="3uibUv" id="4xBopTzoL5d" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
       </node>
       <node concept="3cqZAl" id="6yEjedm8sAX" role="3clF45" />
diff --git a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
index 2fe59a71..5c61542e 100644
--- a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
+++ b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
@@ -12,9 +12,9 @@
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
-    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
-    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
+    <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
     <import index="omn0" ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)" />
@@ -232,7 +232,7 @@
                   <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="MemLogical" />
                   <node concept="2ShNRf" id="6yEjedm5tUz" role="37wK5m">
                     <node concept="1pGfFk" id="6yEjedm5tU$" role="2ShVmc">
-                      <ref role="37wK5l" to="45ys:7nPD14NON$C" resolve="MetaLogical" />
+                      <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.String,java.lang.Class)" resolve="MetaLogical" />
                       <node concept="37vLTw" id="6yEjedm5vce" role="37wK5m">
                         <ref role="3cqZAo" node="21Zu7ABuute" resolve="name" />
                       </node>
@@ -273,7 +273,7 @@
                   <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="MemLogical" />
                   <node concept="2ShNRf" id="6yEjedm5vBM" role="37wK5m">
                     <node concept="1pGfFk" id="6yEjedm5vBN" role="2ShVmc">
-                      <ref role="37wK5l" to="45ys:7nPD14NON$C" resolve="MetaLogical" />
+                      <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.String,java.lang.Class)" resolve="MetaLogical" />
                       <node concept="37vLTw" id="6yEjedm5vBO" role="37wK5m">
                         <ref role="3cqZAo" node="3mz2_dYxTYE" resolve="name" />
                       </node>
@@ -313,7 +313,7 @@
                   <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
                   <node concept="2ShNRf" id="6yEjedm6$x1" role="37wK5m">
                     <node concept="1pGfFk" id="6yEjedm6$Su" role="2ShVmc">
-                      <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
+                      <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.Class)" resolve="MetaLogical" />
                       <node concept="3VsKOn" id="6yEjedm6_je" role="37wK5m">
                         <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
@@ -1562,7 +1562,7 @@
           <node concept="3clFbH" id="5_6ImQYY68L" role="3cqZAp" />
           <node concept="3$NI$W" id="5_6ImQYY8Vn" role="3cqZAp">
             <node concept="3uibUv" id="32fHqDf7RRO" role="3$Qgvv">
-              <ref role="3uigEE" to="qrld:7vxJ_H4qn42" resolve="EvaluationFailureException" />
+              <ref role="3uigEE" to="w7la:~EvaluationFailureException" resolve="EvaluationFailureException" />
             </node>
             <node concept="3clFbF" id="5_6ImQYY8ZS" role="3$Oloe">
               <node concept="2OqwBi" id="5_6ImQYY8ZU" role="3clFbG">
@@ -1611,7 +1611,7 @@
               <ref role="3cqZAo" node="2tcGHBEiyPf" resolve="symbols" />
             </node>
             <node concept="liA8E" id="2tcGHBEiz1l" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:2tcGHBEeol1" resolve="init" />
+              <ref role="37wK5l" to="w7la:~SessionSolver.init(jetbrains.mps.logic.reactor.program.PredicateSymbol...):void" resolve="init" />
               <node concept="10M0yZ" id="qubcdttZN1" role="37wK5m">
                 <ref role="3cqZAo" to="cxk7:5uFPQ7C23RV" resolve="EQ_SYM" />
                 <ref role="1PxDUh" to="cxk7:3HJTsBn4kk_" resolve="EqualsPredicate" />
@@ -1678,7 +1678,7 @@
                   <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="MemLogical" />
                   <node concept="2ShNRf" id="6yEjedm71h1" role="37wK5m">
                     <node concept="1pGfFk" id="6yEjedm71h2" role="2ShVmc">
-                      <ref role="37wK5l" to="45ys:7nPD14NON$C" resolve="MetaLogical" />
+                      <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.String,java.lang.Class)" resolve="MetaLogical" />
                       <node concept="37vLTw" id="6yEjedm71h3" role="37wK5m">
                         <ref role="3cqZAo" node="6yEjedm71gR" resolve="name" />
                       </node>
@@ -1719,7 +1719,7 @@
                   <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="MemLogical" />
                   <node concept="2ShNRf" id="6yEjedm71hi" role="37wK5m">
                     <node concept="1pGfFk" id="6yEjedm71hj" role="2ShVmc">
-                      <ref role="37wK5l" to="45ys:7nPD14NON$C" resolve="MetaLogical" />
+                      <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.String,java.lang.Class)" resolve="MetaLogical" />
                       <node concept="37vLTw" id="6yEjedm71hk" role="37wK5m">
                         <ref role="3cqZAo" node="6yEjedm71h8" resolve="name" />
                       </node>
@@ -1759,7 +1759,7 @@
                   <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
                   <node concept="2ShNRf" id="6yEjedm71hy" role="37wK5m">
                     <node concept="1pGfFk" id="6yEjedm71hz" role="2ShVmc">
-                      <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
+                      <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.Class)" resolve="MetaLogical" />
                       <node concept="3VsKOn" id="6yEjedm71h$" role="37wK5m">
                         <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
@@ -1796,7 +1796,7 @@
                   <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.String,java.lang.Object)" resolve="MemLogical" />
                   <node concept="2ShNRf" id="6yEjedm9JNO" role="37wK5m">
                     <node concept="1pGfFk" id="6yEjedm9KbK" role="2ShVmc">
-                      <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
+                      <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.Class)" resolve="MetaLogical" />
                       <node concept="3VsKOn" id="6yEjedm9KAr" role="37wK5m">
                         <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
@@ -1823,7 +1823,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="5p8T3QHH7gN" role="3clF45">
-        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
         <node concept="3qTvmN" id="5p8T3QHH7uW" role="11_B2D" />
       </node>
       <node concept="3Tm6S6" id="1OShD0IfFaJ" role="1B3o_S" />
@@ -1836,12 +1836,12 @@
                   <ref role="3cqZAo" node="1OShD0IfFeh" resolve="var" />
                 </node>
                 <node concept="3uibUv" id="qubcdt9I3s" role="10QFUM">
-                  <ref role="3uigEE" to="45ys:46l0wJhtOD_" resolve="LogicalOwner" />
+                  <ref role="3uigEE" to="bj13:~LogicalOwner" resolve="LogicalOwner" />
                 </node>
               </node>
             </node>
             <node concept="liA8E" id="qubcdt9I3t" role="2OqNvi">
-              <ref role="37wK5l" to="45ys:46l0wJhtXlr" resolve="logical" />
+              <ref role="37wK5l" to="bj13:~LogicalOwner.logical():jetbrains.mps.logic.reactor.logical.Logical" resolve="logical" />
             </node>
           </node>
         </node>
@@ -1944,15 +1944,15 @@
             <node concept="2OqwBi" id="5jPBdK_vpp" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdK_vmP" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdK_vlo" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdK_voQ" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdK_vsV" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdK_vv8" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -1976,7 +1976,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="1OShD0IfIGc" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
               </node>
             </node>
             <node concept="2OqwBi" id="1OShD0IfI6R" role="3tpDZB">
@@ -1987,7 +1987,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="1OShD0IfIj2" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -2081,15 +2081,15 @@
             <node concept="2OqwBi" id="5jPBdKNFjj" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdKNFjk" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNFjl" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNFjm" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNFjn" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdKNFjo" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -2114,11 +2114,11 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="3HJTsBn466m" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="3HJTsBn466n" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
             <node concept="1oi1Uc" id="3eLgHzX3GZl" role="3tpDZB">
@@ -2264,15 +2264,15 @@
             <node concept="2OqwBi" id="5jPBdKNFB7" role="3vwVQn">
               <node concept="2OqwBi" id="5jPBdKNFB8" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNFB9" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNFBa" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNFBb" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznHV5" resolve="ask" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.ask(jetbrains.mps.logic.reactor.program.PredicateSymbol,java.lang.Object...):boolean" resolve="ask" />
                 <node concept="10M0yZ" id="5jPBdKNFBc" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -2291,15 +2291,15 @@
             <node concept="2OqwBi" id="5jPBdKNFL5" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdKNFL6" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNFL7" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNFL8" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNFL9" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdKNFLa" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -2323,11 +2323,11 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="6MYr6Jy8m2W" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="6MYr6Jy8m2X" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
             <node concept="1oi1Uc" id="6MYr6Jy8lXX" role="3tpDZB">
@@ -2346,15 +2346,15 @@
             <node concept="2OqwBi" id="5jPBdKNG7d" role="3vFALc">
               <node concept="2OqwBi" id="5jPBdKNG7e" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNG7f" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNG7g" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNG7h" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznHV5" resolve="ask" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.ask(jetbrains.mps.logic.reactor.program.PredicateSymbol,java.lang.Object...):boolean" resolve="ask" />
                 <node concept="10M0yZ" id="5jPBdKNG7i" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -2535,15 +2535,15 @@
             <node concept="2OqwBi" id="5jPBdKNGmf" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdKNGmg" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNGmh" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNGmi" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNGmj" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdKNGmk" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -2561,15 +2561,15 @@
             <node concept="2OqwBi" id="5jPBdKNGuB" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdKNGuC" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNGuD" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNGuE" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNGuF" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdKNGuG" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -2648,15 +2648,15 @@
             <node concept="2OqwBi" id="5jPBdKNGS_" role="3vwVQn">
               <node concept="2OqwBi" id="5jPBdKNGSA" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNGSB" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNGSC" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNGSD" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznHV5" resolve="ask" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.ask(jetbrains.mps.logic.reactor.program.PredicateSymbol,java.lang.Object...):boolean" resolve="ask" />
                 <node concept="10M0yZ" id="5jPBdKNGSE" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -2838,15 +2838,15 @@
             <node concept="2OqwBi" id="5jPBdKNHhU" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdKNHhV" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNHhW" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNHhX" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNHhY" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdKNHhZ" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -2864,15 +2864,15 @@
             <node concept="2OqwBi" id="5jPBdKNH9s" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdKNH9t" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNH9u" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNH9v" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNH9w" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdKNH9x" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -2951,15 +2951,15 @@
             <node concept="2OqwBi" id="5jPBdKNHSB" role="3vwVQn">
               <node concept="2OqwBi" id="5jPBdKNHSC" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNHSD" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNHSE" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNHSF" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznHV5" resolve="ask" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.ask(jetbrains.mps.logic.reactor.program.PredicateSymbol,java.lang.Object...):boolean" resolve="ask" />
                 <node concept="10M0yZ" id="5jPBdKNHSG" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -3077,15 +3077,15 @@
             <node concept="2OqwBi" id="5jPBdKNHZ_" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdKNHZA" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNHZB" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNHZC" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNHZD" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdKNHZE" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -3108,7 +3108,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8IVxI_" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPKP" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -3158,15 +3158,15 @@
             <node concept="2OqwBi" id="5jPBdKNI3I" role="3vwVQn">
               <node concept="2OqwBi" id="5jPBdKNI3J" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNI3K" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNI3L" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNI3M" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznHV5" resolve="ask" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.ask(jetbrains.mps.logic.reactor.program.PredicateSymbol,java.lang.Object...):boolean" resolve="ask" />
                 <node concept="10M0yZ" id="5jPBdKNI3N" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -3313,15 +3313,15 @@
             <node concept="2OqwBi" id="5jPBdKNI6P" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdKNI6Q" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNI6R" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNI6S" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNI6T" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdKNI6U" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -3344,7 +3344,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8IVtAm" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPKP" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -3357,7 +3357,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8IVuqF" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPKP" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -3371,15 +3371,15 @@
             <node concept="2OqwBi" id="5jPBdKNIbY" role="3vwVQn">
               <node concept="2OqwBi" id="5jPBdKNIbZ" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNIc0" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNIc1" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNIc2" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznHV5" resolve="ask" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.ask(jetbrains.mps.logic.reactor.program.PredicateSymbol,java.lang.Object...):boolean" resolve="ask" />
                 <node concept="10M0yZ" id="5jPBdKNIc3" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -3411,15 +3411,15 @@
             <node concept="2OqwBi" id="5jPBdKNInn" role="3vwVQn">
               <node concept="2OqwBi" id="5jPBdKNIno" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNInp" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNInq" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNInr" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznHV5" resolve="ask" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.ask(jetbrains.mps.logic.reactor.program.PredicateSymbol,java.lang.Object...):boolean" resolve="ask" />
                 <node concept="10M0yZ" id="5jPBdKNIns" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -3574,15 +3574,15 @@
             <node concept="2OqwBi" id="5jPBdKNIG8" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdKNIG9" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNIGa" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNIGb" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNIGc" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdKNIGd" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -3605,7 +3605,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8IVrZL" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPKP" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -3619,15 +3619,15 @@
             <node concept="2OqwBi" id="5jPBdKNIJL" role="3vwVQn">
               <node concept="2OqwBi" id="5jPBdKNIJM" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNIJN" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNIJO" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNIJP" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznHV5" resolve="ask" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.ask(jetbrains.mps.logic.reactor.program.PredicateSymbol,java.lang.Object...):boolean" resolve="ask" />
                 <node concept="10M0yZ" id="5jPBdKNIJQ" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -3773,15 +3773,15 @@
             <node concept="2OqwBi" id="5jPBdKNJ01" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdKNJ02" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNJ03" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNJ04" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNJ05" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdKNJ06" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -3804,7 +3804,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8IVqqO" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPKP" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -3818,15 +3818,15 @@
             <node concept="2OqwBi" id="5jPBdKNJ3m" role="3vwVQn">
               <node concept="2OqwBi" id="5jPBdKNJ3n" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNJ3o" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNJ3p" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNJ3q" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznHV5" resolve="ask" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.ask(jetbrains.mps.logic.reactor.program.PredicateSymbol,java.lang.Object...):boolean" resolve="ask" />
                 <node concept="10M0yZ" id="5jPBdKNJ3r" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -3922,15 +3922,15 @@
             <node concept="2OqwBi" id="5jPBdKNJfs" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdKNJft" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNJfu" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNJfv" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNJfw" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdKNJfx" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -3953,7 +3953,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8IVo6f" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPKP" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -3967,15 +3967,15 @@
             <node concept="2OqwBi" id="5jPBdKNJi_" role="3vwVQn">
               <node concept="2OqwBi" id="5jPBdKNJiA" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdKNJiB" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdKNJiC" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdKNJiD" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznHV5" resolve="ask" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.ask(jetbrains.mps.logic.reactor.program.PredicateSymbol,java.lang.Object...):boolean" resolve="ask" />
                 <node concept="10M0yZ" id="5jPBdKNJiE" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -4094,15 +4094,15 @@
             <node concept="2OqwBi" id="4$OyT8ISnwY" role="3clFbG">
               <node concept="2OqwBi" id="4$OyT8ISnwZ" role="2Oq$k0">
                 <node concept="2YIFZM" id="4$OyT8ISnx0" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="4$OyT8ISnx1" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8ISnx2" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="4$OyT8ISnx3" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -4125,7 +4125,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8IVknj" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPKP" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -4139,15 +4139,15 @@
             <node concept="2OqwBi" id="4$OyT8ISnxa" role="3vwVQn">
               <node concept="2OqwBi" id="4$OyT8ISnxb" role="2Oq$k0">
                 <node concept="2YIFZM" id="4$OyT8ISnxc" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="4$OyT8ISnxd" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8ISnxe" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznHV5" resolve="ask" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.ask(jetbrains.mps.logic.reactor.program.PredicateSymbol,java.lang.Object...):boolean" resolve="ask" />
                 <node concept="10M0yZ" id="4$OyT8ISnxf" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -4170,15 +4170,15 @@
             <node concept="2OqwBi" id="4$OyT8ISnxq" role="3vwVQn">
               <node concept="2OqwBi" id="4$OyT8ISnxr" role="2Oq$k0">
                 <node concept="2YIFZM" id="4$OyT8ISnxs" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="4$OyT8ISnxt" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8ISnxu" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznHV5" resolve="ask" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.ask(jetbrains.mps.logic.reactor.program.PredicateSymbol,java.lang.Object...):boolean" resolve="ask" />
                 <node concept="10M0yZ" id="4$OyT8ISnxv" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -4339,15 +4339,15 @@
             <node concept="2OqwBi" id="4$OyT8ITVLD" role="3clFbG">
               <node concept="2OqwBi" id="4$OyT8ITVLE" role="2Oq$k0">
                 <node concept="2YIFZM" id="4$OyT8ITVLF" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="4$OyT8ITVLG" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8ITVLH" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="4$OyT8ITVLI" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -4370,7 +4370,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8IVcT8" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPKP" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -4378,15 +4378,15 @@
             <node concept="2OqwBi" id="4$OyT8IUgPW" role="3clFbG">
               <node concept="2OqwBi" id="4$OyT8IUgPX" role="2Oq$k0">
                 <node concept="2YIFZM" id="4$OyT8IUgPY" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="4$OyT8IUgPZ" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8IUgQ0" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="4$OyT8IUgQ1" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -4409,7 +4409,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8IVdCg" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPKP" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -4418,15 +4418,15 @@
             <node concept="2OqwBi" id="4$OyT8ITVM1" role="3vwVQn">
               <node concept="2OqwBi" id="4$OyT8ITVM2" role="2Oq$k0">
                 <node concept="2YIFZM" id="4$OyT8ITVM3" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="4$OyT8ITVM4" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8ITVM5" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznHV5" resolve="ask" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.ask(jetbrains.mps.logic.reactor.program.PredicateSymbol,java.lang.Object...):boolean" resolve="ask" />
                 <node concept="10M0yZ" id="4$OyT8ITVM6" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -4473,12 +4473,12 @@
           <node concept="2OqwBi" id="5jPBdK_uYD" role="3clFbG">
             <node concept="2OqwBi" id="5jPBdK_uUg" role="2Oq$k0">
               <node concept="2YIFZM" id="5jPBdK_uTI" role="2Oq$k0">
-                <ref role="37wK5l" to="qrld:7ISVfSIwfH" resolve="newSession" />
-                <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+                <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                <ref role="37wK5l" to="w7la:~EvaluationSession.newSession(jetbrains.mps.logic.reactor.program.Program):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="newSession" />
                 <node concept="10Nm6u" id="6X5F0NgIqiP" role="37wK5m" />
               </node>
               <node concept="liA8E" id="5jPBdK_uVI" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:5uFPQ7Bwu9Q" resolve="withPredicates" />
+                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withPredicates(jetbrains.mps.logic.reactor.program.PredicateSymbol...):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withPredicates" />
                 <node concept="10M0yZ" id="5jPBdK_uXa" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C23RV" resolve="EQ_SYM" />
                   <ref role="1PxDUh" to="cxk7:3HJTsBn4kk_" resolve="EqualsPredicate" />
@@ -4490,7 +4490,7 @@
               </node>
             </node>
             <node concept="liA8E" id="5jPBdK_v1h" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:2UGjFq4L12E" resolve="start" />
+              <ref role="37wK5l" to="w7la:~EvaluationSession$Config.start(jetbrains.mps.logic.reactor.evaluation.SessionSolver):jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="start" />
               <node concept="10Nm6u" id="2UGjFq4LcSH" role="37wK5m" />
             </node>
           </node>
@@ -4562,7 +4562,7 @@
     <node concept="3clFb_" id="3K_0akS$NEa" role="jymVt">
       <property role="TrG5h" value="logical" />
       <node concept="3uibUv" id="6yEjedm86Fb" role="3clF45">
-        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
         <node concept="3uibUv" id="6yEjedm887F" role="11_B2D">
           <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
@@ -4592,7 +4592,7 @@
     <node concept="3clFb_" id="6yEjedm8Fwq" role="jymVt">
       <property role="TrG5h" value="logical" />
       <node concept="3uibUv" id="6yEjedm8Fwr" role="3clF45">
-        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
         <node concept="3uibUv" id="6yEjedm8Fws" role="11_B2D">
           <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
@@ -4605,7 +4605,7 @@
               <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.String)" resolve="MemLogical" />
               <node concept="10QFUN" id="6yEjedm9wbU" role="37wK5m">
                 <node concept="3uibUv" id="6yEjedm9wg_" role="10QFUM">
-                  <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                  <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                 </node>
                 <node concept="37vLTw" id="6yEjedm8HxY" role="10QFUP">
                   <ref role="3cqZAo" node="6yEjedm8H7d" resolve="meta" />
@@ -4621,7 +4621,7 @@
       <node concept="37vLTG" id="6yEjedm8H7d" role="3clF46">
         <property role="TrG5h" value="meta" />
         <node concept="3uibUv" id="6yEjedm8H9p" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
           <node concept="3uibUv" id="6yEjedm8Hc_" role="11_B2D">
             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
@@ -4640,7 +4640,7 @@
             <node concept="3cpWsn" id="3K_0akS$NRr" role="3cpWs9">
               <property role="TrG5h" value="x1" />
               <node concept="3uibUv" id="6yEjedm8aLn" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8bg7" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -4663,7 +4663,7 @@
                 </node>
               </node>
               <node concept="3uibUv" id="6yEjedm8btC" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8btD" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -4727,7 +4727,7 @@
             <node concept="3cpWsn" id="3K_0akS$OxL" role="3cpWs9">
               <property role="TrG5h" value="w1" />
               <node concept="3uibUv" id="6yEjedm8iQc" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8jdG" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -4736,7 +4736,7 @@
                 <ref role="37wK5l" node="6yEjedm8Fwq" resolve="logical" />
                 <node concept="2ShNRf" id="6yEjedm8P1E" role="37wK5m">
                   <node concept="1pGfFk" id="6yEjedm8P1F" role="2ShVmc">
-                    <ref role="37wK5l" to="45ys:7nPD14NON$C" resolve="MetaLogical" />
+                    <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.String,java.lang.Class)" resolve="MetaLogical" />
                     <node concept="Xl_RD" id="6yEjedm9_u$" role="37wK5m">
                       <property role="Xl_RC" value="w1" />
                     </node>
@@ -4776,7 +4776,7 @@
                 </node>
               </node>
               <node concept="3uibUv" id="6yEjedm8lL4" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8lL5" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -4843,11 +4843,11 @@
                     <ref role="3cqZAo" node="3K_0akS_bIv" resolve="p1" />
                   </node>
                   <node concept="liA8E" id="6HT7BWBPd0X" role="2OqNvi">
-                    <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                    <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                   </node>
                 </node>
                 <node concept="liA8E" id="6HT7BWBPd0Y" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
                 </node>
               </node>
             </node>
@@ -5002,7 +5002,7 @@
                 </node>
               </node>
               <node concept="3uibUv" id="6yEjedm8o1P" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8o1Q" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -5019,7 +5019,7 @@
                 </node>
               </node>
               <node concept="3uibUv" id="6yEjedm8oFj" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8oFk" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -5068,7 +5068,7 @@
                 <ref role="37wK5l" node="6yEjedm8Fwq" resolve="logical" />
                 <node concept="2ShNRf" id="6yEjedm8NC6" role="37wK5m">
                   <node concept="1pGfFk" id="6yEjedm8NZD" role="2ShVmc">
-                    <ref role="37wK5l" to="45ys:7nPD14NON$C" resolve="MetaLogical" />
+                    <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.String,java.lang.Class)" resolve="MetaLogical" />
                     <node concept="Xl_RD" id="6yEjedm9CL0" role="37wK5m">
                       <property role="Xl_RC" value="w1" />
                     </node>
@@ -5079,7 +5079,7 @@
                 </node>
               </node>
               <node concept="3uibUv" id="6yEjedm8$6V" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8$6W" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -5114,7 +5114,7 @@
                 </node>
               </node>
               <node concept="3uibUv" id="6yEjedm8pey" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8pez" role="11_B2D">
                   <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
@@ -5199,11 +5199,11 @@
                     <ref role="3cqZAo" node="3K_0akS_pDi" resolve="p1" />
                   </node>
                   <node concept="liA8E" id="6HT7BWBPhwQ" role="2OqNvi">
-                    <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                    <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                   </node>
                 </node>
                 <node concept="liA8E" id="6HT7BWBPhwR" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
                 </node>
               </node>
             </node>
@@ -5370,7 +5370,7 @@
               <ref role="3cqZAo" node="6yEjedm8eks" resolve="symbols" />
             </node>
             <node concept="liA8E" id="2tcGHBEi$nn" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:2tcGHBEeol1" resolve="init" />
+              <ref role="37wK5l" to="w7la:~SessionSolver.init(jetbrains.mps.logic.reactor.program.PredicateSymbol...):void" resolve="init" />
               <node concept="10M0yZ" id="2tcGHBEe$iM" role="37wK5m">
                 <ref role="3cqZAo" to="cxk7:5uFPQ7C23RV" resolve="EQ_SYM" />
                 <ref role="1PxDUh" to="cxk7:3HJTsBn4kk_" resolve="EqualsPredicate" />
diff --git a/test.xml b/test.xml
index 66cca5e1..2d4ac04a 100644
--- a/test.xml
+++ b/test.xml
@@ -353,6 +353,7 @@
         <library jar="lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <library jar="lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <library jar="lib/unification-lib-1.0.2.jar" />
+        <library jar="lib/memreactor-api-0.1.jar" />
         <sources jar="jetbrains.mps.logic.reactor-src.jar" descriptor="jetbrains.mps.logic.reactor.msd" />
       </module>
     </echoxml>
@@ -734,6 +735,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -788,6 +790,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -835,6 +838,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -873,6 +877,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -918,6 +923,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
@@ -987,6 +993,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
@@ -1055,6 +1062,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1122,6 +1130,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1176,6 +1185,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -1228,6 +1238,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -1278,6 +1289,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1328,6 +1340,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
@@ -1390,6 +1403,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1438,6 +1452,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1494,6 +1509,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1598,6 +1614,7 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-core-1.3.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3.jar" />
diff --git a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps
index 89eceb71..777a583b 100644
--- a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps
+++ b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps
@@ -20,7 +20,7 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="4r4j" ref="r:94702bd0-f623-44e8-af0a-f2730f7d2518(jetbrains.mps.lang.typesystem2.samplechecker.handle.util)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="nz6g" ref="r:ac00f724-30be-446e-805c-2345efc460d7(jetbrains.mps.lang.typesystem2.program)" />
     <import index="7ub6" ref="r:b533b427-da69-49d8-9c93-4ea32433b66e(jetbrains.mps.lang.typesystem2.generation)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
@@ -4334,7 +4334,7 @@
                   <node concept="1eOMI4" id="3jXBvmTFgtH" role="2Oq$k0">
                     <node concept="10QFUN" id="3jXBvmTFgtI" role="1eOMHV">
                       <node concept="3uibUv" id="3jXBvmTFgtJ" role="10QFUM">
-                        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                       </node>
                       <node concept="3A9UF8" id="3jXBvmTFgtK" role="10QFUP">
                         <node concept="a7P8L" id="3jXBvmTFgtL" role="3A9W3M">
@@ -4344,14 +4344,14 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="3jXBvmTFgtM" role="2OqNvi">
-                    <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                    <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                   </node>
                 </node>
                 <node concept="2OqwBi" id="3jXBvmTFgtN" role="3uHU7B">
                   <node concept="1eOMI4" id="3jXBvmTFgtO" role="2Oq$k0">
                     <node concept="10QFUN" id="3jXBvmTFgtP" role="1eOMHV">
                       <node concept="3uibUv" id="3jXBvmTFgtQ" role="10QFUM">
-                        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                       </node>
                       <node concept="3A9UF8" id="3jXBvmTFgtR" role="10QFUP">
                         <node concept="a7P8L" id="3jXBvmTFgtS" role="3A9W3M">
@@ -4361,7 +4361,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="3jXBvmTFgtT" role="2OqNvi">
-                    <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                    <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                   </node>
                 </node>
               </node>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps
index 2c276902..e0b0561d 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps
@@ -549,6 +549,27 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="1wCqu1rzjdE" role="3bR37C">
+          <node concept="1BurEX" id="1wCqu1rzjdF" role="1SiIV1">
+            <node concept="55IIr" id="1wCqu1rzjd$" role="1BurEY">
+              <node concept="2Ry0Ak" id="1wCqu1rzjd_" role="iGT6I">
+                <property role="2Ry0Am" value="logic" />
+                <node concept="2Ry0Ak" id="1wCqu1rzjdA" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="1wCqu1rzjdB" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
+                    <node concept="2Ry0Ak" id="1wCqu1rzjdC" role="2Ry0An">
+                      <property role="2Ry0Am" value="lib" />
+                      <node concept="2Ry0Ak" id="1wCqu1rzjdD" role="2Ry0An">
+                        <property role="2Ry0Am" value="memreactor-api-0.1.jar" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7BVjoXzUx6$" role="3989C9">
@@ -650,12 +671,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7BVjoXzUxWH" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxWI" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUx6U" resolve="jetbrains.mps.lang.typesystem2" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7BVjoXzUxWJ" role="3bR37C">
           <node concept="3bR9La" id="7BVjoXzUxWK" role="1SiIV1">
             <property role="3bR36h" value="false" />
@@ -1465,6 +1480,27 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="1wCqu1rzjjK" role="3bR37C">
+          <node concept="1BurEX" id="1wCqu1rzjjL" role="1SiIV1">
+            <node concept="55IIr" id="1wCqu1rzjjE" role="1BurEY">
+              <node concept="2Ry0Ak" id="1wCqu1rzjjF" role="iGT6I">
+                <property role="2Ry0Am" value="logic" />
+                <node concept="2Ry0Ak" id="1wCqu1rzjjG" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="1wCqu1rzjjH" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
+                    <node concept="2Ry0Ak" id="1wCqu1rzjjI" role="2Ry0An">
+                      <property role="2Ry0Am" value="lib" />
+                      <node concept="2Ry0Ak" id="1wCqu1rzjjJ" role="2Ry0An">
+                        <property role="2Ry0Am" value="memreactor-api-0.1.jar" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7Ant4WkHLpc" role="3989C9">
@@ -1662,12 +1698,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7Ant4WkHLqe" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4WkHLqf" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Ant4WkHLpI" resolve="jetbrains.mps.lang.typesystem2" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7Ant4WkHLqg" role="3bR37C">
           <node concept="3bR9La" id="7Ant4WkHLqh" role="1SiIV1">
             <property role="3bR36h" value="false" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util@tests.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util@tests.mps
index 77e735c5..e366d624 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util@tests.mps
@@ -8,7 +8,7 @@
   </languages>
   <imports>
     <import index="4r4j" ref="r:94702bd0-f623-44e8-af0a-f2730f7d2518(jetbrains.mps.lang.typesystem2.samplechecker.handle.util)" />
-    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="mqqo" ref="r:82cec6f7-ddec-440c-961c-1c598267be42(jetbrains.mps.logic.test.unification)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
     <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
@@ -351,15 +351,15 @@
             <node concept="2OqwBi" id="5jPBdK_vpp" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdK_vmP" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdK_vlo" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdK_voQ" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdK_vsV" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdK_vv8" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -606,15 +606,15 @@
             <node concept="2OqwBi" id="5jPBdK_vXi" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdK_vXj" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdK_vXk" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdK_vXl" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdK_vXm" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdK_vXn" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -847,15 +847,15 @@
             <node concept="2OqwBi" id="5jPBdK_wc9" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdK_wca" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdK_wcb" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdK_wcc" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdK_wcd" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdK_wce" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -1116,15 +1116,15 @@
             <node concept="2OqwBi" id="5jPBdK_w_f" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdK_w_g" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdK_w_h" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdK_w_i" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdK_w_j" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdK_w_k" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -1540,15 +1540,15 @@
             <node concept="2OqwBi" id="5jPBdK_wPr" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdK_wPs" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdK_wPt" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdK_wPu" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdK_wPv" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdK_wPw" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -2023,15 +2023,15 @@
             <node concept="2OqwBi" id="5jPBdK_x7A" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdK_x7B" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdK_x7C" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdK_x7D" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdK_x7E" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdK_x7F" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -2563,15 +2563,15 @@
             <node concept="2OqwBi" id="5jPBdK_xqQ" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdK_xqR" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdK_xqS" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdK_xqT" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdK_xqU" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdK_xqV" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -3024,15 +3024,15 @@
             <node concept="2OqwBi" id="5jPBdK_xIj" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdK_xIk" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdK_xIl" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdK_xIm" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdK_xIn" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdK_xIo" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -3509,15 +3509,15 @@
             <node concept="2OqwBi" id="5jPBdK_y0X" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdK_y0Y" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdK_y0Z" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdK_y10" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdK_y11" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdK_y12" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -3856,15 +3856,15 @@
             <node concept="2OqwBi" id="5jPBdK_yj4" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdK_yj5" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdK_yj6" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdK_yj7" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdK_yj8" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdK_yj9" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -3894,12 +3894,12 @@
           <node concept="2OqwBi" id="5jPBdK_uYD" role="3clFbG">
             <node concept="2OqwBi" id="5jPBdK_uUg" role="2Oq$k0">
               <node concept="2YIFZM" id="5jPBdK_uTI" role="2Oq$k0">
-                <ref role="37wK5l" to="qrld:7ISVfSIwfH" resolve="newSession" />
-                <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+                <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                <ref role="37wK5l" to="w7la:~EvaluationSession.newSession(jetbrains.mps.logic.reactor.program.Program):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="newSession" />
                 <node concept="10Nm6u" id="6X5F0NgIltC" role="37wK5m" />
               </node>
               <node concept="liA8E" id="5jPBdK_uVI" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:5uFPQ7Bwu9Q" resolve="withPredicates" />
+                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withPredicates(jetbrains.mps.logic.reactor.program.PredicateSymbol...):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withPredicates" />
                 <node concept="10M0yZ" id="5jPBdK_uXa" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C23RV" resolve="EQ_SYM" />
                   <ref role="1PxDUh" to="cxk7:3HJTsBn4kk_" resolve="EqualsPredicate" />
@@ -3911,7 +3911,7 @@
               </node>
             </node>
             <node concept="liA8E" id="5jPBdK_v1h" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:2UGjFq4L12E" resolve="start" />
+              <ref role="37wK5l" to="w7la:~EvaluationSession$Config.start(jetbrains.mps.logic.reactor.evaluation.SessionSolver):jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="start" />
               <node concept="10Nm6u" id="2UGjFq4L8wv" role="37wK5m" />
             </node>
           </node>
@@ -4268,15 +4268,15 @@
             <node concept="2OqwBi" id="5jPBdK_R$S" role="3clFbG">
               <node concept="2OqwBi" id="5jPBdK_R$T" role="2Oq$k0">
                 <node concept="2YIFZM" id="5jPBdK_R$U" role="2Oq$k0">
-                  <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                  <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                  <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
                 </node>
                 <node concept="liA8E" id="5jPBdK_R$V" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
                 </node>
               </node>
               <node concept="liA8E" id="5jPBdK_R$W" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                 <node concept="10M0yZ" id="5jPBdK_R$X" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                   <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -4306,12 +4306,12 @@
           <node concept="2OqwBi" id="5jPBdK_QKm" role="3clFbG">
             <node concept="2OqwBi" id="5jPBdK_QKn" role="2Oq$k0">
               <node concept="2YIFZM" id="5jPBdK_QKo" role="2Oq$k0">
-                <ref role="37wK5l" to="qrld:7ISVfSIwfH" resolve="newSession" />
-                <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+                <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                <ref role="37wK5l" to="w7la:~EvaluationSession.newSession(jetbrains.mps.logic.reactor.program.Program):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="newSession" />
                 <node concept="10Nm6u" id="6X5F0NgIlBS" role="37wK5m" />
               </node>
               <node concept="liA8E" id="5jPBdK_QKp" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:5uFPQ7Bwu9Q" resolve="withPredicates" />
+                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withPredicates(jetbrains.mps.logic.reactor.program.PredicateSymbol...):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withPredicates" />
                 <node concept="10M0yZ" id="5jPBdK_QKq" role="37wK5m">
                   <ref role="3cqZAo" to="cxk7:5uFPQ7C23RV" resolve="EQ_SYM" />
                   <ref role="1PxDUh" to="cxk7:3HJTsBn4kk_" resolve="EqualsPredicate" />
@@ -4323,7 +4323,7 @@
               </node>
             </node>
             <node concept="liA8E" id="5jPBdK_QKs" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:2UGjFq4L12E" resolve="start" />
+              <ref role="37wK5l" to="w7la:~EvaluationSession$Config.start(jetbrains.mps.logic.reactor.evaluation.SessionSolver):jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="start" />
               <node concept="10Nm6u" id="2UGjFq4L8GP" role="37wK5m" />
             </node>
           </node>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
index 30aef736..f45d7819 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
@@ -14,8 +14,8 @@
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
@@ -348,7 +348,7 @@
       <node concept="37vLTG" id="5H6hZahmlpn" role="3clF46">
         <property role="TrG5h" value="result" />
         <node concept="3uibUv" id="7HUwyZazx7G" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="3uibUv" id="7HUwyZazx7H" role="11_B2D">
             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
@@ -357,7 +357,7 @@
       <node concept="37vLTG" id="5H6hZahmlpH" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="7HUwyZazx84" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="3uibUv" id="7HUwyZazx85" role="11_B2D">
             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
@@ -366,7 +366,7 @@
       <node concept="37vLTG" id="5H6hZahmlpT" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="7HUwyZazx7U" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="3uibUv" id="7HUwyZazx7V" role="11_B2D">
             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
@@ -387,11 +387,11 @@
                   <ref role="3cqZAo" node="5H6hZahmlpH" resolve="left" />
                 </node>
                 <node concept="liA8E" id="3KV3FXjZHhL" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="3KV3FXjZHhM" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
           </node>
@@ -408,11 +408,11 @@
                   <ref role="3cqZAo" node="5H6hZahmlpT" resolve="right" />
                 </node>
                 <node concept="liA8E" id="3KV3FXjZHhT" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="3KV3FXjZHhU" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
           </node>
@@ -445,15 +445,15 @@
           <node concept="3cpWsn" id="5uFPQ7ClQgr" role="3cpWs9">
             <property role="TrG5h" value="sessionSolver" />
             <node concept="3uibUv" id="5uFPQ7ClQgn" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+              <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
             </node>
             <node concept="2OqwBi" id="5uFPQ7ClQgs" role="33vP2m">
               <node concept="2YIFZM" id="5uFPQ7ClQgt" role="2Oq$k0">
-                <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
               </node>
               <node concept="liA8E" id="5uFPQ7ClQgu" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
               </node>
             </node>
           </node>
@@ -522,7 +522,7 @@
                     <ref role="3cqZAo" node="5uFPQ7ClQgr" resolve="sessionSolver" />
                   </node>
                   <node concept="liA8E" id="3KV3FXjZMUJ" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                    <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                     <node concept="10M0yZ" id="3KV3FXjZMUK" role="37wK5m">
                       <ref role="3cqZAo" to="cxk7:5uFPQ7C23RV" resolve="EQ_SYM" />
                       <ref role="1PxDUh" to="cxk7:3HJTsBn4kk_" resolve="EqualsPredicate" />
@@ -1574,7 +1574,7 @@
       <node concept="37vLTG" id="3KV3FXjZFT2" role="3clF46">
         <property role="TrG5h" value="computingSession" />
         <node concept="3uibUv" id="3KV3FXjZFTc" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
       </node>
       <node concept="3cqZAl" id="3KV3FXjZFyd" role="3clF45" />
@@ -1746,7 +1746,7 @@
       <node concept="37vLTG" id="3KV3FXk1fGz" role="3clF46">
         <property role="TrG5h" value="result" />
         <node concept="3uibUv" id="7HUwyZazx7W" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="3uibUv" id="7HUwyZazx7X" role="11_B2D">
             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
@@ -1755,7 +1755,7 @@
       <node concept="37vLTG" id="3KV3FXk1fGZ" role="3clF46">
         <property role="TrG5h" value="fullPaths" />
         <node concept="3uibUv" id="7HUwyZazx7O" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="3uibUv" id="7HUwyZazx7P" role="11_B2D">
             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
@@ -1764,7 +1764,7 @@
       <node concept="37vLTG" id="3KV3FXk1fHy" role="3clF46">
         <property role="TrG5h" value="startFrom" />
         <node concept="3uibUv" id="7HUwyZazx8m" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="3uibUv" id="7HUwyZazx8n" role="11_B2D">
             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
@@ -1785,11 +1785,11 @@
                   <ref role="3cqZAo" node="3KV3FXk1fGZ" resolve="fullPaths" />
                 </node>
                 <node concept="liA8E" id="3KV3FXk1h3Y" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="3KV3FXk1h3Z" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
           </node>
@@ -1806,11 +1806,11 @@
                   <ref role="3cqZAo" node="3KV3FXk1fHy" resolve="startFrom" />
                 </node>
                 <node concept="liA8E" id="3KV3FXk1iAo" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="3KV3FXk1iAp" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
           </node>
@@ -1843,15 +1843,15 @@
           <node concept="3cpWsn" id="5uFPQ7ClVCK" role="3cpWs9">
             <property role="TrG5h" value="computingSession" />
             <node concept="3uibUv" id="5uFPQ7ClVCL" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+              <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
             </node>
             <node concept="2OqwBi" id="5uFPQ7ClVCM" role="33vP2m">
               <node concept="2YIFZM" id="5uFPQ7ClVCN" role="2Oq$k0">
-                <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                <ref role="37wK5l" to="qrld:5uFPQ7Bwt5n" resolve="current" />
+                <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
               </node>
               <node concept="liA8E" id="5uFPQ7ClVCO" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:5uFPQ7ClOzA" resolve="sessionSolver" />
+                <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
               </node>
             </node>
           </node>
@@ -1929,7 +1929,7 @@
                     <ref role="3cqZAo" node="5uFPQ7ClVCK" resolve="computingSession" />
                   </node>
                   <node concept="liA8E" id="3KV3FXk1m3b" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:4xBopTznPKO" resolve="tell" />
+                    <ref role="37wK5l" to="w7la:~SessionSolver.tell(jetbrains.mps.logic.reactor.program.Symbol,java.lang.Object...):void" resolve="tell" />
                     <node concept="10M0yZ" id="3KV3FXk1m3c" role="37wK5m">
                       <ref role="3cqZAo" to="cxk7:5uFPQ7C23RV" resolve="EQ_SYM" />
                       <ref role="1PxDUh" to="cxk7:3HJTsBn4kk_" resolve="EqualsPredicate" />
@@ -2454,7 +2454,7 @@
       <node concept="37vLTG" id="3KV3FXk1jlA" role="3clF46">
         <property role="TrG5h" value="computingSession" />
         <node concept="3uibUv" id="3KV3FXk1jl_" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
       </node>
     </node>
@@ -2649,7 +2649,7 @@
               <ref role="3cqZAo" node="3KV3FXjZFTt" resolve="sessionSolver" />
             </node>
             <node concept="liA8E" id="3KV3FXjZkQX" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:4xBopTznHV5" resolve="ask" />
+              <ref role="37wK5l" to="w7la:~SessionSolver.ask(jetbrains.mps.logic.reactor.program.PredicateSymbol,java.lang.Object...):boolean" resolve="ask" />
               <node concept="10M0yZ" id="5uFPQ7C5ZbN" role="37wK5m">
                 <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
                 <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
@@ -2762,7 +2762,7 @@
       <node concept="37vLTG" id="3KV3FXk1u5_" role="3clF46">
         <property role="TrG5h" value="sessionSolver" />
         <node concept="3uibUv" id="3KV3FXk1u5$" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
       </node>
     </node>
@@ -2771,7 +2771,7 @@
       <property role="TrG5h" value="sessionSolver" />
       <node concept="3Tmbuc" id="3KV3FXk1ru9" role="1B3o_S" />
       <node concept="3uibUv" id="3KV3FXjZFTw" role="1tU5fm">
-        <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
       </node>
     </node>
   </node>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
index b7fedb83..8fc409c2 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
@@ -49,9 +49,9 @@
     <import index="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components(MPS.IDEA/)" />
     <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
     <import index="z1c4" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
-    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
-    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
+    <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="7ub6" ref="r:b533b427-da69-49d8-9c93-4ea32433b66e(jetbrains.mps.lang.typesystem2.generation)" />
     <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
@@ -845,8 +845,8 @@
                   <node concept="1pGfFk" id="4sSe4$oMWGc" role="2ShVmc">
                     <ref role="37wK5l" to="nz6g:4sSe4$oM2rk" resolve="ConstraintBuilder" />
                     <node concept="2YIFZM" id="4sSe4$oMWUH" role="37wK5m">
-                      <ref role="37wK5l" to="rchb:54i3FxcZQAb" resolve="symbol" />
-                      <ref role="1Pybhc" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+                      <ref role="1Pybhc" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
+                      <ref role="37wK5l" to="av0y:~ConstraintSymbol.symbol(java.lang.String,int):jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
                       <node concept="Xl_RD" id="4sSe4$oMWUI" role="37wK5m">
                         <property role="Xl_RC" value="main" />
                       </node>
@@ -2135,7 +2135,7 @@
       <node concept="3Tm1VV" id="5mr7UHcbl_B" role="1B3o_S" />
       <node concept="10Q1$e" id="5mr7UHcbnc4" role="1tU5fm">
         <node concept="3uibUv" id="5mr7UHcbq0Z" role="10Q1$1">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
         </node>
       </node>
       <node concept="2ShNRf" id="5mr7UHcbowK" role="33vP2m">
@@ -2161,23 +2161,23 @@
             <ref role="1PxDUh" to="cxk7:5$WbtTOYoMb" resolve="LogicalPredicate" />
           </node>
           <node concept="10M0yZ" id="1ggxSI7vXEc" role="3g7hyw">
-            <ref role="1PxDUh" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
-            <ref role="3cqZAo" to="rchb:1ggxSI7vUYU" resolve="EXPRESSION0" />
+            <ref role="1PxDUh" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
+            <ref role="3cqZAo" to="av0y:~JavaPredicateSymbol.EXPRESSION0" resolve="EXPRESSION0" />
           </node>
           <node concept="10M0yZ" id="1ggxSI7vXSW" role="3g7hyw">
-            <ref role="1PxDUh" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
-            <ref role="3cqZAo" to="rchb:1ggxSI7vV1O" resolve="EXPRESSION1" />
+            <ref role="1PxDUh" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
+            <ref role="3cqZAo" to="av0y:~JavaPredicateSymbol.EXPRESSION1" resolve="EXPRESSION1" />
           </node>
           <node concept="10M0yZ" id="1ggxSI7vY7W" role="3g7hyw">
-            <ref role="1PxDUh" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
-            <ref role="3cqZAo" to="rchb:1ggxSI7vV3x" resolve="EXPRESSION2" />
+            <ref role="1PxDUh" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
+            <ref role="3cqZAo" to="av0y:~JavaPredicateSymbol.EXPRESSION2" resolve="EXPRESSION2" />
           </node>
           <node concept="10M0yZ" id="1ggxSI7vYn6" role="3g7hyw">
-            <ref role="1PxDUh" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
-            <ref role="3cqZAo" to="rchb:1ggxSI7vV5$" resolve="EXPRESSION3" />
+            <ref role="1PxDUh" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
+            <ref role="3cqZAo" to="av0y:~JavaPredicateSymbol.EXPRESSION3" resolve="EXPRESSION3" />
           </node>
           <node concept="3uibUv" id="5mr7UHcbqo2" role="3g7fb8">
-            <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+            <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
           </node>
         </node>
       </node>
@@ -2255,7 +2255,7 @@
                   <ref role="3cqZAo" to="i348:5uFPQ7CgjLS" resolve="TYPEOF_SYM" />
                 </node>
                 <node concept="liA8E" id="6UqNvvARsi0" role="2OqNvi">
-                  <ref role="37wK5l" to="rchb:54i3FxcZMvt" resolve="id" />
+                  <ref role="37wK5l" to="av0y:~Symbol.id():java.lang.String" resolve="id" />
                 </node>
               </node>
             </node>
@@ -2277,7 +2277,7 @@
       <node concept="37vLTG" id="2UGjFq4Led0" role="3clF46">
         <property role="TrG5h" value="sessionSolver" />
         <node concept="3uibUv" id="2UGjFq4Les6" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
       </node>
       <node concept="3cqZAl" id="HV6urVFjOn" role="3clF45" />
@@ -2321,7 +2321,7 @@
       <node concept="37vLTG" id="3F6vMxqrzZY" role="3clF46">
         <property role="TrG5h" value="config" />
         <node concept="3uibUv" id="3F6vMxqrBcz" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
+          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
         </node>
       </node>
       <node concept="37vLTG" id="24Vro6cQKgF" role="3clF46">
@@ -2355,7 +2355,7 @@
           <node concept="3cpWsn" id="5mr7UHcbsDS" role="3cpWs9">
             <property role="TrG5h" value="evaluationSession" />
             <node concept="3uibUv" id="5mr7UHcbsDe" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+              <ref role="3uigEE" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
             </node>
           </node>
         </node>
@@ -2370,21 +2370,21 @@
                         <ref role="3cqZAo" node="3F6vMxqrzZY" resolve="config" />
                       </node>
                       <node concept="liA8E" id="3F6vMxqriTU" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:5uFPQ7Bwvg_" resolve="withTrace" />
+                        <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withTrace(jetbrains.mps.logic.reactor.evaluation.EvaluationTrace):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withTrace" />
                         <node concept="37vLTw" id="3F6vMxqrG2C" role="37wK5m">
                           <ref role="3cqZAo" node="24Vro6cQKgF" resolve="cstracer" />
                         </node>
                       </node>
                     </node>
                     <node concept="liA8E" id="5mr7UHcbsE1" role="2OqNvi">
-                      <ref role="37wK5l" to="qrld:5uFPQ7Bwu9Q" resolve="withPredicates" />
+                      <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withPredicates(jetbrains.mps.logic.reactor.program.PredicateSymbol...):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withPredicates" />
                       <node concept="37vLTw" id="5mr7UHcbsE2" role="37wK5m">
                         <ref role="3cqZAo" node="5mr7UHcbnci" resolve="PREDICATE_SYMBOLS" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="5mr7UHcbsE5" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:2UGjFq4L12E" resolve="start" />
+                    <ref role="37wK5l" to="w7la:~EvaluationSession$Config.start(jetbrains.mps.logic.reactor.evaluation.SessionSolver):jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="start" />
                     <node concept="37vLTw" id="2UGjFq4Lf8i" role="37wK5m">
                       <ref role="3cqZAo" node="2UGjFq4Lesf" resolve="sessionSolver" />
                     </node>
@@ -2428,7 +2428,7 @@
                   <ref role="3cqZAo" node="5mr7UHcbsDS" resolve="evaluationSession" />
                 </node>
                 <node concept="liA8E" id="HV6urVCugp" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7BvQxv" resolve="constraintOccurrences" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.constraintOccurrences():java.lang.Iterable" resolve="constraintOccurrences" />
                 </node>
               </node>
             </node>
@@ -2449,7 +2449,7 @@
                   <ref role="3cqZAo" node="5mr7UHcbsDS" resolve="evaluationSession" />
                 </node>
                 <node concept="liA8E" id="HV6urVFj3_" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5uFPQ7BvQxv" resolve="constraintOccurrences" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.constraintOccurrences():java.lang.Iterable" resolve="constraintOccurrences" />
                 </node>
               </node>
               <node concept="37vLTw" id="6HT7BWBUw0F" role="37wK5m">
@@ -2495,7 +2495,7 @@
                           <ref role="3cqZAo" node="5mr7UHcc5Jp" resolve="cs" />
                         </node>
                         <node concept="liA8E" id="7nkyKX7hbMm" role="2OqNvi">
-                          <ref role="37wK5l" to="rchb:54i3FxcZMvt" resolve="id" />
+                          <ref role="37wK5l" to="av0y:~Symbol.id():java.lang.String" resolve="id" />
                         </node>
                       </node>
                     </node>
@@ -2548,7 +2548,7 @@
               <node concept="3cpWsn" id="5mr7UHccsMI" role="1Duv9x">
                 <property role="TrG5h" value="co" />
                 <node concept="3uibUv" id="5mr7UHcct7F" role="1tU5fm">
-                  <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                  <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                 </node>
               </node>
               <node concept="2OqwBi" id="5mr7UHcctx2" role="1DdaDG">
@@ -2556,7 +2556,7 @@
                   <ref role="3cqZAo" node="5mr7UHcbsDS" resolve="evaluationSession" />
                 </node>
                 <node concept="liA8E" id="5mr7UHcct$i" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:5mr7UHccvdG" resolve="constraintOccurrences" />
+                  <ref role="37wK5l" to="w7la:~EvaluationSession.constraintOccurrences(jetbrains.mps.logic.reactor.program.ConstraintSymbol):java.lang.Iterable" resolve="constraintOccurrences" />
                   <node concept="37vLTw" id="5mr7UHcctGr" role="37wK5m">
                     <ref role="3cqZAo" node="5mr7UHcc5Jp" resolve="cs" />
                   </node>
@@ -2567,7 +2567,7 @@
           <node concept="3cpWsn" id="5mr7UHcc5Jp" role="1Duv9x">
             <property role="TrG5h" value="cs" />
             <node concept="3uibUv" id="5mr7UHcc6gS" role="1tU5fm">
-              <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+              <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
             </node>
           </node>
           <node concept="2OqwBi" id="5mr7UHcc6Lo" role="1DdaDG">
@@ -2575,7 +2575,7 @@
               <ref role="3cqZAo" node="5mr7UHcbsDS" resolve="evaluationSession" />
             </node>
             <node concept="liA8E" id="5mr7UHcc6U$" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:5uFPQ7BvQyO" resolve="constraintSymbols" />
+              <ref role="37wK5l" to="w7la:~EvaluationSession.constraintSymbols():java.lang.Iterable" resolve="constraintSymbols" />
             </node>
           </node>
         </node>
@@ -2717,7 +2717,7 @@
                                 <ref role="3cqZAo" node="HV6urVCEUi" resolve="occ" />
                               </node>
                               <node concept="liA8E" id="HV6urVCESX" role="2OqNvi">
-                                <ref role="37wK5l" to="qrld:5uFPQ7BZafw" resolve="arguments" />
+                                <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments():java.util.List" resolve="arguments" />
                               </node>
                             </node>
                           </node>
@@ -2732,14 +2732,14 @@
                     <node concept="3cpWsn" id="HV6urVCET3" role="3cpWs9">
                       <property role="TrG5h" value="typeLogical" />
                       <node concept="3uibUv" id="HV6urVCET4" role="1tU5fm">
-                        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                         <node concept="3uibUv" id="HV6urVCET5" role="11_B2D">
                           <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                       <node concept="10QFUN" id="HV6urVCET6" role="33vP2m">
                         <node concept="3uibUv" id="HV6urVCET7" role="10QFUM">
-                          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                           <node concept="3uibUv" id="HV6urVCET8" role="11_B2D">
                             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                           </node>
@@ -2816,7 +2816,7 @@
                     <node concept="3eNFk2" id="HV6urVCET$" role="3eNLev">
                       <node concept="2ZW3vV" id="HV6urVCET_" role="3eO9$A">
                         <node concept="3uibUv" id="HV6urVCETA" role="2ZW6by">
-                          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                         </node>
                         <node concept="37vLTw" id="HV6urVCETB" role="2ZW6bz">
                           <ref role="3cqZAo" node="HV6urVCETi" resolve="arg1" />
@@ -2830,7 +2830,7 @@
                                 <node concept="1eOMI4" id="HV6urVCETH" role="2Oq$k0">
                                   <node concept="10QFUN" id="HV6urVCETI" role="1eOMHV">
                                     <node concept="3uibUv" id="HV6urVCETJ" role="10QFUM">
-                                      <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                                      <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                                       <node concept="3uibUv" id="HV6urVCETK" role="11_B2D">
                                         <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                                       </node>
@@ -2841,11 +2841,11 @@
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="HV6urVCETM" role="2OqNvi">
-                                  <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                                  <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                                 </node>
                               </node>
                               <node concept="liA8E" id="HV6urVCETN" role="2OqNvi">
-                                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
                               </node>
                             </node>
                             <node concept="37vLTw" id="HV6urVCETO" role="37vLTJ">
@@ -2906,7 +2906,7 @@
                       <ref role="3cqZAo" to="i348:5uFPQ7CgjLS" resolve="TYPEOF_SYM" />
                     </node>
                     <node concept="liA8E" id="HV6urVCEU9" role="2OqNvi">
-                      <ref role="37wK5l" to="rchb:54i3FxcZMvt" resolve="id" />
+                      <ref role="37wK5l" to="av0y:~Symbol.id():java.lang.String" resolve="id" />
                     </node>
                   </node>
                   <node concept="liA8E" id="HV6urVCEUa" role="2OqNvi">
@@ -2918,15 +2918,15 @@
                             <ref role="3cqZAo" node="HV6urVCEUi" resolve="occ" />
                           </node>
                           <node concept="liA8E" id="HV6urVCEUf" role="2OqNvi">
-                            <ref role="37wK5l" to="qrld:5uFPQ7BZacZ" resolve="constraint" />
+                            <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint():jetbrains.mps.logic.reactor.program.Constraint" resolve="constraint" />
                           </node>
                         </node>
                         <node concept="liA8E" id="HV6urVCEUg" role="2OqNvi">
-                          <ref role="37wK5l" to="rchb:5uFPQ7B_aTC" resolve="symbol" />
+                          <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
                         </node>
                       </node>
                       <node concept="liA8E" id="HV6urVCEUh" role="2OqNvi">
-                        <ref role="37wK5l" to="rchb:54i3FxcZMvt" resolve="id" />
+                        <ref role="37wK5l" to="av0y:~Symbol.id():java.lang.String" resolve="id" />
                       </node>
                     </node>
                   </node>
@@ -2936,7 +2936,7 @@
             <node concept="3cpWsn" id="HV6urVCEUi" role="1Duv9x">
               <property role="TrG5h" value="occ" />
               <node concept="3uibUv" id="HV6urVCEUj" role="1tU5fm">
-                <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
               </node>
             </node>
             <node concept="37vLTw" id="HV6urVCEUk" role="1DdaDG">
@@ -2948,7 +2948,7 @@
           <property role="TrG5h" value="constraintOccurrences" />
           <node concept="A3Dl8" id="HV6urVFfJC" role="1tU5fm">
             <node concept="3uibUv" id="HV6urVFfJD" role="A3Ik2">
-              <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+              <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
             </node>
           </node>
         </node>
@@ -2970,7 +2970,7 @@
           <property role="TrG5h" value="constraintOccurrences" />
           <node concept="A3Dl8" id="HV6urVFd80" role="1tU5fm">
             <node concept="3uibUv" id="HV6urVFdwE" role="A3Ik2">
-              <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+              <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
             </node>
           </node>
         </node>
@@ -3004,7 +3004,7 @@
                             <ref role="3cqZAo" node="HV6urVCEVX" resolve="occ" />
                           </node>
                           <node concept="liA8E" id="HV6urVCEUC" role="2OqNvi">
-                            <ref role="37wK5l" to="qrld:5uFPQ7BZafw" resolve="arguments" />
+                            <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments():java.util.List" resolve="arguments" />
                           </node>
                         </node>
                       </node>
@@ -3027,14 +3027,14 @@
                     <node concept="3cpWsn" id="HV6urVCEUI" role="3cpWs9">
                       <property role="TrG5h" value="variable" />
                       <node concept="3uibUv" id="HV6urVCEUJ" role="1tU5fm">
-                        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                         <node concept="3uibUv" id="HV6urVCLNb" role="11_B2D">
                           <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                       <node concept="10QFUN" id="HV6urVCEUK" role="33vP2m">
                         <node concept="3uibUv" id="HV6urVCEUL" role="10QFUM">
-                          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                           <node concept="3uibUv" id="HV6urVCMgy" role="11_B2D">
                             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                           </node>
@@ -3084,7 +3084,7 @@
                           <ref role="3cqZAo" node="HV6urVCEUI" resolve="variable" />
                         </node>
                         <node concept="liA8E" id="HV6urVCOmk" role="2OqNvi">
-                          <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                          <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                         </node>
                       </node>
                       <node concept="37vLTw" id="HV6urVCNoH" role="37wK5m">
@@ -3103,15 +3103,15 @@
                             <ref role="3cqZAo" node="HV6urVCEVX" resolve="occ" />
                           </node>
                           <node concept="liA8E" id="HV6urVCEV8" role="2OqNvi">
-                            <ref role="37wK5l" to="qrld:5uFPQ7BZacZ" resolve="constraint" />
+                            <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint():jetbrains.mps.logic.reactor.program.Constraint" resolve="constraint" />
                           </node>
                         </node>
                         <node concept="liA8E" id="HV6urVCEV9" role="2OqNvi">
-                          <ref role="37wK5l" to="rchb:5uFPQ7B_aTC" resolve="symbol" />
+                          <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
                         </node>
                       </node>
                       <node concept="liA8E" id="HV6urVCEVa" role="2OqNvi">
-                        <ref role="37wK5l" to="rchb:54i3FxcZMvt" resolve="id" />
+                        <ref role="37wK5l" to="av0y:~Symbol.id():java.lang.String" resolve="id" />
                       </node>
                     </node>
                   </node>
@@ -3132,14 +3132,14 @@
                     <node concept="3cpWsn" id="HV6urVCEVj" role="3cpWs9">
                       <property role="TrG5h" value="typeLogical" />
                       <node concept="3uibUv" id="HV6urVCEVk" role="1tU5fm">
-                        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                         <node concept="3uibUv" id="HV6urVCPsS" role="11_B2D">
                           <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                       <node concept="10QFUN" id="HV6urVCEVl" role="33vP2m">
                         <node concept="3uibUv" id="HV6urVCEVm" role="10QFUM">
-                          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                           <node concept="3uibUv" id="HV6urVCPVa" role="11_B2D">
                             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                           </node>
@@ -3162,14 +3162,14 @@
                     <node concept="3cpWsn" id="HV6urVCEVs" role="3cpWs9">
                       <property role="TrG5h" value="boundLogical" />
                       <node concept="3uibUv" id="HV6urVCEVt" role="1tU5fm">
-                        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                         <node concept="3uibUv" id="HV6urVCEVu" role="11_B2D">
                           <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                       <node concept="10QFUN" id="HV6urVCEVv" role="33vP2m">
                         <node concept="3uibUv" id="HV6urVCEVw" role="10QFUM">
-                          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                           <node concept="3uibUv" id="HV6urVCEVx" role="11_B2D">
                             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                           </node>
@@ -3196,7 +3196,7 @@
                           <ref role="3cqZAo" node="HV6urVCEVj" resolve="typeLogical" />
                         </node>
                         <node concept="liA8E" id="HV6urVCRRH" role="2OqNvi">
-                          <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                          <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                         </node>
                       </node>
                       <node concept="2OqwBi" id="HV6urVCScl" role="37wK5m">
@@ -3204,7 +3204,7 @@
                           <ref role="3cqZAo" node="HV6urVCEVs" resolve="boundLogical" />
                         </node>
                         <node concept="liA8E" id="HV6urVCSin" role="2OqNvi">
-                          <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                          <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                         </node>
                       </node>
                     </node>
@@ -3220,15 +3220,15 @@
                             <ref role="3cqZAo" node="HV6urVCEVX" resolve="occ" />
                           </node>
                           <node concept="liA8E" id="HV6urVCEVU" role="2OqNvi">
-                            <ref role="37wK5l" to="qrld:5uFPQ7BZacZ" resolve="constraint" />
+                            <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint():jetbrains.mps.logic.reactor.program.Constraint" resolve="constraint" />
                           </node>
                         </node>
                         <node concept="liA8E" id="HV6urVCEVV" role="2OqNvi">
-                          <ref role="37wK5l" to="rchb:5uFPQ7B_aTC" resolve="symbol" />
+                          <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
                         </node>
                       </node>
                       <node concept="liA8E" id="HV6urVCEVW" role="2OqNvi">
-                        <ref role="37wK5l" to="rchb:54i3FxcZMvt" resolve="id" />
+                        <ref role="37wK5l" to="av0y:~Symbol.id():java.lang.String" resolve="id" />
                       </node>
                     </node>
                   </node>
@@ -3241,7 +3241,7 @@
             <node concept="3cpWsn" id="HV6urVCEVX" role="1Duv9x">
               <property role="TrG5h" value="occ" />
               <node concept="3uibUv" id="HV6urVCEVY" role="1tU5fm">
-                <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
               </node>
             </node>
             <node concept="37vLTw" id="HV6urVCEVZ" role="1DdaDG">
@@ -3270,7 +3270,7 @@
       <property role="TrG5h" value="sessionSolver" />
       <node concept="3Tm6S6" id="2UGjFq4Lesg" role="1B3o_S" />
       <node concept="3uibUv" id="2UGjFq4Lesi" role="1tU5fm">
-        <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
       </node>
     </node>
     <node concept="2tJIrI" id="3F6vMxqgcMq" role="jymVt" />
@@ -4756,7 +4756,7 @@
       <node concept="37vLTG" id="1n2ZgJ3Lehc" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="1n2ZgJ3Lehd" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="1n2ZgJ3Lehe" role="3clF45" />
@@ -4804,7 +4804,7 @@
       <node concept="37vLTG" id="1n2ZgJ3LOsN" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="1n2ZgJ3LOsO" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="1n2ZgJ3LOsP" role="3clF45" />
@@ -4852,7 +4852,7 @@
       <node concept="37vLTG" id="1n2ZgJ3LUaD" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="1n2ZgJ3LUaE" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="1n2ZgJ3LUaF" role="3clF45" />
@@ -4900,7 +4900,7 @@
       <node concept="37vLTG" id="1n2ZgJ3LYH_" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="1n2ZgJ3LYHA" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="1n2ZgJ3LYHB" role="3clF45" />
@@ -4948,7 +4948,7 @@
       <node concept="37vLTG" id="1n2ZgJ3Mk5E" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="63ioh_TWYPD" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="1n2ZgJ3Mk5G" role="3clF45" />
@@ -4969,7 +4969,7 @@
                   <node concept="10QFUN" id="63ioh_TXaV9" role="1eOMHV">
                     <node concept="A3Dl8" id="63ioh_TXaVa" role="10QFUM">
                       <node concept="3uibUv" id="63ioh_TXaVb" role="A3Ik2">
-                        <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                        <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                       </node>
                     </node>
                     <node concept="2OqwBi" id="63ioh_TXaVc" role="10QFUP">
@@ -4977,7 +4977,7 @@
                         <ref role="3cqZAo" node="1n2ZgJ3Mk5E" resolve="matchRule" />
                       </node>
                       <node concept="liA8E" id="63ioh_TXaVe" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:63ioh_TWUn6" resolve="matchHeadKept" />
+                        <ref role="37wK5l" to="w7la:~MatchRule.matchHeadKept():java.lang.Iterable" resolve="matchHeadKept" />
                       </node>
                     </node>
                   </node>
@@ -5021,7 +5021,7 @@
                   <node concept="10QFUN" id="63ioh_TXbeq" role="1eOMHV">
                     <node concept="A3Dl8" id="63ioh_TXber" role="10QFUM">
                       <node concept="3uibUv" id="63ioh_TXbes" role="A3Ik2">
-                        <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                        <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                       </node>
                     </node>
                     <node concept="2OqwBi" id="63ioh_TXbet" role="10QFUP">
@@ -5029,7 +5029,7 @@
                         <ref role="3cqZAo" node="1n2ZgJ3Mk5E" resolve="matchRule" />
                       </node>
                       <node concept="liA8E" id="63ioh_TXbev" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:63ioh_TWUu6" resolve="matchHeadReplaced" />
+                        <ref role="37wK5l" to="w7la:~MatchRule.matchHeadReplaced():java.lang.Iterable" resolve="matchHeadReplaced" />
                       </node>
                     </node>
                   </node>
@@ -5092,11 +5092,11 @@
                                       <ref role="3cqZAo" node="1n2ZgJ3Mk5E" resolve="matchRule" />
                                     </node>
                                     <node concept="liA8E" id="63ioh_TWZDq" role="2OqNvi">
-                                      <ref role="37wK5l" to="qrld:63ioh_TWUmb" resolve="rule" />
+                                      <ref role="37wK5l" to="w7la:~MatchRule.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="1n2ZgJ3MwHx" role="2OqNvi">
-                                    <ref role="37wK5l" to="rchb:6lpwCiZj$RR" resolve="tag" />
+                                    <ref role="37wK5l" to="av0y:~Rule.tag():java.lang.String" resolve="tag" />
                                   </node>
                                 </node>
                               </node>
@@ -5138,7 +5138,7 @@
       <node concept="37vLTG" id="2_NfR5whSFY" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="2_NfR5whSFZ" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="2_NfR5whSG0" role="3clF45" />
@@ -5167,7 +5167,7 @@
       <node concept="37vLTG" id="2UGjFq4b$XX" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="2UGjFq4b$XY" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="2UGjFq4b$XZ" role="3clF45" />
@@ -5184,7 +5184,7 @@
       <node concept="37vLTG" id="2T1p0CFMQxb" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="2T1p0CFMQxc" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="2T1p0CFMQxd" role="3clF45" />
@@ -5201,7 +5201,7 @@
       <node concept="37vLTG" id="2UGjFq4b$Y5" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="2UGjFq4b$Y6" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="2UGjFq4b$Y7" role="3clF45" />
@@ -5233,11 +5233,11 @@
                             <ref role="3cqZAo" node="2UGjFq4b$Y5" resolve="matchRule" />
                           </node>
                           <node concept="liA8E" id="2T1p0CFsBVt" role="2OqNvi">
-                            <ref role="37wK5l" to="qrld:63ioh_TWUmb" resolve="rule" />
+                            <ref role="37wK5l" to="w7la:~MatchRule.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
                           </node>
                         </node>
                         <node concept="liA8E" id="1n2ZgJ3MrjK" role="2OqNvi">
-                          <ref role="37wK5l" to="rchb:6lpwCiZj$RR" resolve="tag" />
+                          <ref role="37wK5l" to="av0y:~Rule.tag():java.lang.String" resolve="tag" />
                         </node>
                       </node>
                     </node>
@@ -5262,7 +5262,7 @@
       <node concept="37vLTG" id="2UGjFq4bK4j" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="2UGjFq4bK4k" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="3cqZAl" id="2UGjFq4bK4l" role="3clF45" />
@@ -5285,7 +5285,7 @@
                           <ref role="3cqZAo" node="2UGjFq4bK4j" resolve="invocation" />
                         </node>
                         <node concept="liA8E" id="2T1p0CFtu5D" role="2OqNvi">
-                          <ref role="37wK5l" to="qrld:49L2l3FhtTG" resolve="arguments" />
+                          <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
                         </node>
                       </node>
                       <node concept="3cpWs3" id="2T1p0CFtu5E" role="3uHU7B">
@@ -5299,11 +5299,11 @@
                                 <ref role="3cqZAo" node="2UGjFq4bK4j" resolve="invocation" />
                               </node>
                               <node concept="liA8E" id="2T1p0CFtu5O" role="2OqNvi">
-                                <ref role="37wK5l" to="qrld:49L2l3FhtSL" resolve="predicate" />
+                                <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate():jetbrains.mps.logic.reactor.program.Predicate" resolve="predicate" />
                               </node>
                             </node>
                             <node concept="liA8E" id="2T1p0CFtu5P" role="2OqNvi">
-                              <ref role="37wK5l" to="rchb:6Kcfpq7Bjgi" resolve="symbol" />
+                              <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
                             </node>
                           </node>
                         </node>
@@ -5334,7 +5334,7 @@
       <node concept="37vLTG" id="2UGjFq4bK4t" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="2UGjFq4bK4u" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="3cqZAl" id="2UGjFq4bK4v" role="3clF45" />
@@ -5394,7 +5394,7 @@
                           <ref role="3cqZAo" node="2UGjFq4bK4t" resolve="invocation" />
                         </node>
                         <node concept="liA8E" id="2T1p0CFsU_z" role="2OqNvi">
-                          <ref role="37wK5l" to="qrld:49L2l3FhtTG" resolve="arguments" />
+                          <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
                         </node>
                       </node>
                       <node concept="3cpWs3" id="2T1p0CFBjwD" role="3uHU7B">
@@ -5418,11 +5418,11 @@
                                 <ref role="3cqZAo" node="2UGjFq4bK4t" resolve="invocation" />
                               </node>
                               <node concept="liA8E" id="2T1p0CFsSuK" role="2OqNvi">
-                                <ref role="37wK5l" to="qrld:49L2l3FhtSL" resolve="predicate" />
+                                <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate():jetbrains.mps.logic.reactor.program.Predicate" resolve="predicate" />
                               </node>
                             </node>
                             <node concept="liA8E" id="2T1p0CFsSK5" role="2OqNvi">
-                              <ref role="37wK5l" to="rchb:6Kcfpq7Bjgi" resolve="symbol" />
+                              <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
                             </node>
                           </node>
                         </node>
@@ -5449,7 +5449,7 @@
       <node concept="37vLTG" id="7vxJ_H4uwFs" role="3clF46">
         <property role="TrG5h" value="fail" />
         <node concept="3uibUv" id="7vxJ_H4uwFt" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:7vxJ_H4qn42" resolve="EvaluationFailureException" />
+          <ref role="3uigEE" to="w7la:~EvaluationFailureException" resolve="EvaluationFailureException" />
         </node>
       </node>
       <node concept="3cqZAl" id="7vxJ_H4uwFu" role="3clF45" />
@@ -5538,7 +5538,7 @@
       <node concept="37vLTG" id="7FtwPOZHe8Q" role="3clF46">
         <property role="TrG5h" value="constraint" />
         <node concept="3uibUv" id="5mr7UHcce83" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="7FtwPOZHe8V" role="3clF45" />
@@ -5586,7 +5586,7 @@
       <node concept="37vLTG" id="7nkyKX7gYtK" role="3clF46">
         <property role="TrG5h" value="constraint" />
         <node concept="3uibUv" id="5mr7UHccezE" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="7nkyKX7gYtM" role="3clF45" />
@@ -6076,7 +6076,7 @@
           </node>
           <node concept="2ZW3vV" id="1n2ZgJ3L$U6" role="3clFbw">
             <node concept="3uibUv" id="1n2ZgJ3L_eY" role="2ZW6by">
-              <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+              <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
             </node>
             <node concept="37vLTw" id="1n2ZgJ3L$Sn" role="2ZW6bz">
               <ref role="3cqZAo" node="1n2ZgJ3Lsnv" resolve="o" />
@@ -7118,7 +7118,7 @@
                                   <node concept="3cpWsn" id="506k$zeU3HS" role="3cpWs9">
                                     <property role="TrG5h" value="program" />
                                     <node concept="3uibUv" id="5rhZO$U0kPD" role="1tU5fm">
-                                      <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+                                      <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
                                     </node>
                                     <node concept="2OqwBi" id="5rhZO$U0dGH" role="33vP2m">
                                       <node concept="37vLTw" id="5rhZO$U0d7C" role="2Oq$k0">
@@ -7291,13 +7291,13 @@
         <node concept="3Tm1VV" id="3F6vMxq$OGQ" role="1B3o_S" />
         <node concept="_YKpA" id="1pPth$lE8zt" role="1tU5fm">
           <node concept="3uibUv" id="78CwJJcTw4D" role="_ZDj9">
-            <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+            <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
           </node>
         </node>
         <node concept="2ShNRf" id="1pPth$lGhrs" role="33vP2m">
           <node concept="Tc6Ow" id="1pPth$lGhro" role="2ShVmc">
             <node concept="3uibUv" id="78CwJJcTx9$" role="HW$YZ">
-              <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+              <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
             </node>
           </node>
         </node>
@@ -7306,14 +7306,14 @@
         <property role="TrG5h" value="expressionSolvers" />
         <node concept="3Tm1VV" id="3F6vMxq$S9w" role="1B3o_S" />
         <node concept="_YKpA" id="3F6vMxqlY2Z" role="1tU5fm">
-          <node concept="3uibUv" id="3F6vMxqlZdi" role="_ZDj9">
-            <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+          <node concept="3uibUv" id="1HG00HG2jdg" role="_ZDj9">
+            <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
           </node>
         </node>
         <node concept="2ShNRf" id="3F6vMxqm03O" role="33vP2m">
           <node concept="Tc6Ow" id="3F6vMxqlZFJ" role="2ShVmc">
-            <node concept="3uibUv" id="3F6vMxqlZFK" role="HW$YZ">
-              <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+            <node concept="3uibUv" id="1HG00HG2n8Y" role="HW$YZ">
+              <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
             </node>
           </node>
         </node>
@@ -7510,7 +7510,7 @@
                                 <node concept="1uHKPH" id="1N_0WA5HeA2" role="2OqNvi" />
                               </node>
                               <node concept="liA8E" id="YgAcJaUSy3" role="2OqNvi">
-                                <ref role="37wK5l" to="rchb:78CwJJcTOB4" resolve="name" />
+                                <ref role="37wK5l" to="av0y:~Program.name():java.lang.String" resolve="name" />
                               </node>
                             </node>
                             <node concept="2OqwBi" id="HV6urVGeo5" role="37wK5m">
@@ -7650,7 +7650,7 @@
                       <node concept="3cpWsn" id="3F6vMxqehe_" role="3cpWs9">
                         <property role="TrG5h" value="program" />
                         <node concept="3uibUv" id="3F6vMxqehez" role="1tU5fm">
-                          <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+                          <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
                         </node>
                         <node concept="2OqwBi" id="3F6vMxqeheA" role="33vP2m">
                           <node concept="2OqwBi" id="3F6vMxqeheB" role="2Oq$k0">
@@ -7697,7 +7697,7 @@
                               <node concept="3cpWsn" id="3F6vMxqe8jK" role="3cpWs9">
                                 <property role="TrG5h" value="config" />
                                 <node concept="3uibUv" id="3F6vMxqe8jL" role="1tU5fm">
-                                  <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
+                                  <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
                                 </node>
                                 <node concept="2OqwBi" id="3F6vMxqqDsF" role="33vP2m">
                                   <node concept="2OqwBi" id="3F6vMxqqtDz" role="2Oq$k0">
@@ -7711,7 +7711,7 @@
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="3F6vMxqqwSs" role="2OqNvi">
-                                      <ref role="37wK5l" to="qrld:5mr7UHcbbR2" resolve="withParam" />
+                                      <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withParam(java.lang.String,java.lang.Object):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withParam" />
                                       <node concept="Xl_RD" id="3F6vMxqqzhz" role="37wK5m">
                                         <property role="Xl_RC" value="profiling.data" />
                                       </node>
@@ -7721,7 +7721,7 @@
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="3F6vMxqqHCb" role="2OqNvi">
-                                    <ref role="37wK5l" to="qrld:5uFPQ7Bwvg_" resolve="withTrace" />
+                                    <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withTrace(jetbrains.mps.logic.reactor.evaluation.EvaluationTrace):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withTrace" />
                                     <node concept="37vLTw" id="3F6vMxqqN1j" role="37wK5m">
                                       <ref role="3cqZAo" node="3jXBvmTK0xQ" resolve="multitrace" />
                                     </node>
@@ -7742,7 +7742,7 @@
                                       <ref role="37wK5l" node="7vxJ_H4tBm6" resolve="failure" />
                                       <node concept="2ShNRf" id="3F6vMxqr7rx" role="37wK5m">
                                         <node concept="1pGfFk" id="3F6vMxqr7ry" role="2ShVmc">
-                                          <ref role="37wK5l" to="qrld:7vxJ_H4qql2" resolve="EvaluationFailureException" />
+                                          <ref role="37wK5l" to="w7la:~EvaluationFailureException.&lt;init&gt;(java.lang.String)" resolve="EvaluationFailureException" />
                                           <node concept="Xl_RD" id="3F6vMxqr7rz" role="37wK5m">
                                             <property role="Xl_RC" value="garbage constraints" />
                                           </node>
@@ -7805,7 +7805,7 @@
                             <node concept="3cpWsn" id="7vxJ_H4sDdu" role="TDEfY">
                               <property role="TrG5h" value="fail" />
                               <node concept="3uibUv" id="7vxJ_H4sEci" role="1tU5fm">
-                                <ref role="3uigEE" to="qrld:7vxJ_H4qn42" resolve="EvaluationFailureException" />
+                                <ref role="3uigEE" to="w7la:~EvaluationFailureException" resolve="EvaluationFailureException" />
                               </node>
                             </node>
                             <node concept="3clFbS" id="7vxJ_H4sDdw" role="TDEfX">
@@ -7923,7 +7923,7 @@
                                     <ref role="37wK5l" node="7vxJ_H4tBm6" resolve="failure" />
                                     <node concept="2ShNRf" id="7vxJ_H4tXhT" role="37wK5m">
                                       <node concept="1pGfFk" id="7vxJ_H4u0fc" role="2ShVmc">
-                                        <ref role="37wK5l" to="qrld:7vxJ_H4qqnq" resolve="EvaluationFailureException" />
+                                        <ref role="37wK5l" to="w7la:~EvaluationFailureException.&lt;init&gt;(java.lang.Throwable)" resolve="EvaluationFailureException" />
                                         <node concept="37vLTw" id="7vxJ_H4u17j" role="37wK5m">
                                           <ref role="3cqZAo" node="1pPth$l_ZkR" resolve="e" />
                                         </node>
@@ -8093,12 +8093,12 @@
         <property role="TrG5h" value="createSessionSolver" />
         <node concept="37vLTG" id="3F6vMxqmh0e" role="3clF46">
           <property role="TrG5h" value="expressionSolver" />
-          <node concept="3uibUv" id="3F6vMxqmoOj" role="1tU5fm">
-            <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+          <node concept="3uibUv" id="1HG00HG2qpP" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
           </node>
         </node>
         <node concept="3uibUv" id="3F6vMxqlLKq" role="3clF45">
-          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
         </node>
         <node concept="3Tmbuc" id="3F6vMxql$1D" role="1B3o_S" />
         <node concept="3clFbS" id="3F6vMxql$1E" role="3clF47">
@@ -8119,12 +8119,12 @@
         <property role="TrG5h" value="createConfig" />
         <node concept="3Tmbuc" id="3F6vMxqjqea" role="1B3o_S" />
         <node concept="3uibUv" id="3F6vMxqjkf8" role="3clF45">
-          <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
+          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
         </node>
         <node concept="37vLTG" id="3F6vMxqjkeU" role="3clF46">
           <property role="TrG5h" value="program" />
           <node concept="3uibUv" id="3F6vMxqjkeV" role="1tU5fm">
-            <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+            <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
           </node>
         </node>
         <node concept="37vLTG" id="3F6vMxqjkeY" role="3clF46">
@@ -8137,14 +8137,14 @@
           <node concept="3cpWs6" id="3F6vMxqjkeS" role="3cqZAp">
             <node concept="2OqwBi" id="3F6vMxqk2yx" role="3cqZAk">
               <node concept="2YIFZM" id="3F6vMxqk2yy" role="2Oq$k0">
-                <ref role="37wK5l" to="qrld:7ISVfSIwfH" resolve="newSession" />
-                <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+                <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                <ref role="37wK5l" to="w7la:~EvaluationSession.newSession(jetbrains.mps.logic.reactor.program.Program):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="newSession" />
                 <node concept="37vLTw" id="3F6vMxqk2yz" role="37wK5m">
                   <ref role="3cqZAo" node="3F6vMxqjkeU" resolve="program" />
                 </node>
               </node>
               <node concept="liA8E" id="3F6vMxqk2y$" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:5mr7UHcbbR2" resolve="withParam" />
+                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withParam(java.lang.String,java.lang.Object):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withParam" />
                 <node concept="Xl_RD" id="3F6vMxqk2y_" role="37wK5m">
                   <property role="Xl_RC" value="main" />
                 </node>
@@ -8154,7 +8154,7 @@
                       <ref role="37wK5l" to="nz6g:4sSe4$oM2rk" resolve="ConstraintBuilder" />
                       <node concept="2ShNRf" id="3F6vMxqk2yD" role="37wK5m">
                         <node concept="1pGfFk" id="3F6vMxqk2yE" role="2ShVmc">
-                          <ref role="37wK5l" to="rchb:54i3FxcZMv0" resolve="ConstraintSymbol" />
+                          <ref role="37wK5l" to="av0y:~ConstraintSymbol.&lt;init&gt;(java.lang.String,int)" resolve="ConstraintSymbol" />
                           <node concept="Xl_RD" id="3F6vMxqk2yF" role="37wK5m">
                             <property role="Xl_RC" value="main" />
                           </node>
@@ -9427,7 +9427,7 @@
       <node concept="37vLTG" id="7nPD14NbLup" role="3clF46">
         <property role="TrG5h" value="constraint" />
         <node concept="3uibUv" id="7nPD14NbLuq" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="7nPD14NbLur" role="3clF45" />
@@ -9471,7 +9471,7 @@
       <node concept="37vLTG" id="7nPD14NbLuw" role="3clF46">
         <property role="TrG5h" value="constraint" />
         <node concept="3uibUv" id="7nPD14NbLux" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="7nPD14NbLuy" role="3clF45" />
@@ -9557,7 +9557,7 @@
       <node concept="37vLTG" id="7nPD14NbLuI" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="7nPD14NbLuJ" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="7nPD14NbLuK" role="3clF45" />
@@ -9577,7 +9577,7 @@
                         <ref role="3cqZAo" node="7nPD14NbQMu" resolve="it" />
                       </node>
                       <node concept="liA8E" id="7nPD14NbQMs" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:1n2ZgJ3LbVz" resolve="activate" />
+                        <ref role="37wK5l" to="w7la:~EvaluationTrace.activate(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence):void" resolve="activate" />
                         <node concept="37vLTw" id="7nPD14Nc32n" role="37wK5m">
                           <ref role="3cqZAo" node="7nPD14NbLuI" resolve="occurrence" />
                         </node>
@@ -9601,7 +9601,7 @@
       <node concept="37vLTG" id="7nPD14NbLuQ" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="7nPD14NbLuR" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="7nPD14NbLuS" role="3clF45" />
@@ -9621,7 +9621,7 @@
                         <ref role="3cqZAo" node="7nPD14NbRNk" resolve="it" />
                       </node>
                       <node concept="liA8E" id="7nPD14NbRNi" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:1n2ZgJ3LchZ" resolve="reactivate" />
+                        <ref role="37wK5l" to="w7la:~EvaluationTrace.reactivate(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence):void" resolve="reactivate" />
                         <node concept="37vLTw" id="7nPD14Nc3nG" role="37wK5m">
                           <ref role="3cqZAo" node="7nPD14NbLuQ" resolve="occurrence" />
                         </node>
@@ -9645,7 +9645,7 @@
       <node concept="37vLTG" id="7nPD14NbLuY" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="7nPD14NbLuZ" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="7nPD14NbLv0" role="3clF45" />
@@ -9665,7 +9665,7 @@
                         <ref role="3cqZAo" node="7nPD14NbSot" resolve="it" />
                       </node>
                       <node concept="liA8E" id="7nPD14NbSor" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:1n2ZgJ3Lcwj" resolve="suspend" />
+                        <ref role="37wK5l" to="w7la:~EvaluationTrace.suspend(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence):void" resolve="suspend" />
                         <node concept="37vLTw" id="7nPD14Nc3H1" role="37wK5m">
                           <ref role="3cqZAo" node="7nPD14NbLuY" resolve="occurrence" />
                         </node>
@@ -9689,7 +9689,7 @@
       <node concept="37vLTG" id="7nPD14NbLv6" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="7nPD14NbLv7" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="7nPD14NbLv8" role="3clF45" />
@@ -9709,7 +9709,7 @@
                         <ref role="3cqZAo" node="7nPD14NbSTz" resolve="it" />
                       </node>
                       <node concept="liA8E" id="7nPD14NbSTx" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:1n2ZgJ3LcII" resolve="discard" />
+                        <ref role="37wK5l" to="w7la:~EvaluationTrace.discard(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence):void" resolve="discard" />
                         <node concept="37vLTw" id="7nPD14Nc42m" role="37wK5m">
                           <ref role="3cqZAo" node="7nPD14NbLv6" resolve="occurrence" />
                         </node>
@@ -9733,7 +9733,7 @@
       <node concept="37vLTG" id="2UGjFq4bW0h" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="2UGjFq4bW0i" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="2UGjFq4bW0j" role="3clF45" />
@@ -9753,7 +9753,7 @@
                         <ref role="3cqZAo" node="2UGjFq4bWFw" resolve="it" />
                       </node>
                       <node concept="liA8E" id="2UGjFq4bWFu" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:1n2ZgJ3Mgj2" resolve="trying" />
+                        <ref role="37wK5l" to="w7la:~EvaluationTrace.trying(jetbrains.mps.logic.reactor.evaluation.MatchRule):void" resolve="trying" />
                         <node concept="37vLTw" id="2UGjFq4bWFv" role="37wK5m">
                           <ref role="3cqZAo" node="2UGjFq4bW0h" resolve="matchRule" />
                         </node>
@@ -9777,7 +9777,7 @@
       <node concept="37vLTG" id="2T1p0CFMVBA" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="2T1p0CFMVBB" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="2T1p0CFMVBC" role="3clF45" />
@@ -9797,7 +9797,7 @@
                         <ref role="3cqZAo" node="2T1p0CFMWnV" resolve="it" />
                       </node>
                       <node concept="liA8E" id="2T1p0CFMWnT" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:2T1p0CFMG_4" resolve="reject" />
+                        <ref role="37wK5l" to="w7la:~EvaluationTrace.reject(jetbrains.mps.logic.reactor.evaluation.MatchRule):void" resolve="reject" />
                         <node concept="37vLTw" id="2T1p0CFMX6J" role="37wK5m">
                           <ref role="3cqZAo" node="2T1p0CFMVBA" resolve="matchRule" />
                         </node>
@@ -9821,7 +9821,7 @@
       <node concept="37vLTG" id="7nPD14NbLve" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="7nPD14NbLvf" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="7nPD14NbLvg" role="3clF45" />
@@ -9841,7 +9841,7 @@
                         <ref role="3cqZAo" node="7nPD14NbTxU" resolve="it" />
                       </node>
                       <node concept="liA8E" id="7nPD14NbTxS" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:2UGjFq4881h" resolve="trigger" />
+                        <ref role="37wK5l" to="w7la:~EvaluationTrace.trigger(jetbrains.mps.logic.reactor.evaluation.MatchRule):void" resolve="trigger" />
                         <node concept="37vLTw" id="7nPD14NbUdz" role="37wK5m">
                           <ref role="3cqZAo" node="7nPD14NbLve" resolve="matchRule" />
                         </node>
@@ -9865,7 +9865,7 @@
       <node concept="37vLTG" id="2_NfR5wi4YF" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="2_NfR5wi4YG" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="2_NfR5wi4YH" role="3clF45" />
@@ -9885,7 +9885,7 @@
                         <ref role="3cqZAo" node="2_NfR5wi5Os" resolve="it" />
                       </node>
                       <node concept="liA8E" id="2_NfR5wi5Oq" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:2_NfR5wgXZH" resolve="retry" />
+                        <ref role="37wK5l" to="w7la:~EvaluationTrace.retry(jetbrains.mps.logic.reactor.evaluation.MatchRule):void" resolve="retry" />
                         <node concept="37vLTw" id="2_NfR5wi5Or" role="37wK5m">
                           <ref role="3cqZAo" node="2_NfR5wi4YF" resolve="matchRule" />
                         </node>
@@ -9909,7 +9909,7 @@
       <node concept="37vLTG" id="2UGjFq4bWOF" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="2UGjFq4bWOG" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="2UGjFq4bWOH" role="3clF45" />
@@ -9929,7 +9929,7 @@
                         <ref role="3cqZAo" node="2UGjFq4bXys" resolve="it" />
                       </node>
                       <node concept="liA8E" id="2UGjFq4bXyq" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:2UGjFq489cz" resolve="finish" />
+                        <ref role="37wK5l" to="w7la:~EvaluationTrace.finish(jetbrains.mps.logic.reactor.evaluation.MatchRule):void" resolve="finish" />
                         <node concept="37vLTw" id="2UGjFq4bXyr" role="37wK5m">
                           <ref role="3cqZAo" node="2UGjFq4bWOF" resolve="matchRule" />
                         </node>
@@ -9953,7 +9953,7 @@
       <node concept="37vLTG" id="2UGjFq4bXFj" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="2UGjFq4bXFk" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="3cqZAl" id="2UGjFq4bXFl" role="3clF45" />
@@ -9973,7 +9973,7 @@
                         <ref role="3cqZAo" node="2UGjFq4bYAr" resolve="it" />
                       </node>
                       <node concept="liA8E" id="2UGjFq4bYAp" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:2UGjFq48i6t" resolve="tell" />
+                        <ref role="37wK5l" to="w7la:~EvaluationTrace.tell(jetbrains.mps.logic.reactor.evaluation.PredicateInvocation):void" resolve="tell" />
                         <node concept="37vLTw" id="2UGjFq4c54U" role="37wK5m">
                           <ref role="3cqZAo" node="2UGjFq4bXFj" resolve="invocation" />
                         </node>
@@ -10001,7 +10001,7 @@
       <node concept="37vLTG" id="2UGjFq4bXFt" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="2UGjFq4bXFu" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="3cqZAl" id="2UGjFq4bXFv" role="3clF45" />
@@ -10021,7 +10021,7 @@
                         <ref role="3cqZAo" node="2UGjFq4c59e" resolve="it" />
                       </node>
                       <node concept="liA8E" id="2UGjFq4c59c" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:2UGjFq48iLL" resolve="ask" />
+                        <ref role="37wK5l" to="w7la:~EvaluationTrace.ask(boolean,jetbrains.mps.logic.reactor.evaluation.PredicateInvocation):void" resolve="ask" />
                         <node concept="37vLTw" id="2UGjFq4c5SX" role="37wK5m">
                           <ref role="3cqZAo" node="2UGjFq4bXFr" resolve="result" />
                         </node>
@@ -10048,7 +10048,7 @@
       <node concept="37vLTG" id="7vxJ_H4tBm7" role="3clF46">
         <property role="TrG5h" value="fail" />
         <node concept="3uibUv" id="7vxJ_H4tBm8" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:7vxJ_H4qn42" resolve="EvaluationFailureException" />
+          <ref role="3uigEE" to="w7la:~EvaluationFailureException" resolve="EvaluationFailureException" />
         </node>
       </node>
       <node concept="3cqZAl" id="7vxJ_H4tBm9" role="3clF45" />
@@ -10068,7 +10068,7 @@
                         <ref role="3cqZAo" node="7vxJ_H4tCP4" resolve="it" />
                       </node>
                       <node concept="liA8E" id="7vxJ_H4tCP2" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:7vxJ_H4th$o" resolve="failure" />
+                        <ref role="37wK5l" to="w7la:~EvaluationTrace.failure(jetbrains.mps.logic.reactor.evaluation.EvaluationFailureException):void" resolve="failure" />
                         <node concept="37vLTw" id="7vxJ_H4tDhv" role="37wK5m">
                           <ref role="3cqZAo" node="7vxJ_H4tBm7" resolve="fail" />
                         </node>
@@ -10110,7 +10110,7 @@
                         <ref role="3cqZAo" node="7nPD14NbYZ5" resolve="it" />
                       </node>
                       <node concept="liA8E" id="7nPD14NbYZ2" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:7feMCq_cIni" resolve="reportFailure" />
+                        <ref role="37wK5l" to="w7la:~EvaluationTrace.reportFailure(java.lang.String):void" resolve="reportFailure" />
                         <node concept="37vLTw" id="7nPD14Nc02L" role="37wK5m">
                           <ref role="3cqZAo" node="7nPD14NbLwa" resolve="message" />
                         </node>
@@ -13875,7 +13875,7 @@
           <property role="TrG5h" value="event" />
           <node concept="1LlUBW" id="4VwaB4LlMlS" role="1tU5fm">
             <node concept="3uibUv" id="4VwaB4LlNkx" role="1Lm7xW">
-              <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+              <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
             </node>
             <node concept="3uibUv" id="4VwaB4LlNQG" role="1Lm7xW">
               <ref role="3uigEE" to="wyt6:~String" resolve="String" />
@@ -13922,7 +13922,7 @@
         <ref role="3uigEE" node="4VwaB4LlZ1n" resolve="ActivationNodes.DefaultTreeNode" />
         <node concept="1LlUBW" id="4VwaB4Lmdra" role="11_B2D">
           <node concept="3uibUv" id="4VwaB4Lmdrb" role="1Lm7xW">
-            <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
           </node>
           <node concept="3uibUv" id="4VwaB4Lmdrc" role="1Lm7xW">
             <ref role="3uigEE" to="wyt6:~String" resolve="String" />
@@ -13953,7 +13953,7 @@
           <property role="TrG5h" value="event" />
           <node concept="1LlUBW" id="6_UQWSXejEU" role="1tU5fm">
             <node concept="3uibUv" id="6_UQWSXekV8" role="1Lm7xW">
-              <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+              <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
             </node>
             <node concept="3uibUv" id="6_UQWSXejEW" role="1Lm7xW">
               <ref role="3uigEE" to="wyt6:~String" resolve="String" />
@@ -14000,7 +14000,7 @@
         <ref role="3uigEE" node="4VwaB4LlZ1n" resolve="ActivationNodes.DefaultTreeNode" />
         <node concept="1LlUBW" id="6_UQWSXejF0" role="11_B2D">
           <node concept="3uibUv" id="6_UQWSXekpV" role="1Lm7xW">
-            <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+            <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
           </node>
           <node concept="3uibUv" id="6_UQWSXejF2" role="1Lm7xW">
             <ref role="3uigEE" to="wyt6:~String" resolve="String" />
@@ -14017,7 +14017,7 @@
           <property role="TrG5h" value="match" />
           <node concept="1LlUBW" id="6bBjpI83oo_" role="1tU5fm">
             <node concept="3uibUv" id="6bBjpI83ooA" role="1Lm7xW">
-              <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+              <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
             </node>
             <node concept="3uibUv" id="32fHqDfefKU" role="1Lm7xW">
               <ref role="3uigEE" node="5X6ji59xezw" resolve="ActivationEvent" />
@@ -14081,7 +14081,7 @@
         <ref role="3uigEE" node="4VwaB4LlZ1n" resolve="ActivationNodes.DefaultTreeNode" />
         <node concept="1LlUBW" id="4VwaB4LmiAf" role="11_B2D">
           <node concept="3uibUv" id="4VwaB4LmiAg" role="1Lm7xW">
-            <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
           </node>
           <node concept="3uibUv" id="32fHqDfef9h" role="1Lm7xW">
             <ref role="3uigEE" node="5X6ji59xezw" resolve="ActivationEvent" />
@@ -14099,10 +14099,10 @@
           <property role="TrG5h" value="match" />
           <node concept="1LlUBW" id="6bBjpI85Qrt" role="1tU5fm">
             <node concept="3uibUv" id="6bBjpI85Qru" role="1Lm7xW">
-              <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+              <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
             </node>
             <node concept="3uibUv" id="6bBjpI85Qrw" role="1Lm7xW">
-              <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+              <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
             </node>
             <node concept="10P_77" id="4VwaB4LlUcx" role="1Lm7xW" />
           </node>
@@ -14160,10 +14160,10 @@
         <ref role="3uigEE" node="4VwaB4LlZ1n" resolve="ActivationNodes.DefaultTreeNode" />
         <node concept="1LlUBW" id="4VwaB4LmYK$" role="11_B2D">
           <node concept="3uibUv" id="4VwaB4LmYK_" role="1Lm7xW">
-            <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
           </node>
           <node concept="3uibUv" id="4VwaB4LmYKA" role="1Lm7xW">
-            <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
           </node>
           <node concept="10P_77" id="4VwaB4LmYKB" role="1Lm7xW" />
         </node>
@@ -14179,7 +14179,7 @@
           <property role="TrG5h" value="match" />
           <node concept="1LlUBW" id="4VwaB4LGpdV" role="1tU5fm">
             <node concept="3uibUv" id="4VwaB4LGpdW" role="1Lm7xW">
-              <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+              <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
             </node>
           </node>
         </node>
@@ -14236,7 +14236,7 @@
         <ref role="3uigEE" node="4VwaB4LlZ1n" resolve="ActivationNodes.DefaultTreeNode" />
         <node concept="1LlUBW" id="4VwaB4LGpe8" role="11_B2D">
           <node concept="3uibUv" id="4VwaB4LGpe9" role="1Lm7xW">
-            <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
           </node>
         </node>
       </node>
@@ -14718,7 +14718,7 @@
               </node>
               <node concept="1LlUBW" id="6bBjpI85VsC" role="1tU5fm">
                 <node concept="3uibUv" id="6bBjpI85VsD" role="1Lm7xW">
-                  <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+                  <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
                 </node>
                 <node concept="3uibUv" id="32fHqDff1js" role="1Lm7xW">
                   <ref role="3uigEE" node="5X6ji59xezw" resolve="ActivationEvent" />
@@ -14759,7 +14759,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="6RFuZEC71Wp" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:63ioh_TWUmb" resolve="rule" />
+                    <ref role="37wK5l" to="w7la:~MatchRule.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
                   </node>
                 </node>
               </node>
@@ -14963,7 +14963,7 @@
               <property role="TrG5h" value="data" />
               <node concept="1LlUBW" id="2T1p0CFIIyo" role="1tU5fm">
                 <node concept="3uibUv" id="2T1p0CFIIyp" role="1Lm7xW">
-                  <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                  <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                 </node>
                 <node concept="3uibUv" id="2T1p0CFIIyq" role="1Lm7xW">
                   <ref role="3uigEE" to="wyt6:~String" resolve="String" />
@@ -15028,7 +15028,7 @@
               <property role="TrG5h" value="data" />
               <node concept="1LlUBW" id="2T1p0CFIJTU" role="1tU5fm">
                 <node concept="3uibUv" id="2T1p0CFIJTV" role="1Lm7xW">
-                  <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+                  <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
                 </node>
                 <node concept="3uibUv" id="2T1p0CFIJTW" role="1Lm7xW">
                   <ref role="3uigEE" to="wyt6:~String" resolve="String" />
@@ -15093,7 +15093,7 @@
               <property role="TrG5h" value="data" />
               <node concept="1LlUBW" id="2T1p0CFILaH" role="1tU5fm">
                 <node concept="3uibUv" id="2T1p0CFILaI" role="1Lm7xW">
-                  <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+                  <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
                 </node>
                 <node concept="3uibUv" id="32fHqDfegQp" role="1Lm7xW">
                   <ref role="3uigEE" node="5X6ji59xezw" resolve="ActivationEvent" />
@@ -15144,7 +15144,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="2T1p0CFILb7" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:63ioh_TWUmb" resolve="rule" />
+                    <ref role="37wK5l" to="w7la:~MatchRule.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
                   </node>
                 </node>
               </node>
@@ -15266,10 +15266,10 @@
               <property role="TrG5h" value="data" />
               <node concept="1LlUBW" id="2T1p0CFIO93" role="1tU5fm">
                 <node concept="3uibUv" id="2T1p0CFIO94" role="1Lm7xW">
-                  <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+                  <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
                 </node>
                 <node concept="3uibUv" id="2T1p0CFIO95" role="1Lm7xW">
-                  <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                  <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                 </node>
                 <node concept="10P_77" id="2T1p0CFIO96" role="1Lm7xW" />
               </node>
@@ -15348,7 +15348,7 @@
               <property role="TrG5h" value="data" />
               <node concept="1LlUBW" id="2T1p0CFIMZD" role="1tU5fm">
                 <node concept="3uibUv" id="2T1p0CFIMZE" role="1Lm7xW">
-                  <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+                  <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
                 </node>
               </node>
               <node concept="2OqwBi" id="2T1p0CFIMZF" role="33vP2m">
@@ -15407,7 +15407,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="2T1p0CFIN07" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:63ioh_TWUn6" resolve="matchHeadKept" />
+                        <ref role="37wK5l" to="w7la:~MatchRule.matchHeadKept():java.lang.Iterable" resolve="matchHeadKept" />
                       </node>
                     </node>
                   </node>
@@ -15436,7 +15436,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="2T1p0CFIN0l" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:63ioh_TWUu6" resolve="matchHeadReplaced" />
+                        <ref role="37wK5l" to="w7la:~MatchRule.matchHeadReplaced():java.lang.Iterable" resolve="matchHeadReplaced" />
                       </node>
                     </node>
                   </node>
@@ -15696,7 +15696,7 @@
                   <property role="TrG5h" value="data" />
                   <node concept="1LlUBW" id="4VwaB4LFs1i" role="1tU5fm">
                     <node concept="3uibUv" id="4VwaB4LFs1j" role="1Lm7xW">
-                      <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                      <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                     </node>
                     <node concept="3uibUv" id="4VwaB4LFs1k" role="1Lm7xW">
                       <ref role="3uigEE" to="wyt6:~String" resolve="String" />
@@ -15723,7 +15723,7 @@
                 <node concept="3cpWsn" id="4VwaB4LFs1s" role="3cpWs9">
                   <property role="TrG5h" value="symbol" />
                   <node concept="3uibUv" id="4VwaB4LFs1t" role="1tU5fm">
-                    <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+                    <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
                   </node>
                   <node concept="2OqwBi" id="4VwaB4LFs1u" role="33vP2m">
                     <node concept="2OqwBi" id="4VwaB4LFs1v" role="2Oq$k0">
@@ -15736,11 +15736,11 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="4VwaB4LFs1z" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:5uFPQ7BZacZ" resolve="constraint" />
+                        <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint():jetbrains.mps.logic.reactor.program.Constraint" resolve="constraint" />
                       </node>
                     </node>
                     <node concept="liA8E" id="4VwaB4LFs1$" role="2OqNvi">
-                      <ref role="37wK5l" to="rchb:5uFPQ7B_aTC" resolve="symbol" />
+                      <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
                     </node>
                   </node>
                 </node>
@@ -15751,7 +15751,7 @@
                     <ref role="3cqZAo" node="4VwaB4LFs1s" resolve="symbol" />
                   </node>
                   <node concept="liA8E" id="4VwaB4LFuRZ" role="2OqNvi">
-                    <ref role="37wK5l" to="rchb:54i3Fxd6LvH" resolve="toString" />
+                    <ref role="37wK5l" to="av0y:~ConstraintSymbol.toString():java.lang.String" resolve="toString" />
                   </node>
                 </node>
               </node>
@@ -15772,7 +15772,7 @@
                     <property role="TrG5h" value="data" />
                     <node concept="1LlUBW" id="4VwaB4LFvf3" role="1tU5fm">
                       <node concept="3uibUv" id="6_UQWSXen$T" role="1Lm7xW">
-                        <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+                        <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
                       </node>
                       <node concept="3uibUv" id="6_UQWSXeq42" role="1Lm7xW">
                         <ref role="3uigEE" to="wyt6:~String" resolve="String" />
@@ -15808,15 +15808,15 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="6_UQWSXes_F" role="2OqNvi">
-                          <ref role="37wK5l" to="qrld:49L2l3FhtSL" resolve="predicate" />
+                          <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate():jetbrains.mps.logic.reactor.program.Predicate" resolve="predicate" />
                         </node>
                       </node>
                       <node concept="liA8E" id="6_UQWSXetab" role="2OqNvi">
-                        <ref role="37wK5l" to="rchb:6Kcfpq7Bjgi" resolve="symbol" />
+                        <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
                       </node>
                     </node>
                     <node concept="liA8E" id="6_UQWSXeqAv" role="2OqNvi">
-                      <ref role="37wK5l" to="rchb:5uFPQ7B$$w_" resolve="toString" />
+                      <ref role="37wK5l" to="av0y:~PredicateSymbol.toString():java.lang.String" resolve="toString" />
                     </node>
                   </node>
                 </node>
@@ -15838,10 +15838,10 @@
                     <property role="TrG5h" value="data" />
                     <node concept="1LlUBW" id="6_UQWSXemqg" role="1tU5fm">
                       <node concept="3uibUv" id="6_UQWSXemqh" role="1Lm7xW">
-                        <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+                        <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
                       </node>
                       <node concept="3uibUv" id="6_UQWSXemqi" role="1Lm7xW">
-                        <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                        <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                       </node>
                       <node concept="10P_77" id="6_UQWSXemqj" role="1Lm7xW" />
                     </node>
@@ -15875,15 +15875,15 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="6_UQWSXemqx" role="2OqNvi">
-                          <ref role="37wK5l" to="qrld:5uFPQ7BZacZ" resolve="constraint" />
+                          <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint():jetbrains.mps.logic.reactor.program.Constraint" resolve="constraint" />
                         </node>
                       </node>
                       <node concept="liA8E" id="6_UQWSXemqy" role="2OqNvi">
-                        <ref role="37wK5l" to="rchb:5uFPQ7B_aTC" resolve="symbol" />
+                        <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
                       </node>
                     </node>
                     <node concept="liA8E" id="6_UQWSXemqz" role="2OqNvi">
-                      <ref role="37wK5l" to="rchb:54i3Fxd6LvH" resolve="toString" />
+                      <ref role="37wK5l" to="av0y:~ConstraintSymbol.toString():java.lang.String" resolve="toString" />
                     </node>
                   </node>
                 </node>
@@ -16063,7 +16063,7 @@
               <property role="TrG5h" value="data" />
               <node concept="1LlUBW" id="5TpjAH61iKU" role="1tU5fm">
                 <node concept="3uibUv" id="5TpjAH61iKV" role="1Lm7xW">
-                  <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                  <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                 </node>
                 <node concept="3uibUv" id="5TpjAH61iKW" role="1Lm7xW">
                   <ref role="3uigEE" to="wyt6:~String" resolve="String" />
@@ -16099,7 +16099,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="5TpjAH61iLd" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:5uFPQ7BZafw" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments():java.util.List" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="A3Dl8" id="5TpjAH61iLe" role="10QFUM">
@@ -16155,7 +16155,7 @@
               <property role="TrG5h" value="data" />
               <node concept="1LlUBW" id="5TpjAH61n0d" role="1tU5fm">
                 <node concept="3uibUv" id="5TpjAH61n0e" role="1Lm7xW">
-                  <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+                  <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
                 </node>
                 <node concept="3uibUv" id="5TpjAH61n0f" role="1Lm7xW">
                   <ref role="3uigEE" to="wyt6:~String" resolve="String" />
@@ -16191,7 +16191,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="5TpjAH61n0w" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:49L2l3FhtTG" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="A3Dl8" id="5TpjAH61n0x" role="10QFUM">
@@ -16272,10 +16272,10 @@
               <property role="TrG5h" value="data" />
               <node concept="1LlUBW" id="5TpjAH61t3d" role="1tU5fm">
                 <node concept="3uibUv" id="5TpjAH61t3e" role="1Lm7xW">
-                  <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+                  <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
                 </node>
                 <node concept="3uibUv" id="5TpjAH61t3f" role="1Lm7xW">
-                  <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                  <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                 </node>
                 <node concept="10P_77" id="5TpjAH61t3g" role="1Lm7xW" />
               </node>
@@ -16309,7 +16309,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="5TpjAH61t3x" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:5uFPQ7BZafw" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments():java.util.List" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="A3Dl8" id="5TpjAH61t3y" role="10QFUM">
@@ -17169,7 +17169,7 @@
                   <ref role="3cqZAo" node="6QkkSolM4Dr" resolve="ruleEx" />
                 </node>
                 <node concept="liA8E" id="6QkkSolM314" role="2OqNvi">
-                  <ref role="37wK5l" to="rchb:6lpwCiZj$RR" resolve="tag" />
+                  <ref role="37wK5l" to="av0y:~Rule.tag():java.lang.String" resolve="tag" />
                 </node>
               </node>
             </node>
@@ -17478,7 +17478,7 @@
                 <node concept="3cpWsn" id="6QkkSolK_jo" role="3cpWs9">
                   <property role="TrG5h" value="logical" />
                   <node concept="3uibUv" id="6QkkSolK_jp" role="1tU5fm">
-                    <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                    <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                     <node concept="3uibUv" id="6QkkSolK_jq" role="11_B2D">
                       <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
@@ -17486,7 +17486,7 @@
                   <node concept="1eOMI4" id="6QkkSolK_jr" role="33vP2m">
                     <node concept="10QFUN" id="6QkkSolK_js" role="1eOMHV">
                       <node concept="3uibUv" id="6QkkSolK_jt" role="10QFUM">
-                        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                         <node concept="3uibUv" id="6QkkSolK_ju" role="11_B2D">
                           <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
@@ -17529,7 +17529,7 @@
             </node>
             <node concept="2ZW3vV" id="6QkkSolK_jG" role="3clFbw">
               <node concept="3uibUv" id="6QkkSolK_jH" role="2ZW6by">
-                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
               </node>
               <node concept="37vLTw" id="6QkkSolK_jI" role="2ZW6bz">
                 <ref role="3cqZAo" node="6QkkSolK_jg" resolve="arg" />
@@ -18445,11 +18445,11 @@
                   <ref role="3cqZAo" node="4pWvZ2njiqL" resolve="nodeLogical" />
                 </node>
                 <node concept="liA8E" id="4pWvZ2njipC" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="4pWvZ2njipD" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
           </node>
@@ -18503,11 +18503,11 @@
                         <ref role="3cqZAo" node="4pWvZ2njiqL" resolve="nodeLogical" />
                       </node>
                       <node concept="liA8E" id="4pWvZ2njiq2" role="2OqNvi">
-                        <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                        <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                       </node>
                     </node>
                     <node concept="liA8E" id="4pWvZ2njiq3" role="2OqNvi">
-                      <ref role="37wK5l" to="45ys:677NV56hh2k" resolve="name" />
+                      <ref role="37wK5l" to="bj13:~Logical.name():java.lang.String" resolve="name" />
                     </node>
                   </node>
                 </node>
@@ -18541,7 +18541,7 @@
                                   <ref role="3cqZAo" node="4pWvZ2njiqL" resolve="nodeLogical" />
                                 </node>
                                 <node concept="liA8E" id="4TCblo6btje" role="2OqNvi">
-                                  <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                                  <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                                 </node>
                               </node>
                             </node>
@@ -18569,7 +18569,7 @@
                         <ref role="3cqZAo" node="4pWvZ2njiqL" resolve="nodeLogical" />
                       </node>
                       <node concept="liA8E" id="4TCblo6btfa" role="2OqNvi">
-                        <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                        <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                       </node>
                     </node>
                   </node>
@@ -18622,7 +18622,7 @@
       <node concept="37vLTG" id="4pWvZ2njiqL" role="3clF46">
         <property role="TrG5h" value="nodeLogical" />
         <node concept="3uibUv" id="63ioh_TVF7K" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="3uibUv" id="63ioh_TVF7L" role="11_B2D">
             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
@@ -18638,7 +18638,7 @@
       <node concept="37vLTG" id="HV6urVCQ7Z" role="3clF46">
         <property role="TrG5h" value="typeLogical" />
         <node concept="3uibUv" id="HV6urVCQ80" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="3uibUv" id="HV6urVCQ81" role="11_B2D">
             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
@@ -18647,7 +18647,7 @@
       <node concept="37vLTG" id="HV6urVCQ82" role="3clF46">
         <property role="TrG5h" value="boundLogical" />
         <node concept="3uibUv" id="HV6urVCQ83" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="3uibUv" id="HV6urVCQ84" role="11_B2D">
             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
@@ -18680,7 +18680,7 @@
       <node concept="37vLTG" id="HV6urVCNow" role="3clF46">
         <property role="TrG5h" value="variable" />
         <node concept="3uibUv" id="HV6urVCNox" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="3uibUv" id="HV6urVCNoy" role="11_B2D">
             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
@@ -18721,7 +18721,7 @@
       <node concept="37vLTG" id="6HT7BWBSOZX" role="3clF46">
         <property role="TrG5h" value="typeLogical" />
         <node concept="3uibUv" id="63ioh_TVMaj" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="3uibUv" id="63ioh_TVMak" role="11_B2D">
             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
@@ -18754,7 +18754,7 @@
               <node concept="3cpWsn" id="6HT7BWBSOYQ" role="3cpWs9">
                 <property role="TrG5h" value="boundLogical" />
                 <node concept="3uibUv" id="63ioh_TVmoK" role="1tU5fm">
-                  <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                  <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                   <node concept="3uibUv" id="63ioh_TVmYn" role="11_B2D">
                     <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
@@ -18770,7 +18770,7 @@
                         <ref role="3cqZAo" node="6HT7BWBSOZX" resolve="typeLogical" />
                       </node>
                       <node concept="liA8E" id="6HT7BWBSOYX" role="2OqNvi">
-                        <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                        <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                       </node>
                     </node>
                   </node>
@@ -18801,7 +18801,7 @@
                   <ref role="3cqZAo" node="6HT7BWBSOZX" resolve="typeLogical" />
                 </node>
                 <node concept="liA8E" id="6HT7BWBSOZW" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -18837,14 +18837,14 @@
                 <node concept="3cpWsn" id="3gJBs5s_7If" role="3cpWs9">
                   <property role="TrG5h" value="logical" />
                   <node concept="3uibUv" id="3gJBs5s_7I4" role="1tU5fm">
-                    <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                    <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                     <node concept="3uibUv" id="4TCblo6gC1j" role="11_B2D">
                       <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                   <node concept="10QFUN" id="4TCblo6gCrJ" role="33vP2m">
                     <node concept="3uibUv" id="4TCblo6gCr_" role="10QFUM">
-                      <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                      <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                       <node concept="3uibUv" id="4TCblo6gCrA" role="11_B2D">
                         <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
@@ -18854,7 +18854,7 @@
                         <node concept="1eOMI4" id="4TCblo6gCrD" role="2Oq$k0">
                           <node concept="10QFUN" id="4TCblo6gCrE" role="1eOMHV">
                             <node concept="3uibUv" id="4TCblo6gCrF" role="10QFUM">
-                              <ref role="3uigEE" to="45ys:46l0wJhtOD_" resolve="LogicalOwner" />
+                              <ref role="3uigEE" to="bj13:~LogicalOwner" resolve="LogicalOwner" />
                             </node>
                             <node concept="37vLTw" id="4TCblo6gCrG" role="10QFUP">
                               <ref role="3cqZAo" node="3gJBs5s_6z0" resolve="variable" />
@@ -18862,11 +18862,11 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="4TCblo6gCrH" role="2OqNvi">
-                          <ref role="37wK5l" to="45ys:46l0wJhtXlr" resolve="logical" />
+                          <ref role="37wK5l" to="bj13:~LogicalOwner.logical():jetbrains.mps.logic.reactor.logical.Logical" resolve="logical" />
                         </node>
                       </node>
                       <node concept="liA8E" id="4TCblo6gCrI" role="2OqNvi">
-                        <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                        <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                       </node>
                     </node>
                   </node>
@@ -18911,7 +18911,7 @@
             </node>
             <node concept="2ZW3vV" id="3gJBs5s_6UT" role="3clFbw">
               <node concept="3uibUv" id="3gJBs5s_78A" role="2ZW6by">
-                <ref role="3uigEE" to="45ys:46l0wJhtOD_" resolve="LogicalOwner" />
+                <ref role="3uigEE" to="bj13:~LogicalOwner" resolve="LogicalOwner" />
               </node>
               <node concept="37vLTw" id="3gJBs5s_6FT" role="2ZW6bz">
                 <ref role="3cqZAo" node="3gJBs5s_6z0" resolve="variable" />
@@ -18954,7 +18954,7 @@
       <node concept="37vLTG" id="4TCblo6gv5H" role="3clF46">
         <property role="TrG5h" value="logical" />
         <node concept="3uibUv" id="4TCblo6gv5I" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="3uibUv" id="4TCblo6gv5J" role="11_B2D">
             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
@@ -18977,11 +18977,11 @@
                   <ref role="3cqZAo" node="4TCblo6gv5H" resolve="logical" />
                 </node>
                 <node concept="liA8E" id="4TCblo6gv4L" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="4TCblo6gv4M" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:677NV56hh2k" resolve="name" />
+                <ref role="37wK5l" to="bj13:~Logical.name():java.lang.String" resolve="name" />
               </node>
             </node>
           </node>
@@ -18998,11 +18998,11 @@
                   <ref role="3cqZAo" node="4TCblo6gv5H" resolve="logical" />
                 </node>
                 <node concept="liA8E" id="4TCblo6gv4T" role="2OqNvi">
-                  <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="4TCblo6gv4U" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
               </node>
             </node>
           </node>
@@ -19075,7 +19075,7 @@
                                   <ref role="3cqZAo" node="4TCblo6gv5H" resolve="logical" />
                                 </node>
                                 <node concept="liA8E" id="4TCblo6gv5s" role="2OqNvi">
-                                  <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                                  <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                                 </node>
                               </node>
                             </node>
@@ -19103,7 +19103,7 @@
                         <ref role="3cqZAo" node="4TCblo6gv5H" resolve="logical" />
                       </node>
                       <node concept="liA8E" id="4TCblo6gv5_" role="2OqNvi">
-                        <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                        <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                       </node>
                     </node>
                   </node>
@@ -19139,7 +19139,7 @@
       <node concept="3uibUv" id="6HT7BWBSGyp" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
         <node concept="3uibUv" id="2s5CcPapSKW" role="11_B2D">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
         </node>
         <node concept="17QB3L" id="6HT7BWBSGyr" role="11_B2D" />
       </node>
@@ -19147,7 +19147,7 @@
         <node concept="1pGfFk" id="6HT7BWBSGDR" role="2ShVmc">
           <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
           <node concept="3uibUv" id="5kEUewdDhpK" role="1pMfVU">
-            <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+            <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           </node>
           <node concept="17QB3L" id="6HT7BWBSGDT" role="1pMfVU" />
         </node>
@@ -19160,10 +19160,10 @@
       <node concept="3uibUv" id="6HT7BWBSGyv" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
         <node concept="3uibUv" id="63ioh_TUSmm" role="11_B2D">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
         </node>
         <node concept="3uibUv" id="63ioh_TUSSq" role="11_B2D">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="3uibUv" id="63ioh_TUTD_" role="11_B2D">
             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
@@ -19173,10 +19173,10 @@
         <node concept="1pGfFk" id="6HT7BWBSGI4" role="2ShVmc">
           <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
           <node concept="3uibUv" id="63ioh_TUUdP" role="1pMfVU">
-            <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+            <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           </node>
           <node concept="3uibUv" id="63ioh_TUUM4" role="1pMfVU">
-            <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+            <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
             <node concept="3uibUv" id="63ioh_TUVz6" role="11_B2D">
               <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
@@ -19196,7 +19196,7 @@
       <node concept="37vLTG" id="3mz2_dYayts" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="3mz2_dYfdao" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3Tm1VV" id="3mz2_dYay7y" role="1B3o_S" />
@@ -19211,7 +19211,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="3mz2_dYfcTc" role="3clF45">
-        <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+        <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
       </node>
     </node>
     <node concept="2tJIrI" id="3mz2_dYfbSs" role="jymVt" />
@@ -19220,7 +19220,7 @@
       <node concept="37vLTG" id="3mz2_dYfbSk" role="3clF46">
         <property role="TrG5h" value="occ" />
         <node concept="3uibUv" id="3mz2_dYfbSl" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3Tm1VV" id="3mz2_dYfbSm" role="1B3o_S" />
@@ -19235,7 +19235,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="3mz2_dYfbSr" role="3clF45">
-        <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+        <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
       </node>
     </node>
     <node concept="2tJIrI" id="3mz2_dYepsQ" role="jymVt" />
@@ -19244,7 +19244,7 @@
       <node concept="37vLTG" id="3mz2_dYepsG" role="3clF46">
         <property role="TrG5h" value="inv" />
         <node concept="3uibUv" id="3mz2_dYeqA1" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="3Tm1VV" id="3mz2_dYepsI" role="1B3o_S" />
@@ -19259,7 +19259,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="3mz2_dYeqjR" role="3clF45">
-        <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+        <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
       </node>
     </node>
     <node concept="2tJIrI" id="3mz2_dYbSMB" role="jymVt" />
@@ -19268,11 +19268,11 @@
       <node concept="37vLTG" id="3mz2_dYbpQw" role="3clF46">
         <property role="TrG5h" value="original" />
         <node concept="3uibUv" id="3mz2_dYc1iI" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3uibUv" id="3mz2_dYc0Q_" role="3clF45">
-        <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+        <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
       </node>
       <node concept="3Tm6S6" id="3mz2_dYbpo3" role="1B3o_S" />
       <node concept="3clFbS" id="3mz2_dYbpe0" role="3clF47">
@@ -19290,7 +19290,7 @@
                     <ref role="3cqZAo" node="3mz2_dYbpQw" resolve="original" />
                   </node>
                   <node concept="liA8E" id="3mz2_dYcddA" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:5uFPQ7BZafw" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments():java.util.List" resolve="arguments" />
                   </node>
                 </node>
               </node>
@@ -19305,11 +19305,11 @@
       <node concept="37vLTG" id="3mz2_dYeZLV" role="3clF46">
         <property role="TrG5h" value="original" />
         <node concept="3uibUv" id="3mz2_dYf1sN" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3uibUv" id="3mz2_dYf76w" role="3clF45">
-        <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+        <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
       </node>
       <node concept="3Tm6S6" id="3mz2_dYeZLY" role="1B3o_S" />
       <node concept="3clFbS" id="3mz2_dYeZLZ" role="3clF47">
@@ -19322,7 +19322,7 @@
                   <ref role="3cqZAo" node="3mz2_dYeZLV" resolve="original" />
                 </node>
                 <node concept="liA8E" id="3mz2_dYf1Xs" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:63ioh_TWUmb" resolve="rule" />
+                  <ref role="37wK5l" to="w7la:~MatchRule.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
                 </node>
               </node>
               <node concept="1rXfSq" id="3mz2_dYeZM4" role="37wK5m">
@@ -19332,7 +19332,7 @@
                     <ref role="3cqZAo" node="3mz2_dYeZLV" resolve="original" />
                   </node>
                   <node concept="liA8E" id="3mz2_dYeZM7" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:63ioh_TWUn6" resolve="matchHeadKept" />
+                    <ref role="37wK5l" to="w7la:~MatchRule.matchHeadKept():java.lang.Iterable" resolve="matchHeadKept" />
                   </node>
                 </node>
               </node>
@@ -19343,7 +19343,7 @@
                     <ref role="3cqZAo" node="3mz2_dYeZLV" resolve="original" />
                   </node>
                   <node concept="liA8E" id="3mz2_dYf24v" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:63ioh_TWUu6" resolve="matchHeadReplaced" />
+                    <ref role="37wK5l" to="w7la:~MatchRule.matchHeadReplaced():java.lang.Iterable" resolve="matchHeadReplaced" />
                   </node>
                 </node>
               </node>
@@ -19358,11 +19358,11 @@
       <node concept="37vLTG" id="3mz2_dYekXZ" role="3clF46">
         <property role="TrG5h" value="original" />
         <node concept="3uibUv" id="3mz2_dYem8V" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="3uibUv" id="3mz2_dYelPH" role="3clF45">
-        <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+        <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
       </node>
       <node concept="3Tm6S6" id="3mz2_dYekY2" role="1B3o_S" />
       <node concept="3clFbS" id="3mz2_dYekY3" role="3clF47">
@@ -19380,7 +19380,7 @@
                     <ref role="3cqZAo" node="3mz2_dYekXZ" resolve="original" />
                   </node>
                   <node concept="liA8E" id="3mz2_dYekYb" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:49L2l3FhtTG" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
                   </node>
                 </node>
               </node>
@@ -19395,14 +19395,14 @@
       <node concept="37vLTG" id="3mz2_dYc9vN" role="3clF46">
         <property role="TrG5h" value="original" />
         <node concept="3uibUv" id="3mz2_dYc9vO" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="16syzq" id="3mz2_dYcljE" role="11_B2D">
             <ref role="16sUi3" node="3mz2_dYcjDS" resolve="T" />
           </node>
         </node>
       </node>
       <node concept="3uibUv" id="3mz2_dYc9vP" role="3clF45">
-        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
         <node concept="16syzq" id="3mz2_dYckpj" role="11_B2D">
           <ref role="16sUi3" node="3mz2_dYcjDS" resolve="T" />
         </node>
@@ -19421,7 +19421,7 @@
               </node>
               <node concept="10QFUN" id="3mz2_dYl9ps" role="37wK5m">
                 <node concept="3uibUv" id="3mz2_dYlnXz" role="10QFUM">
-                  <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                  <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                   <node concept="16syzq" id="3mz2_dYlopP" role="11_B2D">
                     <ref role="16sUi3" node="3mz2_dYcjDS" resolve="T" />
                   </node>
@@ -19438,7 +19438,7 @@
                           <ref role="3cqZAo" node="3mz2_dYc9vN" resolve="original" />
                         </node>
                         <node concept="liA8E" id="3mz2_dYl9pn" role="2OqNvi">
-                          <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                          <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                         </node>
                       </node>
                     </node>
@@ -19449,7 +19449,7 @@
                           <ref role="3cqZAo" node="3mz2_dYc9vN" resolve="original" />
                         </node>
                         <node concept="liA8E" id="3mz2_dYl9pr" role="2OqNvi">
-                          <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                          <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                         </node>
                       </node>
                     </node>
@@ -19621,7 +19621,7 @@
                   <node concept="1eOMI4" id="3mz2_dYbXjl" role="37wK5m">
                     <node concept="10QFUN" id="3mz2_dYbXjm" role="1eOMHV">
                       <node concept="3uibUv" id="3mz2_dYkPCU" role="10QFUM">
-                        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                       </node>
                       <node concept="37vLTw" id="3mz2_dYbXjo" role="10QFUP">
                         <ref role="3cqZAo" node="3mz2_dYaCcM" resolve="arg" />
@@ -19635,7 +19635,7 @@
           </node>
           <node concept="2ZW3vV" id="3mz2_dYaCMs" role="3clFbw">
             <node concept="3uibUv" id="3mz2_dYkPgO" role="2ZW6by">
-              <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+              <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
             </node>
             <node concept="37vLTw" id="3mz2_dYaCLQ" role="2ZW6bz">
               <ref role="3cqZAo" node="3mz2_dYaCcM" resolve="arg" />
@@ -19677,7 +19677,7 @@
           <node concept="3eNFk2" id="3mz2_dYf8mm" role="3eNLev">
             <node concept="2ZW3vV" id="3mz2_dYf8mn" role="3eO9$A">
               <node concept="3uibUv" id="3mz2_dYf8SE" role="2ZW6by">
-                <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
               </node>
               <node concept="37vLTw" id="3mz2_dYf8mp" role="2ZW6bz">
                 <ref role="3cqZAo" node="3mz2_dYaCcM" resolve="arg" />
@@ -19694,7 +19694,7 @@
                     <node concept="1eOMI4" id="3mz2_dYfa96" role="37wK5m">
                       <node concept="10QFUN" id="3mz2_dYfa93" role="1eOMHV">
                         <node concept="3uibUv" id="3mz2_dYfa98" role="10QFUM">
-                          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                         </node>
                         <node concept="37vLTw" id="3mz2_dYfa99" role="10QFUP">
                           <ref role="3cqZAo" node="3mz2_dYaCcM" resolve="arg" />
@@ -19741,7 +19741,7 @@
         <node concept="37vLTG" id="3mz2_dYeSw9" role="3clF46">
           <property role="TrG5h" value="originalRule" />
           <node concept="3uibUv" id="3mz2_dYeSKO" role="1tU5fm">
-            <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+            <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
           </node>
         </node>
         <node concept="37vLTG" id="3mz2_dYeSVU" role="3clF46">
@@ -19749,7 +19749,7 @@
           <node concept="3uibUv" id="3mz2_dYeTcY" role="1tU5fm">
             <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
             <node concept="3uibUv" id="3mz2_dYeTFt" role="11_B2D">
-              <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+              <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
             </node>
           </node>
         </node>
@@ -19758,7 +19758,7 @@
           <node concept="3uibUv" id="3mz2_dYeU1_" role="1tU5fm">
             <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
             <node concept="3uibUv" id="3mz2_dYeUw8" role="11_B2D">
-              <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+              <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
             </node>
           </node>
         </node>
@@ -19809,13 +19809,13 @@
       <node concept="2tJIrI" id="3mz2_dYeS2f" role="jymVt" />
       <node concept="3Tm6S6" id="3mz2_dYeROi" role="1B3o_S" />
       <node concept="3uibUv" id="3mz2_dYeRSG" role="EKbjA">
-        <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+        <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
       </node>
       <node concept="3clFb_" id="3mz2_dYeRVo" role="jymVt">
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="rule" />
         <node concept="3uibUv" id="3mz2_dYeRVp" role="3clF45">
-          <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
         </node>
         <node concept="3Tm1VV" id="3mz2_dYeRVq" role="1B3o_S" />
         <node concept="3clFbS" id="3mz2_dYeRVs" role="3clF47">
@@ -19833,7 +19833,7 @@
         <node concept="3uibUv" id="3mz2_dYeRVw" role="3clF45">
           <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
           <node concept="3uibUv" id="3mz2_dYeRVx" role="11_B2D">
-            <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
           </node>
         </node>
         <node concept="3Tm1VV" id="3mz2_dYeRVy" role="1B3o_S" />
@@ -19852,7 +19852,7 @@
         <node concept="3uibUv" id="3mz2_dYeRVC" role="3clF45">
           <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
           <node concept="3uibUv" id="3mz2_dYeRVD" role="11_B2D">
-            <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
           </node>
         </node>
         <node concept="3Tm1VV" id="3mz2_dYeRVE" role="1B3o_S" />
@@ -19869,7 +19869,7 @@
         <property role="TrG5h" value="originalRule" />
         <node concept="3Tm6S6" id="3mz2_dYeSTb" role="1B3o_S" />
         <node concept="3uibUv" id="3mz2_dYeSTd" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
         </node>
       </node>
       <node concept="312cEg" id="3mz2_dYeU_q" role="jymVt">
@@ -19878,7 +19878,7 @@
         <node concept="3uibUv" id="3mz2_dYeU_t" role="1tU5fm">
           <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
           <node concept="3uibUv" id="3mz2_dYeU_u" role="11_B2D">
-            <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
           </node>
         </node>
       </node>
@@ -19888,7 +19888,7 @@
         <node concept="3uibUv" id="3mz2_dYeUGb" role="1tU5fm">
           <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
           <node concept="3uibUv" id="3mz2_dYeUGc" role="11_B2D">
-            <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
           </node>
         </node>
       </node>
@@ -19932,7 +19932,7 @@
         <node concept="37vLTG" id="3mz2_dYazQY" role="3clF46">
           <property role="TrG5h" value="original" />
           <node concept="3uibUv" id="3mz2_dYazQX" role="1tU5fm">
-            <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
           </node>
         </node>
         <node concept="37vLTG" id="3mz2_dYaAm8" role="3clF46">
@@ -19945,13 +19945,13 @@
       <node concept="2tJIrI" id="3mz2_dYaz0d" role="jymVt" />
       <node concept="3Tm6S6" id="3mz2_dYcsfx" role="1B3o_S" />
       <node concept="3uibUv" id="3mz2_dYayXA" role="EKbjA">
-        <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+        <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
       </node>
       <node concept="3clFb_" id="3mz2_dYayXU" role="jymVt">
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="constraint" />
         <node concept="3uibUv" id="3mz2_dYayXV" role="3clF45">
-          <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+          <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
         </node>
         <node concept="3Tm1VV" id="3mz2_dYayXW" role="1B3o_S" />
         <node concept="3clFbS" id="3mz2_dYayXY" role="3clF47">
@@ -19961,7 +19961,7 @@
                 <ref role="3cqZAo" node="3mz2_dYazRU" resolve="original" />
               </node>
               <node concept="liA8E" id="3mz2_dYa_QT" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:5uFPQ7BZacZ" resolve="constraint" />
+                <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint():jetbrains.mps.logic.reactor.program.Constraint" resolve="constraint" />
               </node>
             </node>
           </node>
@@ -20009,7 +20009,7 @@
         <property role="TrG5h" value="original" />
         <node concept="3Tm6S6" id="3mz2_dYazRV" role="1B3o_S" />
         <node concept="3uibUv" id="3mz2_dYazRX" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="312cEg" id="3mz2_dYaAZD" role="jymVt">
@@ -20029,14 +20029,14 @@
       <property role="TrG5h" value="InvocationSnapshot" />
       <node concept="3Tm6S6" id="3mz2_dYeRJ0" role="1B3o_S" />
       <node concept="3uibUv" id="3mz2_dYeeoB" role="EKbjA">
-        <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+        <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
       </node>
       <node concept="2tJIrI" id="3mz2_dYee_q" role="jymVt" />
       <node concept="3clFbW" id="3mz2_dYef8i" role="jymVt">
         <node concept="37vLTG" id="3mz2_dYefb6" role="3clF46">
           <property role="TrG5h" value="original" />
           <node concept="3uibUv" id="3mz2_dYefDG" role="1tU5fm">
-            <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+            <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
           </node>
         </node>
         <node concept="37vLTG" id="3mz2_dYefIb" role="3clF46">
@@ -20082,8 +20082,8 @@
         <property role="2aFKle" value="false" />
         <property role="TrG5h" value="predicate" />
         <node concept="3Tm1VV" id="3mz2_dYeetV" role="1B3o_S" />
-        <node concept="3uibUv" id="3mz2_dYeetW" role="3clF45">
-          <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+        <node concept="3uibUv" id="1HG00HG2cVg" role="3clF45">
+          <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
         </node>
         <node concept="3clFbS" id="3mz2_dYeetX" role="3clF47">
           <node concept="3clFbF" id="3mz2_dYeiUN" role="3cqZAp">
@@ -20092,7 +20092,7 @@
                 <ref role="3cqZAo" node="3mz2_dYei3Z" resolve="original" />
               </node>
               <node concept="liA8E" id="3mz2_dYejnN" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:49L2l3FhtSL" resolve="predicate" />
+                <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate():jetbrains.mps.logic.reactor.program.Predicate" resolve="predicate" />
               </node>
             </node>
           </node>
@@ -20128,7 +20128,7 @@
         <property role="TrG5h" value="original" />
         <node concept="3Tm6S6" id="3mz2_dYei40" role="1B3o_S" />
         <node concept="3uibUv" id="3mz2_dYei42" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
     </node>
@@ -20139,7 +20139,7 @@
       <property role="TrG5h" value="LogicalSnapshot" />
       <node concept="3Tm6S6" id="3mz2_dYcrUd" role="1B3o_S" />
       <node concept="3uibUv" id="3mz2_dYaUVp" role="EKbjA">
-        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
         <node concept="16syzq" id="3mz2_dYaWmI" role="11_B2D">
           <ref role="16sUi3" node="3mz2_dYaW9q" resolve="T" />
         </node>
@@ -20152,7 +20152,7 @@
         <node concept="37vLTG" id="3mz2_dYbgrs" role="3clF46">
           <property role="TrG5h" value="original" />
           <node concept="3uibUv" id="3mz2_dYbhoD" role="1tU5fm">
-            <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+            <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
             <node concept="16syzq" id="3mz2_dYbhYi" role="11_B2D">
               <ref role="16sUi3" node="3mz2_dYaW9q" resolve="T" />
             </node>
@@ -20161,7 +20161,7 @@
         <node concept="37vLTG" id="3mz2_dYcmP8" role="3clF46">
           <property role="TrG5h" value="rootSnashot" />
           <node concept="3uibUv" id="3mz2_dYcmP9" role="1tU5fm">
-            <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+            <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
             <node concept="16syzq" id="3mz2_dYcmPa" role="11_B2D">
               <ref role="16sUi3" node="3mz2_dYaW9q" resolve="T" />
             </node>
@@ -20198,7 +20198,7 @@
                     <ref role="3cqZAo" node="3mz2_dYbgrs" resolve="original" />
                   </node>
                   <node concept="liA8E" id="3mz2_dYbwRX" role="2OqNvi">
-                    <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                    <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
                   </node>
                 </node>
               </node>
@@ -20233,7 +20233,7 @@
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="findRoot" />
         <node concept="3uibUv" id="3mz2_dYaWna" role="3clF45">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="16syzq" id="3mz2_dYaWne" role="11_B2D">
             <ref role="16sUi3" node="3mz2_dYaW9q" resolve="T" />
           </node>
@@ -20334,7 +20334,7 @@
                 <ref role="3cqZAo" node="3mz2_dYbi8c" resolve="original" />
               </node>
               <node concept="liA8E" id="3mz2_dYbjAO" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:677NV56hh2k" resolve="name" />
+                <ref role="37wK5l" to="bj13:~Logical.name():java.lang.String" resolve="name" />
               </node>
             </node>
           </node>
@@ -20373,7 +20373,7 @@
                     <ref role="3cqZAo" node="3mz2_dYbm9n" resolve="rootSnapshot" />
                   </node>
                   <node concept="liA8E" id="3mz2_dYbPII" role="2OqNvi">
-                    <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                    <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
                   </node>
                 </node>
               </node>
@@ -20418,7 +20418,7 @@
         <property role="TrG5h" value="metaLogical" />
         <node concept="3Tm1VV" id="3mz2_dYaWo$" role="1B3o_S" />
         <node concept="3uibUv" id="3mz2_dYaWo_" role="3clF45">
-          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
           <node concept="16syzq" id="3mz2_dYaWoE" role="11_B2D">
             <ref role="16sUi3" node="3mz2_dYaW9q" resolve="T" />
           </node>
@@ -20471,7 +20471,7 @@
         <property role="TrG5h" value="rootSnapshot" />
         <node concept="3Tm6S6" id="3mz2_dYbm9k" role="1B3o_S" />
         <node concept="3uibUv" id="3mz2_dYbm9l" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="16syzq" id="3mz2_dYbm9m" role="11_B2D">
             <ref role="16sUi3" node="3mz2_dYaW9q" resolve="T" />
           </node>
@@ -20481,7 +20481,7 @@
         <property role="TrG5h" value="original" />
         <node concept="3Tm6S6" id="3mz2_dYbi8d" role="1B3o_S" />
         <node concept="3uibUv" id="3mz2_dYbi8f" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="16syzq" id="3mz2_dYbi8g" role="11_B2D">
             <ref role="16sUi3" node="3mz2_dYaW9q" resolve="T" />
           </node>
@@ -20561,7 +20561,7 @@
                                   <node concept="3clFbF" id="3mz2_dYcxjf" role="3cqZAp">
                                     <node concept="2ZW3vV" id="3mz2_dYcy5B" role="3clFbG">
                                       <node concept="3uibUv" id="3mz2_dYcyNY" role="2ZW6by">
-                                        <ref role="3uigEE" to="45ys:46l0wJhtOD_" resolve="LogicalOwner" />
+                                        <ref role="3uigEE" to="bj13:~LogicalOwner" resolve="LogicalOwner" />
                                       </node>
                                       <node concept="37vLTw" id="3mz2_dYcxje" role="2ZW6bz">
                                         <ref role="3cqZAo" node="6HT7BWBQdTE" resolve="variable" />
@@ -20604,14 +20604,14 @@
                   <node concept="3cpWsn" id="3mz2_dYcBbm" role="3cpWs9">
                     <property role="TrG5h" value="logical" />
                     <node concept="3uibUv" id="3mz2_dYcBbf" role="1tU5fm">
-                      <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                      <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                       <node concept="3uibUv" id="3mz2_dYcHfy" role="11_B2D">
                         <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                     </node>
                     <node concept="10QFUN" id="3mz2_dYcHQR" role="33vP2m">
                       <node concept="3uibUv" id="3mz2_dYcHQJ" role="10QFUM">
-                        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                        <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                         <node concept="3uibUv" id="3mz2_dYcHQK" role="11_B2D">
                           <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
@@ -20623,12 +20623,12 @@
                               <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="tf" />
                             </node>
                             <node concept="3uibUv" id="3mz2_dYcHQP" role="10QFUM">
-                              <ref role="3uigEE" to="45ys:46l0wJhtOD_" resolve="LogicalOwner" />
+                              <ref role="3uigEE" to="bj13:~LogicalOwner" resolve="LogicalOwner" />
                             </node>
                           </node>
                         </node>
                         <node concept="liA8E" id="3mz2_dYcHQQ" role="2OqNvi">
-                          <ref role="37wK5l" to="45ys:46l0wJhtXlr" resolve="logical" />
+                          <ref role="37wK5l" to="bj13:~LogicalOwner.logical():jetbrains.mps.logic.reactor.logical.Logical" resolve="logical" />
                         </node>
                       </node>
                     </node>
@@ -20649,11 +20649,11 @@
                                 <ref role="3cqZAo" node="3mz2_dYcBbm" resolve="logical" />
                               </node>
                               <node concept="liA8E" id="3mz2_dYcGyV" role="2OqNvi">
-                                <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
+                                <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
                               </node>
                             </node>
                             <node concept="liA8E" id="3mz2_dYcGf2" role="2OqNvi">
-                              <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+                              <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
                             </node>
                           </node>
                         </node>
@@ -20666,7 +20666,7 @@
                       <ref role="3cqZAo" node="3mz2_dYcBbm" resolve="logical" />
                     </node>
                     <node concept="liA8E" id="3mz2_dYcD9b" role="2OqNvi">
-                      <ref role="37wK5l" to="45ys:1mP5b6jQPKP" resolve="isBound" />
+                      <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
                     </node>
                   </node>
                   <node concept="9aQIb" id="3mz2_dYcJ7R" role="9aQIa">
@@ -22116,7 +22116,7 @@
           <property role="TrG5h" value="data" />
           <node concept="1LlUBW" id="6QkkSolctCG" role="1tU5fm">
             <node concept="3uibUv" id="6QkkSolcwwq" role="1Lm7xW">
-              <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+              <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
             </node>
           </node>
         </node>
@@ -22160,7 +22160,7 @@
         <ref role="3uigEE" node="6QkkSolcsEP" resolve="StoreNodes.DefaultTreeNode" />
         <node concept="1LlUBW" id="6QkkSolctCZ" role="11_B2D">
           <node concept="3uibUv" id="6QkkSolcwmz" role="1Lm7xW">
-            <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+            <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
           </node>
         </node>
       </node>
@@ -22188,7 +22188,7 @@
           <property role="TrG5h" value="data" />
           <node concept="1LlUBW" id="6QkkSolczqZ" role="1tU5fm">
             <node concept="3uibUv" id="6QkkSolcT1r" role="1Lm7xW">
-              <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+              <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
             </node>
             <node concept="3uibUv" id="6QkkSolQQ2M" role="1Lm7xW">
               <ref role="3uigEE" node="6QkkSolNFFx" resolve="StoreEvent" />
@@ -22235,7 +22235,7 @@
         <ref role="3uigEE" node="6QkkSolcsEP" resolve="StoreNodes.DefaultTreeNode" />
         <node concept="1LlUBW" id="6QkkSolczrh" role="11_B2D">
           <node concept="3uibUv" id="6QkkSolc_eE" role="1Lm7xW">
-            <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
           </node>
           <node concept="3uibUv" id="6QkkSolQPE1" role="1Lm7xW">
             <ref role="3uigEE" node="6QkkSolNFFx" resolve="StoreEvent" />
@@ -22585,7 +22585,7 @@
               <property role="TrG5h" value="data" />
               <node concept="1LlUBW" id="6QkkSolGNJY" role="1tU5fm">
                 <node concept="3uibUv" id="6QkkSolGNK1" role="1Lm7xW">
-                  <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+                  <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
                 </node>
               </node>
               <node concept="2OqwBi" id="6QkkSolGNKa" role="33vP2m">
@@ -22648,7 +22648,7 @@
               <property role="TrG5h" value="data" />
               <node concept="1LlUBW" id="6QkkSolR1sy" role="1tU5fm">
                 <node concept="3uibUv" id="6QkkSolR1sB" role="1Lm7xW">
-                  <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                  <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                 </node>
                 <node concept="3uibUv" id="6QkkSolR1sC" role="1Lm7xW">
                   <ref role="3uigEE" node="6QkkSolNFFx" resolve="StoreEvent" />
@@ -22963,7 +22963,7 @@
               <property role="TrG5h" value="data" />
               <node concept="1LlUBW" id="6QkkSolHbac" role="1tU5fm">
                 <node concept="3uibUv" id="6QkkSolHbah" role="1Lm7xW">
-                  <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                  <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                 </node>
                 <node concept="3uibUv" id="6QkkSolRChJ" role="1Lm7xW">
                   <ref role="3uigEE" node="6QkkSolNFFx" resolve="StoreEvent" />
@@ -22999,7 +22999,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="6QkkSolHbJZ" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:5uFPQ7BZafw" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments():java.util.List" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="A3Dl8" id="6QkkSolHbK0" role="10QFUM">
@@ -26763,7 +26763,7 @@
       <node concept="37vLTG" id="YGS68MDFvd" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="YGS68MDFve" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MDFvf" role="3clF45" />
@@ -26773,7 +26773,7 @@
           <node concept="3cpWsn" id="YGS68MDFvj" role="3cpWs9">
             <property role="TrG5h" value="snapshot" />
             <node concept="3uibUv" id="YGS68MDFvk" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+              <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
             </node>
             <node concept="2YIFZM" id="YGS68MDFvl" role="33vP2m">
               <ref role="37wK5l" node="3mz2_dYay7v" resolve="snapshotOf" />
@@ -26866,7 +26866,7 @@
       <node concept="37vLTG" id="YGS68MDFvN" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="YGS68MDFvO" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MDFvP" role="3clF45" />
@@ -26900,7 +26900,7 @@
                           <ref role="3cqZAo" node="YGS68MDFvN" resolve="matchRule" />
                         </node>
                         <node concept="liA8E" id="YGS68MDFw6" role="2OqNvi">
-                          <ref role="37wK5l" to="qrld:63ioh_TWUmb" resolve="rule" />
+                          <ref role="37wK5l" to="w7la:~MatchRule.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
                         </node>
                       </node>
                     </node>
@@ -26922,7 +26922,7 @@
       <node concept="37vLTG" id="YGS68MDFw8" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="YGS68MDFw9" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MDFwa" role="3clF45" />
@@ -26932,7 +26932,7 @@
           <node concept="3cpWsn" id="YGS68MDFwe" role="3cpWs9">
             <property role="TrG5h" value="snapshot" />
             <node concept="3uibUv" id="YGS68MDFwf" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+              <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
             </node>
             <node concept="2YIFZM" id="YGS68MDFwg" role="33vP2m">
               <ref role="1Pybhc" node="3mz2_dYafX3" resolve="Snapshot" />
@@ -26971,7 +26971,7 @@
                           <ref role="3cqZAo" node="YGS68MDFw8" resolve="matchRule" />
                         </node>
                         <node concept="liA8E" id="YGS68MDFww" role="2OqNvi">
-                          <ref role="37wK5l" to="qrld:63ioh_TWUmb" resolve="rule" />
+                          <ref role="37wK5l" to="w7la:~MatchRule.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
                         </node>
                       </node>
                     </node>
@@ -27063,7 +27063,7 @@
       <node concept="37vLTG" id="32fHqDfcLw8" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="32fHqDfcLw9" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="32fHqDfcLwa" role="3clF45" />
@@ -27076,7 +27076,7 @@
           <node concept="3cpWsn" id="32fHqDfcR9i" role="3cpWs9">
             <property role="TrG5h" value="snapshot" />
             <node concept="3uibUv" id="32fHqDfcR9j" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+              <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
             </node>
             <node concept="2YIFZM" id="32fHqDfcR9k" role="33vP2m">
               <ref role="37wK5l" node="3mz2_dYay7v" resolve="snapshotOf" />
@@ -27115,7 +27115,7 @@
                           <ref role="3cqZAo" node="32fHqDfcLw8" resolve="matchRule" />
                         </node>
                         <node concept="liA8E" id="32fHqDfcR9$" role="2OqNvi">
-                          <ref role="37wK5l" to="qrld:63ioh_TWUmb" resolve="rule" />
+                          <ref role="37wK5l" to="w7la:~MatchRule.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
                         </node>
                       </node>
                     </node>
@@ -27171,7 +27171,7 @@
       <node concept="37vLTG" id="YGS68MDFwX" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="YGS68MDFwY" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MDFwZ" role="3clF45" />
@@ -27205,7 +27205,7 @@
                           <ref role="3cqZAo" node="YGS68MDFwX" resolve="matchRule" />
                         </node>
                         <node concept="liA8E" id="YGS68MDFxg" role="2OqNvi">
-                          <ref role="37wK5l" to="qrld:63ioh_TWUmb" resolve="rule" />
+                          <ref role="37wK5l" to="w7la:~MatchRule.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
                         </node>
                       </node>
                     </node>
@@ -27227,7 +27227,7 @@
       <node concept="37vLTG" id="YGS68MDFxi" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="YGS68MDFxj" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MDFxk" role="3clF45" />
@@ -27237,7 +27237,7 @@
           <node concept="3cpWsn" id="YGS68MDFxo" role="3cpWs9">
             <property role="TrG5h" value="snapshot" />
             <node concept="3uibUv" id="YGS68MDFxp" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+              <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
             </node>
             <node concept="2YIFZM" id="YGS68MDFxq" role="33vP2m">
               <ref role="1Pybhc" node="3mz2_dYafX3" resolve="Snapshot" />
@@ -27296,7 +27296,7 @@
       <node concept="37vLTG" id="YGS68MDFya" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="YGS68MDFyb" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MDFyc" role="3clF45" />
@@ -27306,7 +27306,7 @@
           <node concept="3cpWsn" id="YGS68MDFyg" role="3cpWs9">
             <property role="TrG5h" value="snapshot" />
             <node concept="3uibUv" id="YGS68MDFyh" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+              <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
             </node>
             <node concept="2YIFZM" id="YGS68MDFyi" role="33vP2m">
               <ref role="1Pybhc" node="3mz2_dYafX3" resolve="Snapshot" />
@@ -27365,7 +27365,7 @@
       <node concept="37vLTG" id="YGS68MDFyL" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="YGS68MDFyM" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MDFyN" role="3clF45" />
@@ -27375,7 +27375,7 @@
           <node concept="3cpWsn" id="YGS68MDFyR" role="3cpWs9">
             <property role="TrG5h" value="snapshot" />
             <node concept="3uibUv" id="YGS68MDFyS" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+              <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
             </node>
             <node concept="2YIFZM" id="YGS68MDFyT" role="33vP2m">
               <ref role="37wK5l" node="3mz2_dYfbSj" resolve="snapshotOf" />
@@ -27434,7 +27434,7 @@
       <node concept="37vLTG" id="YGS68MDFzo" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="YGS68MDFzp" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MDFzq" role="3clF45" />
@@ -27444,7 +27444,7 @@
           <node concept="3cpWsn" id="YGS68MDFzu" role="3cpWs9">
             <property role="TrG5h" value="snapshot" />
             <node concept="3uibUv" id="YGS68MDFzv" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+              <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
             </node>
             <node concept="2YIFZM" id="YGS68MDFzw" role="33vP2m">
               <ref role="37wK5l" node="3mz2_dYfbSj" resolve="snapshotOf" />
@@ -27503,7 +27503,7 @@
       <node concept="37vLTG" id="YGS68MDFzZ" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="YGS68MDF$0" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MDF$1" role="3clF45" />
@@ -27513,7 +27513,7 @@
           <node concept="3cpWsn" id="YGS68MDF$5" role="3cpWs9">
             <property role="TrG5h" value="snapshot" />
             <node concept="3uibUv" id="YGS68MDF$6" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+              <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
             </node>
             <node concept="2YIFZM" id="YGS68MDF$7" role="33vP2m">
               <ref role="37wK5l" node="3mz2_dYepsF" resolve="snapshotOf" />
@@ -27576,7 +27576,7 @@
       <node concept="37vLTG" id="YGS68MDF$q" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="YGS68MDF$r" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MDF$s" role="3clF45" />
@@ -27586,7 +27586,7 @@
           <node concept="3cpWsn" id="YGS68MDF$w" role="3cpWs9">
             <property role="TrG5h" value="snapshot" />
             <node concept="3uibUv" id="YGS68MDF$x" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+              <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
             </node>
             <node concept="2YIFZM" id="YGS68MDF$y" role="33vP2m">
               <ref role="37wK5l" node="3mz2_dYepsF" resolve="snapshotOf" />
@@ -27645,7 +27645,7 @@
       <node concept="37vLTG" id="7vxJ_H4ttZ_" role="3clF46">
         <property role="TrG5h" value="fail" />
         <node concept="3uibUv" id="7vxJ_H4ttZA" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:7vxJ_H4qn42" resolve="EvaluationFailureException" />
+          <ref role="3uigEE" to="w7la:~EvaluationFailureException" resolve="EvaluationFailureException" />
         </node>
       </node>
       <node concept="3cqZAl" id="7vxJ_H4ttZB" role="3clF45" />
@@ -27934,7 +27934,7 @@
         <node concept="37vLTG" id="YGS68MJoYg" role="3clF46">
           <property role="TrG5h" value="matchRule" />
           <node concept="3uibUv" id="YGS68MJoYh" role="1tU5fm">
-            <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
           </node>
         </node>
         <node concept="37vLTG" id="32fHqDfev9p" role="3clF46">
@@ -28052,7 +28052,7 @@
         <node concept="37vLTG" id="YGS68MJoZ2" role="3clF46">
           <property role="TrG5h" value="matchRule" />
           <node concept="3uibUv" id="YGS68MJoZ3" role="1tU5fm">
-            <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
           </node>
         </node>
         <node concept="3clFbS" id="YGS68MJoZ4" role="3clF47">
@@ -28136,13 +28136,13 @@
               <property role="TrG5h" value="kept" />
               <node concept="A3Dl8" id="YGS68MJoZA" role="1tU5fm">
                 <node concept="3uibUv" id="YGS68MJoZB" role="A3Ik2">
-                  <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                  <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                 </node>
               </node>
               <node concept="10QFUN" id="YGS68MJoZC" role="33vP2m">
                 <node concept="A3Dl8" id="YGS68MJoZD" role="10QFUM">
                   <node concept="3uibUv" id="YGS68MJoZE" role="A3Ik2">
-                    <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                    <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                   </node>
                 </node>
                 <node concept="2OqwBi" id="YGS68MJoZF" role="10QFUP">
@@ -28150,7 +28150,7 @@
                     <ref role="3cqZAo" node="YGS68MJoZ2" resolve="matchRule" />
                   </node>
                   <node concept="liA8E" id="YGS68MJoZH" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:63ioh_TWUn6" resolve="matchHeadKept" />
+                    <ref role="37wK5l" to="w7la:~MatchRule.matchHeadKept():java.lang.Iterable" resolve="matchHeadKept" />
                   </node>
                 </node>
               </node>
@@ -28199,7 +28199,7 @@
             <node concept="3cpWsn" id="YGS68MJoZY" role="1Duv9x">
               <property role="TrG5h" value="occ" />
               <node concept="3uibUv" id="YGS68MJoZZ" role="1tU5fm">
-                <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
               </node>
             </node>
             <node concept="37vLTw" id="YGS68MJp00" role="1DdaDG">
@@ -28212,13 +28212,13 @@
               <property role="TrG5h" value="replaced" />
               <node concept="A3Dl8" id="YGS68MJp04" role="1tU5fm">
                 <node concept="3uibUv" id="YGS68MJp05" role="A3Ik2">
-                  <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                  <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                 </node>
               </node>
               <node concept="10QFUN" id="YGS68MJp06" role="33vP2m">
                 <node concept="A3Dl8" id="YGS68MJp07" role="10QFUM">
                   <node concept="3uibUv" id="YGS68MJp08" role="A3Ik2">
-                    <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                    <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
                   </node>
                 </node>
                 <node concept="2OqwBi" id="YGS68MJp09" role="10QFUP">
@@ -28226,7 +28226,7 @@
                     <ref role="3cqZAo" node="YGS68MJoZ2" resolve="matchRule" />
                   </node>
                   <node concept="liA8E" id="YGS68MJp0b" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:63ioh_TWUu6" resolve="matchHeadReplaced" />
+                    <ref role="37wK5l" to="w7la:~MatchRule.matchHeadReplaced():java.lang.Iterable" resolve="matchHeadReplaced" />
                   </node>
                 </node>
               </node>
@@ -28275,7 +28275,7 @@
             <node concept="3cpWsn" id="YGS68MJp0s" role="1Duv9x">
               <property role="TrG5h" value="occ" />
               <node concept="3uibUv" id="YGS68MJp0t" role="1tU5fm">
-                <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+                <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
               </node>
             </node>
             <node concept="37vLTw" id="YGS68MJp0u" role="1DdaDG">
@@ -28294,7 +28294,7 @@
         <node concept="37vLTG" id="YGS68MJp0z" role="3clF46">
           <property role="TrG5h" value="rule" />
           <node concept="3uibUv" id="YGS68MJp0$" role="1tU5fm">
-            <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+            <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
           </node>
         </node>
         <node concept="3cqZAl" id="YGS68MJp0_" role="3clF45" />
@@ -28373,7 +28373,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="YGS68MJp1a" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:63ioh_TWUmb" resolve="rule" />
+                    <ref role="37wK5l" to="w7la:~MatchRule.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
                   </node>
                 </node>
                 <node concept="liA8E" id="YGS68MJp1b" role="2OqNvi">
@@ -28397,7 +28397,7 @@
         <node concept="37vLTG" id="32fHqDfcRiB" role="3clF46">
           <property role="TrG5h" value="rule" />
           <node concept="3uibUv" id="32fHqDfcRiC" role="1tU5fm">
-            <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+            <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
           </node>
         </node>
         <node concept="3cqZAl" id="32fHqDfcRiD" role="3clF45" />
@@ -28465,7 +28465,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="32fHqDfdi_M" role="2OqNvi">
-                      <ref role="37wK5l" to="qrld:63ioh_TWUmb" resolve="rule" />
+                      <ref role="37wK5l" to="w7la:~MatchRule.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
                     </node>
                   </node>
                   <node concept="liA8E" id="32fHqDfdi_N" role="2OqNvi">
@@ -28508,7 +28508,7 @@
         <node concept="37vLTG" id="YGS68MJp1h" role="3clF46">
           <property role="TrG5h" value="occ" />
           <node concept="3uibUv" id="YGS68MJp1i" role="1tU5fm">
-            <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
           </node>
         </node>
         <node concept="37vLTG" id="YGS68MJp1j" role="3clF46">
@@ -28607,7 +28607,7 @@
         <node concept="37vLTG" id="YGS68MJp1V" role="3clF46">
           <property role="TrG5h" value="occ" />
           <node concept="3uibUv" id="YGS68MJp1W" role="1tU5fm">
-            <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+            <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
           </node>
         </node>
         <node concept="37vLTG" id="YGS68MJp1X" role="3clF46">
@@ -29021,7 +29021,7 @@
       <node concept="37vLTG" id="YGS68MEg1P" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="YGS68MEg1Q" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MEg1R" role="3clF45" />
@@ -29038,7 +29038,7 @@
       <node concept="37vLTG" id="YGS68MEg2y" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="YGS68MEg2z" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MEg2$" role="3clF45" />
@@ -29055,7 +29055,7 @@
       <node concept="37vLTG" id="YGS68MEg2Y" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="YGS68MEg2Z" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MEg30" role="3clF45" />
@@ -29072,7 +29072,7 @@
       <node concept="37vLTG" id="YGS68MEg3q" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="YGS68MEg3r" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MEg3s" role="3clF45" />
@@ -29089,7 +29089,7 @@
       <node concept="37vLTG" id="YGS68MEg3Q" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="YGS68MEg3R" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MEg3S" role="3clF45" />
@@ -29106,7 +29106,7 @@
       <node concept="37vLTG" id="YGS68MEg3Y" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="YGS68MEg3Z" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MEg40" role="3clF45" />
@@ -29123,7 +29123,7 @@
       <node concept="37vLTG" id="YGS68MEg46" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="YGS68MEg47" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MEg48" role="3clF45" />
@@ -29140,7 +29140,7 @@
       <node concept="37vLTG" id="2_NfR5wh9fc" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="2_NfR5wh9fd" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="2_NfR5wh9fe" role="3clF45" />
@@ -29157,7 +29157,7 @@
       <node concept="37vLTG" id="YGS68MEg4e" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="YGS68MEg4f" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:63ioh_TWUlF" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MEg4g" role="3clF45" />
@@ -29174,7 +29174,7 @@
       <node concept="37vLTG" id="YGS68MEg4m" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="YGS68MEg4n" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MEg4o" role="3clF45" />
@@ -29195,7 +29195,7 @@
       <node concept="37vLTG" id="YGS68MEg4w" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="YGS68MEg4x" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MEg4y" role="3clF45" />
@@ -29212,7 +29212,7 @@
       <node concept="37vLTG" id="7vxJ_H4trdJ" role="3clF46">
         <property role="TrG5h" value="fail" />
         <node concept="3uibUv" id="7vxJ_H4trdK" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:7vxJ_H4qn42" resolve="EvaluationFailureException" />
+          <ref role="3uigEE" to="w7la:~EvaluationFailureException" resolve="EvaluationFailureException" />
         </node>
       </node>
       <node concept="3cqZAl" id="7vxJ_H4trdL" role="3clF45" />
@@ -29244,7 +29244,7 @@
       <node concept="37vLTG" id="YGS68MEg4K" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="YGS68MEg4L" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MEg4M" role="3clF45" />
@@ -29261,7 +29261,7 @@
       <node concept="37vLTG" id="YGS68MEg4S" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="YGS68MEg4T" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MEg4U" role="3clF45" />
@@ -29316,7 +29316,7 @@
       <node concept="37vLTG" id="YGS68ME8GM" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="YGS68ME8GN" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68ME8GO" role="3clF45" />
@@ -29326,7 +29326,7 @@
           <node concept="3cpWsn" id="YGS68MEckb" role="3cpWs9">
             <property role="TrG5h" value="snapshot" />
             <node concept="3uibUv" id="YGS68MEckc" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+              <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
             </node>
             <node concept="2YIFZM" id="YGS68MEckd" role="33vP2m">
               <ref role="1Pybhc" node="3mz2_dYafX3" resolve="Snapshot" />
@@ -29367,11 +29367,11 @@
                             <ref role="3cqZAo" node="YGS68ME8GM" resolve="occurrence" />
                           </node>
                           <node concept="liA8E" id="YGS68MEb_w" role="2OqNvi">
-                            <ref role="37wK5l" to="qrld:5uFPQ7BZacZ" resolve="constraint" />
+                            <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint():jetbrains.mps.logic.reactor.program.Constraint" resolve="constraint" />
                           </node>
                         </node>
                         <node concept="liA8E" id="YGS68MEb_x" role="2OqNvi">
-                          <ref role="37wK5l" to="rchb:5uFPQ7B_aTC" resolve="symbol" />
+                          <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
                         </node>
                       </node>
                     </node>
@@ -29430,7 +29430,7 @@
       <node concept="37vLTG" id="YGS68ME8GU" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="YGS68ME8GV" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68ME8GW" role="3clF45" />
@@ -29440,7 +29440,7 @@
           <node concept="3cpWsn" id="YGS68MEd6X" role="3cpWs9">
             <property role="TrG5h" value="snapshot" />
             <node concept="3uibUv" id="YGS68MEd6Y" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+              <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
             </node>
             <node concept="2YIFZM" id="YGS68MEd6Z" role="33vP2m">
               <ref role="1Pybhc" node="3mz2_dYafX3" resolve="Snapshot" />
@@ -29501,7 +29501,7 @@
       <node concept="37vLTG" id="YGS68ME8H2" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="YGS68ME8H3" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68ME8H4" role="3clF45" />
@@ -29511,7 +29511,7 @@
           <node concept="3cpWsn" id="YGS68MEdgK" role="3cpWs9">
             <property role="TrG5h" value="snapshot" />
             <node concept="3uibUv" id="YGS68MEdgL" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+              <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
             </node>
             <node concept="2YIFZM" id="YGS68MEdgM" role="33vP2m">
               <ref role="1Pybhc" node="3mz2_dYafX3" resolve="Snapshot" />
@@ -29572,7 +29572,7 @@
       <node concept="37vLTG" id="YGS68ME8Ha" role="3clF46">
         <property role="TrG5h" value="occurrence" />
         <node concept="3uibUv" id="YGS68ME8Hb" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68ME8Hc" role="3clF45" />
@@ -29582,7 +29582,7 @@
           <node concept="3cpWsn" id="YGS68MEe8D" role="3cpWs9">
             <property role="TrG5h" value="snapshot" />
             <node concept="3uibUv" id="YGS68MEe8E" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+              <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
             </node>
             <node concept="2YIFZM" id="YGS68MEe8F" role="33vP2m">
               <ref role="1Pybhc" node="3mz2_dYafX3" resolve="Snapshot" />
@@ -29926,7 +29926,7 @@
         <node concept="37vLTG" id="YGS68MIBWB" role="3clF46">
           <property role="TrG5h" value="sym" />
           <node concept="3uibUv" id="YGS68MIBWC" role="1tU5fm">
-            <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+            <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
           </node>
         </node>
         <node concept="3cqZAl" id="YGS68MIBWD" role="3clF45" />
@@ -30034,7 +30034,7 @@
         <node concept="37vLTG" id="YGS68MIBXk" role="3clF46">
           <property role="TrG5h" value="occ" />
           <node concept="3uibUv" id="YGS68MIBXl" role="1tU5fm">
-            <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
           </node>
         </node>
         <node concept="37vLTG" id="YGS68MIBXm" role="3clF46">
@@ -30140,11 +30140,11 @@
                       <ref role="3cqZAo" node="YGS68MIBXk" resolve="occ" />
                     </node>
                     <node concept="liA8E" id="YGS68MIBY5" role="2OqNvi">
-                      <ref role="37wK5l" to="qrld:5uFPQ7BZacZ" resolve="constraint" />
+                      <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint():jetbrains.mps.logic.reactor.program.Constraint" resolve="constraint" />
                     </node>
                   </node>
                   <node concept="liA8E" id="YGS68MIBY6" role="2OqNvi">
-                    <ref role="37wK5l" to="rchb:5uFPQ7B_aTC" resolve="symbol" />
+                    <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
                   </node>
                 </node>
               </node>
@@ -30175,7 +30175,7 @@
         <node concept="37vLTG" id="YGS68MTdIo" role="3clF46">
           <property role="TrG5h" value="occ" />
           <node concept="3uibUv" id="YGS68MTdIs" role="1tU5fm">
-            <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
           </node>
         </node>
         <node concept="37vLTG" id="YGS68MTdIw" role="3clF46">
@@ -30246,7 +30246,7 @@
         <node concept="37vLTG" id="YGS68MNwv3" role="3clF46">
           <property role="TrG5h" value="occ" />
           <node concept="3uibUv" id="YGS68MNwv4" role="1tU5fm">
-            <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
           </node>
         </node>
         <node concept="3cqZAl" id="YGS68MNwv7" role="3clF45" />
@@ -30371,13 +30371,13 @@
             <node concept="3qTvmN" id="YGS68MIBZd" role="11_B2D" />
           </node>
           <node concept="3uibUv" id="YGS68MIBZe" role="3rvQeY">
-            <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+            <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
           </node>
         </node>
         <node concept="2ShNRf" id="YGS68MIBZf" role="33vP2m">
           <node concept="3rGOSV" id="YGS68MIBZg" role="2ShVmc">
             <node concept="3uibUv" id="YGS68MIBZh" role="3rHrn6">
-              <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+              <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
             </node>
             <node concept="3uibUv" id="YGS68MIBZi" role="3rHtpV">
               <ref role="3uigEE" node="6QkkSolcsEP" resolve="StoreNodes.DefaultTreeNode" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index 91aef8c0..8bca89eb 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -32,11 +32,11 @@
     <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.typesystem2.type)" />
     <import index="cx9y" ref="r:309aeee7-bee8-445c-b31d-35928d1da75f(jetbrains.mps.baseLanguage.tuples.structure)" />
     <import index="ha02" ref="r:09e53496-6477-45e7-abd5-eaf3fac3b360(jetbrains.mps.logic.behavior)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
-    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
     <import index="tp68" ref="r:00000000-0000-4000-0000-011c895903ac(jetbrains.mps.baseLanguageInternal.structure)" />
-    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
+    <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
     <import index="omn0" ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)" />
     <import index="nz6g" ref="r:ac00f724-30be-446e-805c-2345efc460d7(jetbrains.mps.lang.typesystem2.program)" />
@@ -1411,8 +1411,8 @@
       <node concept="312cEg" id="452KZTbrQTT" role="jymVt">
         <property role="TrG5h" value="logical" />
         <node concept="3Tm1VV" id="452KZTbs22Y" role="1B3o_S" />
-        <node concept="3uibUv" id="7HUwyZaV3Tp" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+        <node concept="3uibUv" id="1HG00HG84Sg" role="1tU5fm">
+          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
         </node>
       </node>
       <node concept="3Tm1VV" id="452KZTbrMEp" role="1B3o_S" />
@@ -2797,7 +2797,7 @@
                       <ref role="37wK5l" to="nz6g:4sSe4$oM2rk" resolve="ConstraintBuilder" />
                       <node concept="2ShNRf" id="4sSe4$oMjqR" role="37wK5m">
                         <node concept="1pGfFk" id="4sSe4$oMjqS" role="2ShVmc">
-                          <ref role="37wK5l" to="rchb:54i3FxcZMv0" resolve="ConstraintSymbol" />
+                          <ref role="37wK5l" to="av0y:~ConstraintSymbol.&lt;init&gt;(java.lang.String,int)" resolve="ConstraintSymbol" />
                           <node concept="Xl_RD" id="4sSe4$oMjqT" role="37wK5m">
                             <property role="Xl_RC" value="name" />
                             <node concept="17Uvod" id="4sSe4$oMjqU" role="lGtFl">
@@ -2933,7 +2933,7 @@
                         <ref role="37wK5l" to="nz6g:4sSe4$oM2rk" resolve="ConstraintBuilder" />
                         <node concept="2ShNRf" id="4sSe4$p4Qea" role="37wK5m">
                           <node concept="1pGfFk" id="4sSe4$p4Qeb" role="2ShVmc">
-                            <ref role="37wK5l" to="rchb:54i3FxcZMv0" resolve="ConstraintSymbol" />
+                            <ref role="37wK5l" to="av0y:~ConstraintSymbol.&lt;init&gt;(java.lang.String,int)" resolve="ConstraintSymbol" />
                             <node concept="Xl_RD" id="4sSe4$p4Qec" role="37wK5m">
                               <property role="Xl_RC" value="name" />
                               <node concept="17Uvod" id="4sSe4$p4Qed" role="lGtFl">
@@ -3493,8 +3493,8 @@
                     <node concept="1pGfFk" id="4sSe4$oNIEu" role="2ShVmc">
                       <ref role="37wK5l" to="nz6g:4sSe4$oM2B4" resolve="PredicateBuilder" />
                       <node concept="2YIFZM" id="4sSe4$oNJdW" role="37wK5m">
-                        <ref role="1Pybhc" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
-                        <ref role="37wK5l" to="rchb:2UGjFq4gNPT" resolve="withArity" />
+                        <ref role="1Pybhc" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
+                        <ref role="37wK5l" to="av0y:~JavaPredicateSymbol.withArity(int):jetbrains.mps.logic.reactor.program.JavaPredicateSymbol" resolve="withArity" />
                         <node concept="3cmrfG" id="4sSe4$oNJdX" role="37wK5m">
                           <property role="3cmrfH" value="0" />
                           <node concept="17Uvod" id="4sSe4$oNJdY" role="lGtFl">
@@ -3888,7 +3888,7 @@
       <property role="2aFKle" value="false" />
       <node concept="3Tm1VV" id="1ggxSI7z25J" role="1B3o_S" />
       <node concept="3uibUv" id="1ggxSI7z25K" role="3clF45">
-        <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+        <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
       </node>
       <node concept="3clFbS" id="1ggxSI7z25L" role="3clF47">
         <node concept="3clFbF" id="1ggxSI7z28i" role="3cqZAp">
@@ -3953,8 +3953,8 @@
       <node concept="312cEg" id="452KZTbuWIz" role="jymVt">
         <property role="TrG5h" value="logical" />
         <node concept="3Tm1VV" id="452KZTbuWI$" role="1B3o_S" />
-        <node concept="3uibUv" id="7HUwyZaV8TF" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+        <node concept="3uibUv" id="1HG00HG7ZJp" role="1tU5fm">
+          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
         </node>
       </node>
       <node concept="3Tm1VV" id="452KZTbuWIA" role="1B3o_S" />
@@ -7053,8 +7053,8 @@
         <property role="TrG5h" value="Variables" />
         <node concept="312cEg" id="452KZTbx$Pa" role="jymVt">
           <property role="TrG5h" value="logical" />
-          <node concept="3uibUv" id="7HUwyZaVjUN" role="1tU5fm">
-            <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+          <node concept="3uibUv" id="1HG00HG8w0g" role="1tU5fm">
+            <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
           </node>
           <node concept="3Tm1VV" id="452KZTbx$Pb" role="1B3o_S" />
           <node concept="1WS0z7" id="452KZTbxKeF" role="lGtFl">
@@ -8310,7 +8310,7 @@
                     <property role="1EzhhJ" value="false" />
                     <property role="TrG5h" value="get" />
                     <node concept="3uibUv" id="7IysFeBqtzv" role="3clF45">
-                      <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                      <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                     </node>
                     <node concept="3Tm1VV" id="7IysFeBlmko" role="1B3o_S" />
                     <node concept="3clFbS" id="7IysFeBlmkp" role="3clF47">
@@ -8340,7 +8340,7 @@
                     </node>
                   </node>
                   <node concept="3uibUv" id="7IysFeBqtgV" role="2Ghqu4">
-                    <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                    <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                   </node>
                 </node>
               </node>
@@ -8693,7 +8693,7 @@
           <node concept="37vLTG" id="7IysFeAI4JL" role="3clF46">
             <property role="TrG5h" value="typeLogical" />
             <node concept="3uibUv" id="7IysFeAI4Ka" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+              <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
             </node>
           </node>
           <node concept="3Tm6S6" id="7IysFeAI4HF" role="1B3o_S" />
@@ -11872,8 +11872,8 @@
         <node concept="312cEg" id="7IysFeAzSD9" role="jymVt">
           <property role="TrG5h" value="logical" />
           <node concept="3Tm6S6" id="7IysFeAzSDa" role="1B3o_S" />
-          <node concept="3uibUv" id="7IysFeAzYRm" role="1tU5fm">
-            <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+          <node concept="3uibUv" id="1HG00HG898i" role="1tU5fm">
+            <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
           </node>
           <node concept="1W57fq" id="7IysFeAA7PG" role="lGtFl">
             <node concept="3IZrLx" id="7IysFeAA7PI" role="3IZSJc">
@@ -13398,7 +13398,7 @@
             <node concept="3cpWsn" id="7nPD14NP47U" role="3cpWs9">
               <property role="TrG5h" value="$_T" />
               <node concept="3uibUv" id="7nPD14NP47V" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:7HUwyZaNIC5" resolve="MultiMetaLogical" />
+                <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
               </node>
               <node concept="17Uvod" id="7nPD14NP47W" role="lGtFl">
                 <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -13575,7 +13575,7 @@
             <node concept="3cpWsn" id="7nPD14NOLAE" role="3cpWs9">
               <property role="TrG5h" value="$_T" />
               <node concept="3uibUv" id="7nPD14NOLAF" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
               </node>
               <node concept="17Uvod" id="7nPD14NOLAG" role="lGtFl">
                 <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -13722,7 +13722,7 @@
             <node concept="3cpWsn" id="75vUFrSLwzy" role="3cpWs9">
               <property role="TrG5h" value="logical" />
               <node concept="3uibUv" id="7HUwyZaPUOK" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
               </node>
             </node>
           </node>
@@ -13784,14 +13784,14 @@
             <node concept="3cpWsn" id="75vUFrSLxaT" role="3cpWs9">
               <property role="TrG5h" value="multiLogical" />
               <node concept="3uibUv" id="7HUwyZaPUUk" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:7HUwyZaNIC5" resolve="MultiMetaLogical" />
+                <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
               </node>
             </node>
           </node>
           <node concept="3clFbF" id="7HUwyZaPVcS" role="3cqZAp">
             <node concept="2OqwBi" id="7HUwyZaPVgJ" role="3clFbG">
               <node concept="liA8E" id="7HUwyZaPVif" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:7HUwyZaNHY_" resolve="logicalAt" />
+                <ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int):jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="logicalAt" />
                 <node concept="3cmrfG" id="7HUwyZaPVje" role="37wK5m">
                   <property role="3cmrfH" value="0" />
                   <node concept="29HgVG" id="7HUwyZaPVjf" role="lGtFl">
@@ -15348,7 +15348,7 @@
               <property role="TrG5h" value="multiLogical" />
               <node concept="3Tm1VV" id="452KZTbtm6U" role="1B3o_S" />
               <node concept="3uibUv" id="7HUwyZaPLv5" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:7HUwyZaNIC5" resolve="MultiMetaLogical" />
+                <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
                 <node concept="3uibUv" id="7nPD14NP2dv" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -15541,7 +15541,7 @@
               <property role="TrG5h" value="logical" />
               <node concept="3Tm1VV" id="452KZTbtu59" role="1B3o_S" />
               <node concept="3uibUv" id="7HUwyZaPQY0" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
               </node>
             </node>
             <node concept="3Tm6S6" id="452KZTbtu5c" role="1B3o_S" />
@@ -15786,7 +15786,7 @@
           <node concept="312cEg" id="452KZTbxHgV" role="jymVt">
             <property role="TrG5h" value="var" />
             <node concept="3uibUv" id="7HUwyZaVmga" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:7HUwyZaNIC5" resolve="MultiMetaLogical" />
+              <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
             </node>
             <node concept="3Tm1VV" id="452KZTbxHgW" role="1B3o_S" />
             <node concept="raruj" id="452KZTbxHh5" role="lGtFl" />
@@ -15854,7 +15854,7 @@
           <node concept="312cEg" id="452KZTbxJ63" role="jymVt">
             <property role="TrG5h" value="var" />
             <node concept="3uibUv" id="7HUwyZaVmt3" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+              <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
             </node>
             <node concept="3Tm1VV" id="452KZTbxJ64" role="1B3o_S" />
             <node concept="raruj" id="452KZTbxJ6d" role="lGtFl" />
@@ -15906,7 +15906,7 @@
               <property role="TrG5h" value="logical" />
               <node concept="3Tm1VV" id="452KZTbxZ_p" role="1B3o_S" />
               <node concept="3uibUv" id="7HUwyZaWNcu" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
               </node>
             </node>
             <node concept="3Tm6S6" id="452KZTbxZ$J" role="1B3o_S" />
@@ -16017,7 +16017,7 @@
               <property role="TrG5h" value="multiLogical" />
               <node concept="3Tm1VV" id="452KZTby0Uk" role="1B3o_S" />
               <node concept="3uibUv" id="7HUwyZaWNoa" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:7HUwyZaNIC5" resolve="MultiMetaLogical" />
+                <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
               </node>
             </node>
             <node concept="3Tm6S6" id="452KZTby0Um" role="1B3o_S" />
@@ -16093,7 +16093,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="7HUwyZaWNV2" role="2OqNvi">
-                    <ref role="37wK5l" to="45ys:7HUwyZaNHY_" resolve="logicalAt" />
+                    <ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int):jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="logicalAt" />
                     <node concept="3cmrfG" id="452KZTbxZd8" role="37wK5m">
                       <property role="3cmrfH" value="1" />
                       <node concept="29HgVG" id="452KZTbxZd9" role="lGtFl">
@@ -16153,7 +16153,7 @@
       <node concept="37vLTG" id="2UGjFq4p$za" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="2UGjFq4p$zb" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="10P_77" id="2UGjFq4p$zc" role="3clF45" />
@@ -16213,7 +16213,7 @@
                           <ref role="3cqZAo" node="2UGjFq4p$za" resolve="invocation" />
                         </node>
                         <node concept="liA8E" id="2UGjFq4pDQ6" role="2OqNvi">
-                          <ref role="37wK5l" to="qrld:49L2l3FhtTG" resolve="arguments" />
+                          <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
                         </node>
                       </node>
                       <node concept="liA8E" id="2UGjFq4pECM" role="2OqNvi">
@@ -16327,7 +16327,7 @@
                             <ref role="3cqZAo" node="2UGjFq4p$za" resolve="invocation" />
                           </node>
                           <node concept="liA8E" id="2UGjFq4pF42" role="2OqNvi">
-                            <ref role="37wK5l" to="qrld:49L2l3FhtTG" resolve="arguments" />
+                            <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
                           </node>
                         </node>
                         <node concept="liA8E" id="2UGjFq4pF43" role="2OqNvi">
@@ -16352,7 +16352,7 @@
                   <ref role="3cqZAo" node="2UGjFq4p$za" resolve="invocation" />
                 </node>
                 <node concept="liA8E" id="2UGjFq4pCg1" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:49L2l3FhtTG" resolve="arguments" />
+                  <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
                 </node>
               </node>
               <node concept="liA8E" id="2UGjFq4pC_0" role="2OqNvi">
@@ -16378,7 +16378,7 @@
       <node concept="37vLTG" id="2UGjFq4p$z6" role="3clF46">
         <property role="TrG5h" value="invocation" />
         <node concept="3uibUv" id="2UGjFq4p$z7" role="1tU5fm">
-          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+          <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
         </node>
       </node>
       <node concept="3clFbS" id="2UGjFq4p$z8" role="3clF47">
@@ -16387,7 +16387,7 @@
             <node concept="YS8fn" id="2UGjFq4pFcT" role="3cqZAp">
               <node concept="2ShNRf" id="2UGjFq4pFcU" role="YScLw">
                 <node concept="1pGfFk" id="2UGjFq4pFcV" role="2ShVmc">
-                  <ref role="37wK5l" to="qrld:7vxJ_H4qql2" resolve="EvaluationFailureException" />
+                  <ref role="37wK5l" to="w7la:~EvaluationFailureException.&lt;init&gt;(java.lang.String)" resolve="EvaluationFailureException" />
                   <node concept="3cpWs3" id="2UGjFq4pFcW" role="37wK5m">
                     <node concept="2OqwBi" id="2UGjFq4pGID" role="3uHU7w">
                       <node concept="2OqwBi" id="2UGjFq4pG$q" role="2Oq$k0">
@@ -16395,11 +16395,11 @@
                           <ref role="3cqZAo" node="2UGjFq4p$z6" resolve="invocation" />
                         </node>
                         <node concept="liA8E" id="2UGjFq4pGBj" role="2OqNvi">
-                          <ref role="37wK5l" to="qrld:49L2l3FhtSL" resolve="predicate" />
+                          <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate():jetbrains.mps.logic.reactor.program.Predicate" resolve="predicate" />
                         </node>
                       </node>
                       <node concept="liA8E" id="2UGjFq4pGMy" role="2OqNvi">
-                        <ref role="37wK5l" to="rchb:6Kcfpq7Bjgi" resolve="symbol" />
+                        <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
                       </node>
                     </node>
                     <node concept="Xl_RD" id="2UGjFq4pFcY" role="3uHU7B">
@@ -16676,7 +16676,7 @@
     <node concept="3Tm1VV" id="1sCZQVeRJrz" role="1B3o_S" />
     <node concept="n94m4" id="1sCZQVeRJr$" role="lGtFl" />
     <node concept="3uibUv" id="6H279bUVoh4" role="EKbjA">
-      <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+      <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
     </node>
   </node>
   <node concept="bUwia" id="1sCZQVeRS5H">
@@ -16912,7 +16912,7 @@
       <ref role="30HIoZ" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
       <node concept="1Koe21" id="7HUwyZb4Spx" role="1lVwrX">
         <node concept="3uibUv" id="7HUwyZb4SpF" role="1Koe22">
-          <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="raruj" id="7HUwyZb4SpK" role="lGtFl" />
         </node>
       </node>
@@ -18518,7 +18518,7 @@
               <property role="TrG5h" value="multiLogical" />
               <node concept="3Tm1VV" id="7IysFeA$o4z" role="1B3o_S" />
               <node concept="3uibUv" id="7IysFeA$o4$" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:7HUwyZaNIC5" resolve="MultiMetaLogical" />
+                <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
                 <node concept="3uibUv" id="7IysFeA$o4_" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -18658,7 +18658,7 @@
               <property role="TrG5h" value="multiLogical" />
               <node concept="3Tm1VV" id="7IysFeABCnv" role="1B3o_S" />
               <node concept="3uibUv" id="7IysFeABCnw" role="1tU5fm">
-                <ref role="3uigEE" to="45ys:7HUwyZaNIC5" resolve="MultiMetaLogical" />
+                <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
                 <node concept="3uibUv" id="7IysFeABCnx" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
index c24633cb..9dc8ff01 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
@@ -83,7 +83,6 @@
         <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
         <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
         <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
-        <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
         <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
         <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
       </dependencyVersions>
@@ -96,7 +95,6 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
-    <dependency reexport="false">c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.typesystem2)</dependency>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
     <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -174,7 +172,6 @@
     <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
     <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
-    <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
index c8d728da..addbf25e 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
@@ -15,7 +15,7 @@
     <import index="ha02" ref="r:09e53496-6477-45e7-abd5-eaf3fac3b360(jetbrains.mps.logic.behavior)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.typesystem2.structure)" />
-    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
+    <import index="qrld" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
index 7f365b84..b02d831f 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
@@ -8,6 +8,8 @@
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="3" />
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="3" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -80,6 +82,13 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
+      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
+        <property id="6329021646629104958" name="text" index="3SKdUp" />
+      </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
+      </concept>
+      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions">
       <concept id="1192794744107" name="jetbrains.mps.lang.intentions.structure.IntentionDeclaration" flags="ig" index="2S6QgY" />
@@ -110,6 +119,9 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
+      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
+        <child id="1144104376918" name="parameter" index="1xVPHs" />
+      </concept>
       <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
@@ -118,13 +130,19 @@
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
       </concept>
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
+      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
         <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
       </concept>
+      <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
       <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
+      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
+      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
+        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
+      </concept>
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </concept>
@@ -137,7 +155,12 @@
       <concept id="6407023681583031218" name="jetbrains.mps.lang.smodel.structure.AttributeAccess" flags="nn" index="3CFZ6_">
         <child id="6407023681583036852" name="qualifier" index="3CFYIz" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
+      <concept id="1140131837776" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithAnotherOperation" flags="nn" index="1P9Npp">
+        <child id="1140131861877" name="replacementNode" index="1P9ThW" />
+      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
+        <property id="1238684351431" name="asCast" index="1BlNFB" />
+      </concept>
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -147,6 +170,7 @@
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
+      <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -390,5 +414,127 @@
       </node>
     </node>
   </node>
+  <node concept="2S6QgY" id="4sSe4$p4oTF">
+    <property role="3GE5qa" value="logical" />
+    <property role="TrG5h" value="LogicalVariable_specifyValue" />
+    <ref role="2ZfgGC" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+    <node concept="2S6ZIM" id="4sSe4$p4oTG" role="2ZfVej">
+      <node concept="3clFbS" id="4sSe4$p4oTH" role="2VODD2">
+        <node concept="3clFbF" id="4sSe4$p4p2B" role="3cqZAp">
+          <node concept="Xl_RD" id="4sSe4$p4p2A" role="3clFbG">
+            <property role="Xl_RC" value="Specify Value" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2Sbjvc" id="4sSe4$p4oTI" role="2ZfgGD">
+      <node concept="3clFbS" id="4sSe4$p4oTJ" role="2VODD2">
+        <node concept="3cpWs8" id="4sSe4$p4w5F" role="3cqZAp">
+          <node concept="3cpWsn" id="4sSe4$p4w5G" role="3cpWs9">
+            <property role="TrG5h" value="alv" />
+            <node concept="3Tqbb2" id="4sSe4$p4w5D" role="1tU5fm">
+              <ref role="ehGHo" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
+            </node>
+            <node concept="2ShNRf" id="4sSe4$p4w5H" role="33vP2m">
+              <node concept="3zrR0B" id="4sSe4$p4w5I" role="2ShVmc">
+                <node concept="3Tqbb2" id="4sSe4$p4w5J" role="3zrR0E">
+                  <ref role="ehGHo" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4sSe4$p4FXc" role="3cqZAp">
+          <node concept="2OqwBi" id="4sSe4$p4G3j" role="3clFbG">
+            <node concept="2Sf5sV" id="4sSe4$p4FXa" role="2Oq$k0" />
+            <node concept="1P9Npp" id="4sSe4$p4Ggq" role="2OqNvi">
+              <node concept="37vLTw" id="4sSe4$p4Gl8" role="1P9ThW">
+                <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="alv" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4sSe4$p4vIY" role="3cqZAp">
+          <node concept="37vLTI" id="4sSe4$p4wuf" role="3clFbG">
+            <node concept="2OqwBi" id="4sSe4$p4wBZ" role="37vLTx">
+              <node concept="2Sf5sV" id="4sSe4$p4wyl" role="2Oq$k0" />
+              <node concept="3YRAZt" id="4sSe4$p4wJS" role="2OqNvi" />
+            </node>
+            <node concept="2OqwBi" id="4sSe4$p4we2" role="37vLTJ">
+              <node concept="37vLTw" id="4sSe4$p4w5K" role="2Oq$k0">
+                <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="alv" />
+              </node>
+              <node concept="3TrEf2" id="4sSe4$p4wkM" role="2OqNvi">
+                <ref role="3Tt5mk" to="5j4j:4sSe4$p4oON" resolve="variable" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4sSe4$p4wSN" role="3cqZAp">
+          <node concept="37vLTI" id="4sSe4$p4xi2" role="3clFbG">
+            <node concept="2ShNRf" id="4sSe4$p4xmN" role="37vLTx">
+              <node concept="3zrR0B" id="4sSe4$p4xmL" role="2ShVmc">
+                <node concept="3Tqbb2" id="4sSe4$p4xmM" role="3zrR0E">
+                  <ref role="ehGHo" to="5j4j:7E86$tKskWj" resolve="LogicalValue" />
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="4sSe4$p4wYQ" role="37vLTJ">
+              <node concept="37vLTw" id="4sSe4$p4wSL" role="2Oq$k0">
+                <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="alv" />
+              </node>
+              <node concept="3TrEf2" id="4sSe4$p4x9l" role="2OqNvi">
+                <ref role="3Tt5mk" to="5j4j:4sSe4$p4oOP" resolve="value" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2SaL7w" id="4sSe4$p4paM" role="2ZfVeh">
+      <node concept="3clFbS" id="4sSe4$p4paN" role="2VODD2">
+        <node concept="3SKdUt" id="4sSe4$p4t4D" role="3cqZAp">
+          <node concept="3SKdUq" id="4sSe4$p4t4F" role="3SKWNk">
+            <property role="3SKdUp" value="applicable to logical variables in user constraints within rule's head block" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="4sSe4$p4rMM" role="3cqZAp">
+          <node concept="1Wc70l" id="4sSe4$p4s9Q" role="3clFbG">
+            <node concept="2OqwBi" id="4sSe4$p4sDs" role="3uHU7w">
+              <node concept="2OqwBi" id="4sSe4$p4sje" role="2Oq$k0">
+                <node concept="2Sf5sV" id="4sSe4$p4sd_" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="4sSe4$p4sv3" role="2OqNvi">
+                  <node concept="1xMEDy" id="4sSe4$p4sv5" role="1xVPHs">
+                    <node concept="chp4Y" id="4sSe4$p4szo" role="ri$Ld">
+                      <ref role="cht4Q" to="wq2x:6p0DfM0a3gA" resolve="Head" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3x8VRR" id="4sSe4$p4sQk" role="2OqNvi" />
+            </node>
+            <node concept="2OqwBi" id="4sSe4$p4rUe" role="3uHU7B">
+              <node concept="2OqwBi" id="4sSe4$p4rMO" role="2Oq$k0">
+                <node concept="1PxgMI" id="4sSe4$p4rMP" role="2Oq$k0">
+                  <property role="1BlNFB" value="true" />
+                  <ref role="1m5ApE" to="wq2x:6p0DfM0ang5" resolve="UserConstraint" />
+                  <node concept="2OqwBi" id="4sSe4$p4rMQ" role="1m5AlR">
+                    <node concept="2Sf5sV" id="4sSe4$p4rMR" role="2Oq$k0" />
+                    <node concept="1mfA1w" id="4sSe4$p4rMS" role="2OqNvi" />
+                  </node>
+                </node>
+                <node concept="1mfA1w" id="4sSe4$p4rMT" role="2OqNvi" />
+              </node>
+              <node concept="1mIQ4w" id="4sSe4$p4s00" role="2OqNvi">
+                <node concept="chp4Y" id="4sSe4$p4s3a" role="cj9EA">
+                  <ref role="cht4Q" to="wq2x:6p0DfM0a6KG" resolve="EmitConstraintStatement" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/generation.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/generation.mps
index f4ced965..173b2a49 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/generation.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/generation.mps
@@ -15,7 +15,7 @@
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.typesystem2.template)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
+    <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
     <import index="3o3z" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:com.google.common.collect(MPS.Core/)" />
     <import index="nz6g" ref="r:ac00f724-30be-446e-805c-2345efc460d7(jetbrains.mps.lang.typesystem2.program)" />
@@ -714,7 +714,7 @@
               <node concept="3cpWsn" id="7nkyKX7nlpb" role="3cpWs9">
                 <property role="TrG5h" value="rule" />
                 <node concept="3uibUv" id="7nkyKX7nlp9" role="1tU5fm">
-                  <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+                  <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
                 </node>
                 <node concept="2OqwBi" id="7nkyKX7nlpc" role="33vP2m">
                   <node concept="37vLTw" id="7nkyKX7nlpd" role="2Oq$k0">
@@ -745,7 +745,7 @@
             <node concept="3cpWsn" id="7nkyKX7nl0T" role="TDEfY">
               <property role="TrG5h" value="e" />
               <node concept="3uibUv" id="7nkyKX7nmdZ" role="1tU5fm">
-                <ref role="3uigEE" to="rchb:7Oc59RS$wKP" resolve="InvalidRuleException" />
+                <ref role="3uigEE" to="av0y:~InvalidRuleException" resolve="InvalidRuleException" />
               </node>
             </node>
             <node concept="3clFbS" id="7nkyKX7nl0X" role="TDEfX">
@@ -1733,7 +1733,7 @@
                       <node concept="3cpWsn" id="tIwzd1I3WB" role="3cpWs9">
                         <property role="TrG5h" value="rule" />
                         <node concept="3uibUv" id="tIwzd1I3WC" role="1tU5fm">
-                          <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+                          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
                         </node>
                         <node concept="2OqwBi" id="tIwzd1I3WD" role="33vP2m">
                           <node concept="2GrUjf" id="tIwzd1I3WE" role="2Oq$k0">
@@ -1865,7 +1865,7 @@
                     <node concept="3cpWsn" id="tIwzd1I3X5" role="TDEfY">
                       <property role="TrG5h" value="e" />
                       <node concept="3uibUv" id="tIwzd1I3X6" role="1tU5fm">
-                        <ref role="3uigEE" to="rchb:7Oc59RS$wKP" resolve="InvalidRuleException" />
+                        <ref role="3uigEE" to="av0y:~InvalidRuleException" resolve="InvalidRuleException" />
                       </node>
                     </node>
                   </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps
index 64d40197..cf7a2da1 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps
@@ -10,11 +10,11 @@
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
+    <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="3o3z" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:com.google.common.collect(MPS.Core/)" />
-    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.builtin.program)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
@@ -388,7 +388,7 @@
                     <property role="3cmrfH" value="4" />
                   </node>
                   <node concept="3uibUv" id="32fHqDf93HV" role="1pMfVU">
-                    <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+                    <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
                   </node>
                 </node>
               </node>
@@ -407,7 +407,7 @@
         <property role="TrG5h" value="item" />
         <node concept="8X2XB" id="7eGEHDlc$ay" role="1tU5fm">
           <node concept="3uibUv" id="5uFPQ7BJyBn" role="8Xvag">
-            <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+            <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
           </node>
         </node>
       </node>
@@ -432,7 +432,7 @@
                         <property role="3cmrfH" value="4" />
                       </node>
                       <node concept="3uibUv" id="2_NfR5wkxwM" role="1pMfVU">
-                        <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+                        <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
                       </node>
                     </node>
                   </node>
@@ -456,7 +456,7 @@
             <node concept="3uibUv" id="2_NfR5wkuUo" role="1tU5fm">
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3uibUv" id="2_NfR5wkuUr" role="11_B2D">
-                <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+                <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
               </node>
             </node>
             <node concept="2OqwBi" id="2_NfR5wkyOL" role="33vP2m">
@@ -539,7 +539,7 @@
         <property role="TrG5h" value="pred" />
         <node concept="8X2XB" id="7eGEHDlc$aZ" role="1tU5fm">
           <node concept="3uibUv" id="5uFPQ7BJyQi" role="8Xvag">
-            <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+            <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
           </node>
         </node>
       </node>
@@ -658,8 +658,8 @@
       <node concept="37vLTG" id="7eGEHDlc$bN" role="3clF46">
         <property role="TrG5h" value="cst" />
         <node concept="8X2XB" id="7eGEHDlc$bO" role="1tU5fm">
-          <node concept="3uibUv" id="5uFPQ7BJz5a" role="8Xvag">
-            <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+          <node concept="3uibUv" id="1HG00HG1Ha2" role="8Xvag">
+            <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
           </node>
         </node>
       </node>
@@ -724,8 +724,8 @@
       <node concept="37vLTG" id="7eGEHDlc$cg" role="3clF46">
         <property role="TrG5h" value="cst" />
         <node concept="8X2XB" id="7eGEHDlc$ch" role="1tU5fm">
-          <node concept="3uibUv" id="5uFPQ7BJzjX" role="8Xvag">
-            <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+          <node concept="3uibUv" id="1HG00HG1S9w" role="8Xvag">
+            <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
           </node>
         </node>
       </node>
@@ -882,15 +882,15 @@
     <node concept="3clFb_" id="7eGEHDlc$ck" role="jymVt">
       <property role="TrG5h" value="toRule" />
       <node concept="3uibUv" id="7eGEHDlc$cl" role="3clF45">
-        <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+        <ref role="3uigEE" node="7eGEHDlc$dD" resolve="RuleBuilder.Rule" />
       </node>
       <node concept="3Tm1VV" id="7eGEHDlc$cm" role="1B3o_S" />
       <node concept="3clFbS" id="7eGEHDlc$cn" role="3clF47">
         <node concept="3cpWs8" id="7eGEHDlc$co" role="3cqZAp">
           <node concept="3cpWsn" id="7eGEHDlc$cp" role="3cpWs9">
             <property role="TrG5h" value="kind" />
-            <node concept="3uibUv" id="7eGEHDlc$cq" role="1tU5fm">
-              <ref role="3uigEE" to="rchb:7eGEHDlc$a2" resolve="Rule.Kind" />
+            <node concept="3uibUv" id="1HG00HG0Y0l" role="1tU5fm">
+              <ref role="3uigEE" to="av0y:~Rule$Kind" resolve="Rule.Kind" />
             </node>
           </node>
         </node>
@@ -899,8 +899,8 @@
             <node concept="3clFbF" id="7eGEHDlc$ct" role="3cqZAp">
               <node concept="37vLTI" id="7eGEHDlc$cu" role="3clFbG">
                 <node concept="Rm8GO" id="7eGEHDlc$cv" role="37vLTx">
-                  <ref role="1Px2BO" to="rchb:7eGEHDlc$a2" resolve="Rule.Kind" />
-                  <ref role="Rm8GQ" to="rchb:7eGEHDlc$a5" resolve="SIMPAGATION" />
+                  <ref role="1Px2BO" to="av0y:~Rule$Kind" resolve="Rule.Kind" />
+                  <ref role="Rm8GQ" to="av0y:~Rule$Kind.SIMPAGATION" resolve="SIMPAGATION" />
                 </node>
                 <node concept="37vLTw" id="7eGEHDlc$cw" role="37vLTJ">
                   <ref role="3cqZAo" node="7eGEHDlc$cp" resolve="kind" />
@@ -936,8 +936,8 @@
               <node concept="3clFbF" id="7eGEHDlc$cG" role="3cqZAp">
                 <node concept="37vLTI" id="7eGEHDlc$cH" role="3clFbG">
                   <node concept="Rm8GO" id="7eGEHDlc$cI" role="37vLTx">
-                    <ref role="1Px2BO" to="rchb:7eGEHDlc$a2" resolve="Rule.Kind" />
-                    <ref role="Rm8GQ" to="rchb:7eGEHDlc$a3" resolve="SIMPLIFICATION" />
+                    <ref role="1Px2BO" to="av0y:~Rule$Kind" resolve="Rule.Kind" />
+                    <ref role="Rm8GQ" to="av0y:~Rule$Kind.SIMPLIFICATION" resolve="SIMPLIFICATION" />
                   </node>
                   <node concept="37vLTw" id="7eGEHDlc$cJ" role="37vLTJ">
                     <ref role="3cqZAo" node="7eGEHDlc$cp" resolve="kind" />
@@ -975,8 +975,8 @@
                     <ref role="3cqZAo" node="7eGEHDlc$cp" resolve="kind" />
                   </node>
                   <node concept="Rm8GO" id="7eGEHDlc$cX" role="37vLTx">
-                    <ref role="1Px2BO" to="rchb:7eGEHDlc$a2" resolve="Rule.Kind" />
-                    <ref role="Rm8GQ" to="rchb:7eGEHDlc$a4" resolve="PROPAGATION" />
+                    <ref role="1Px2BO" to="av0y:~Rule$Kind" resolve="Rule.Kind" />
+                    <ref role="Rm8GQ" to="av0y:~Rule$Kind.PROPAGATION" resolve="PROPAGATION" />
                   </node>
                 </node>
               </node>
@@ -988,7 +988,7 @@
               <node concept="YS8fn" id="7eGEHDlc$d0" role="3cqZAp">
                 <node concept="2ShNRf" id="7eGEHDlc$d1" role="YScLw">
                   <node concept="1pGfFk" id="7eGEHDlc$d2" role="2ShVmc">
-                    <ref role="37wK5l" to="rchb:7Oc59RS$xFc" resolve="InvalidRuleException" />
+                    <ref role="37wK5l" to="av0y:~InvalidRuleException.&lt;init&gt;(java.lang.String)" resolve="InvalidRuleException" />
                     <node concept="3cpWs3" id="3KXGt7Wsf0I" role="37wK5m">
                       <node concept="1rXfSq" id="3KXGt7Wsf1V" role="3uHU7w">
                         <ref role="37wK5l" node="3KXGt7Wsam5" resolve="toString" />
@@ -1009,7 +1009,7 @@
             <node concept="YS8fn" id="7eGEHDlc$d7" role="3cqZAp">
               <node concept="2ShNRf" id="7eGEHDlc$d8" role="YScLw">
                 <node concept="1pGfFk" id="7eGEHDlc$d9" role="2ShVmc">
-                  <ref role="37wK5l" to="rchb:7Oc59RS$xFc" resolve="InvalidRuleException" />
+                  <ref role="37wK5l" to="av0y:~InvalidRuleException.&lt;init&gt;(java.lang.String)" resolve="InvalidRuleException" />
                   <node concept="3cpWs3" id="3KXGt7Wsf9r" role="37wK5m">
                     <node concept="1rXfSq" id="3KXGt7WsfaC" role="3uHU7w">
                       <ref role="37wK5l" node="3KXGt7Wsam5" resolve="toString" />
@@ -1101,7 +1101,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="7Oc59RS$GvZ" role="Sfmx6">
-        <ref role="3uigEE" to="rchb:7Oc59RS$wKP" resolve="InvalidRuleException" />
+        <ref role="3uigEE" to="av0y:~InvalidRuleException" resolve="InvalidRuleException" />
       </node>
     </node>
     <node concept="2tJIrI" id="3KXGt7Ws9oH" role="jymVt" />
@@ -1276,7 +1276,7 @@
                   <node concept="3uibUv" id="2_NfR5wnF2H" role="11_B2D">
                     <ref role="3uigEE" to="33ny:~List" resolve="List" />
                     <node concept="3uibUv" id="2_NfR5wnF2I" role="11_B2D">
-                      <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+                      <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
                     </node>
                   </node>
                 </node>
@@ -1305,7 +1305,7 @@
                             <node concept="1pGfFk" id="2_NfR5wocuI" role="2ShVmc">
                               <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
                               <node concept="3uibUv" id="2_NfR5wocuJ" role="1pMfVU">
-                                <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+                                <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
                               </node>
                               <node concept="3cmrfG" id="2_NfR5wocuK" role="37wK5m">
                                 <property role="3cmrfH" value="4" />
@@ -1441,8 +1441,8 @@
         </node>
         <node concept="37vLTG" id="7eGEHDlc$dP" role="3clF46">
           <property role="TrG5h" value="kind" />
-          <node concept="3uibUv" id="7eGEHDlc$dQ" role="1tU5fm">
-            <ref role="3uigEE" to="rchb:7eGEHDlc$a2" resolve="Rule.Kind" />
+          <node concept="3uibUv" id="1HG00HG0Y1y" role="1tU5fm">
+            <ref role="3uigEE" to="av0y:~Rule$Kind" resolve="Rule.Kind" />
           </node>
         </node>
       </node>
@@ -1478,8 +1478,8 @@
       <node concept="3clFb_" id="7eGEHDlc$dS" role="jymVt">
         <property role="TrG5h" value="kind" />
         <property role="1EzhhJ" value="false" />
-        <node concept="3uibUv" id="7eGEHDlc$dT" role="3clF45">
-          <ref role="3uigEE" to="rchb:7eGEHDlc$a2" resolve="Rule.Kind" />
+        <node concept="3uibUv" id="1HG00HG0Y1W" role="3clF45">
+          <ref role="3uigEE" to="av0y:~Rule$Kind" resolve="Rule.Kind" />
         </node>
         <node concept="3Tm1VV" id="7eGEHDlc$dU" role="1B3o_S" />
         <node concept="3clFbS" id="7eGEHDlc$dV" role="3clF47">
@@ -1517,8 +1517,8 @@
         <property role="1EzhhJ" value="false" />
         <node concept="3uibUv" id="7eGEHDlc$e2" role="3clF45">
           <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-          <node concept="3uibUv" id="5uFPQ7BHclK" role="11_B2D">
-            <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+          <node concept="3uibUv" id="1HG00HG1IaD" role="11_B2D">
+            <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
           </node>
         </node>
         <node concept="3Tm1VV" id="7eGEHDlc$e4" role="1B3o_S" />
@@ -1539,8 +1539,8 @@
         <property role="1EzhhJ" value="false" />
         <node concept="3uibUv" id="7eGEHDlc$ea" role="3clF45">
           <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-          <node concept="3uibUv" id="5uFPQ7BHcgS" role="11_B2D">
-            <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+          <node concept="3uibUv" id="1HG00HG1XKf" role="11_B2D">
+            <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
           </node>
         </node>
         <node concept="3Tm1VV" id="7eGEHDlc$ec" role="1B3o_S" />
@@ -1562,7 +1562,7 @@
         <node concept="3uibUv" id="7eGEHDlc$ei" role="3clF45">
           <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
           <node concept="3uibUv" id="5uFPQ7BHbBx" role="11_B2D">
-            <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+            <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
           </node>
         </node>
         <node concept="3Tm1VV" id="7eGEHDlc$ek" role="1B3o_S" />
@@ -1584,7 +1584,7 @@
         <node concept="3uibUv" id="7eGEHDlc$eq" role="3clF45">
           <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
           <node concept="3uibUv" id="5uFPQ7BHb5l" role="11_B2D">
-            <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+            <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
           </node>
         </node>
         <node concept="3Tm1VV" id="7eGEHDlc$es" role="1B3o_S" />
@@ -1611,7 +1611,7 @@
             <node concept="3uibUv" id="TYqmVPFYK7" role="3qUE_r">
               <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
               <node concept="3uibUv" id="TYqmVPFYL1" role="11_B2D">
-                <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+                <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
               </node>
             </node>
           </node>
@@ -1635,7 +1635,7 @@
         <node concept="3uibUv" id="7eGEHDlduu7" role="3clF45">
           <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
           <node concept="3uibUv" id="5uFPQ7BH6yV" role="11_B2D">
-            <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+            <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
           </node>
         </node>
         <node concept="3Tm1VV" id="7eGEHDlduu9" role="1B3o_S" />
@@ -1670,7 +1670,7 @@
         <node concept="3uibUv" id="2_NfR5wkFnH" role="3clF45">
           <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
           <node concept="3uibUv" id="2_NfR5wkFnI" role="11_B2D">
-            <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+            <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
           </node>
         </node>
         <node concept="3clFbS" id="2_NfR5wkFni" role="3clF47">
@@ -1680,14 +1680,14 @@
               <node concept="3uibUv" id="2_NfR5wkFnl" role="1tU5fm">
                 <ref role="3uigEE" to="33ny:~ArrayList" resolve="ArrayList" />
                 <node concept="3uibUv" id="2_NfR5wkFnm" role="11_B2D">
-                  <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+                  <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
                 </node>
               </node>
               <node concept="2ShNRf" id="2_NfR5wkFnn" role="33vP2m">
                 <node concept="1pGfFk" id="2_NfR5wkFno" role="2ShVmc">
                   <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
                   <node concept="3uibUv" id="2_NfR5wkFnp" role="1pMfVU">
-                    <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+                    <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
                   </node>
                 </node>
               </node>
@@ -1714,7 +1714,7 @@
               <node concept="3uibUv" id="2_NfR5wkFny" role="1tU5fm">
                 <ref role="3uigEE" to="33ny:~List" resolve="List" />
                 <node concept="3uibUv" id="2_NfR5wkFnz" role="11_B2D">
-                  <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+                  <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
                 </node>
               </node>
             </node>
@@ -1733,8 +1733,8 @@
       <node concept="312cEg" id="7eGEHDlc$ex" role="jymVt">
         <property role="TrG5h" value="kind" />
         <node concept="3Tm6S6" id="7eGEHDlc$ey" role="1B3o_S" />
-        <node concept="3uibUv" id="7eGEHDlc$ez" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:7eGEHDlc$a2" resolve="Rule.Kind" />
+        <node concept="3uibUv" id="1HG00HG0Y36" role="1tU5fm">
+          <ref role="3uigEE" to="av0y:~Rule$Kind" resolve="Rule.Kind" />
         </node>
       </node>
     </node>
@@ -1759,8 +1759,8 @@
       <node concept="3Tm6S6" id="7eGEHDlc$eA" role="1B3o_S" />
       <node concept="3uibUv" id="7eGEHDlc$eB" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3uibUv" id="5uFPQ7BH6Ap" role="11_B2D">
-          <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+        <node concept="3uibUv" id="1HG00HG1YdR" role="11_B2D">
+          <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
         </node>
       </node>
       <node concept="2ShNRf" id="7eGEHDlc$eD" role="33vP2m">
@@ -1769,8 +1769,8 @@
           <node concept="3cmrfG" id="7eGEHDlc$eF" role="37wK5m">
             <property role="3cmrfH" value="4" />
           </node>
-          <node concept="3uibUv" id="5uFPQ7BH8_o" role="1pMfVU">
-            <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+          <node concept="3uibUv" id="1HG00HG1ZPp" role="1pMfVU">
+            <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
           </node>
         </node>
       </node>
@@ -1780,8 +1780,8 @@
       <node concept="3Tm6S6" id="7eGEHDlc$eI" role="1B3o_S" />
       <node concept="3uibUv" id="7eGEHDlc$eJ" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3uibUv" id="5uFPQ7BH77Z" role="11_B2D">
-          <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+        <node concept="3uibUv" id="1HG00HG21te" role="11_B2D">
+          <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
         </node>
       </node>
       <node concept="2ShNRf" id="7eGEHDlc$eL" role="33vP2m">
@@ -1790,8 +1790,8 @@
           <node concept="3cmrfG" id="7eGEHDlc$eN" role="37wK5m">
             <property role="3cmrfH" value="4" />
           </node>
-          <node concept="3uibUv" id="5uFPQ7BH97J" role="1pMfVU">
-            <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+          <node concept="3uibUv" id="1HG00HG22UU" role="1pMfVU">
+            <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
           </node>
         </node>
       </node>
@@ -1802,7 +1802,7 @@
       <node concept="3uibUv" id="7eGEHDlc$eR" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3uibUv" id="5uFPQ7BH7BV" role="11_B2D">
-          <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+          <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
         </node>
       </node>
       <node concept="2ShNRf" id="7eGEHDlc$eT" role="33vP2m">
@@ -1812,7 +1812,7 @@
             <property role="3cmrfH" value="4" />
           </node>
           <node concept="3uibUv" id="5uFPQ7BH9Dn" role="1pMfVU">
-            <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+            <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
           </node>
         </node>
       </node>
@@ -1825,7 +1825,7 @@
         <node concept="3uibUv" id="2_NfR5wkbAi" role="11_B2D">
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
           <node concept="3uibUv" id="2_NfR5wkcfq" role="11_B2D">
-            <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+            <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
           </node>
         </node>
       </node>
@@ -1835,7 +1835,7 @@
           <node concept="3uibUv" id="2_NfR5wkjUe" role="1pMfVU">
             <ref role="3uigEE" to="33ny:~List" resolve="List" />
             <node concept="3uibUv" id="2_NfR5wkkDv" role="11_B2D">
-              <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+              <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
             </node>
           </node>
           <node concept="3cmrfG" id="2_NfR5wkrqS" role="37wK5m">
@@ -1854,7 +1854,7 @@
       <node concept="37vLTG" id="7HUwyZaPiEp" role="3clF46">
         <property role="TrG5h" value="logical" />
         <node concept="3uibUv" id="7HUwyZaPjnM" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
         </node>
       </node>
       <node concept="17QB3L" id="7HUwyZaPiEr" role="3clF45" />
@@ -1871,7 +1871,7 @@
                 <ref role="3cqZAo" node="7HUwyZaPiEp" resolve="logical" />
               </node>
               <node concept="liA8E" id="7HUwyZaPiEz" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:7HUwyZauJkq" resolve="name" />
+                <ref role="37wK5l" to="bj13:~MetaLogical.name():java.lang.String" resolve="name" />
               </node>
             </node>
           </node>
@@ -2129,14 +2129,14 @@
         </node>
       </node>
       <node concept="3uibUv" id="7nPD14NOCUy" role="3clF45">
-        <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+        <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
       </node>
       <node concept="3Tm1VV" id="7nPD14NOCTV" role="1B3o_S" />
       <node concept="3clFbS" id="7nPD14NOCTW" role="3clF47">
         <node concept="3clFbF" id="7nPD14NODrD" role="3cqZAp">
           <node concept="2ShNRf" id="7nPD14NODrB" role="3clFbG">
             <node concept="1pGfFk" id="7nPD14NOD$h" role="2ShVmc">
-              <ref role="37wK5l" to="45ys:7nPD14NON$C" resolve="MetaLogical" />
+              <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.String,java.lang.Class)" resolve="MetaLogical" />
               <node concept="37vLTw" id="7nPD14NOFsO" role="37wK5m">
                 <ref role="3cqZAo" node="7nPD14NODps" resolve="name" />
               </node>
@@ -2172,14 +2172,14 @@
         <node concept="10Oyi0" id="7nPD14NOISV" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="7nPD14NOIGv" role="3clF45">
-        <ref role="3uigEE" to="45ys:7HUwyZaNIC5" resolve="MultiMetaLogical" />
+        <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
       </node>
       <node concept="3Tm1VV" id="7nPD14NOIA0" role="1B3o_S" />
       <node concept="3clFbS" id="7nPD14NOIA1" role="3clF47">
         <node concept="3clFbF" id="7nPD14NOIA2" role="3cqZAp">
           <node concept="2ShNRf" id="7nPD14NOIA3" role="3clFbG">
             <node concept="1pGfFk" id="7nPD14NOIA4" role="2ShVmc">
-              <ref role="37wK5l" to="45ys:7nPD14NOOvW" resolve="MultiMetaLogical" />
+              <ref role="37wK5l" to="bj13:~MultiMetaLogical.&lt;init&gt;(java.lang.String,java.lang.Class,int)" resolve="MultiMetaLogical" />
               <node concept="37vLTw" id="7nPD14NOIA5" role="37wK5m">
                 <ref role="3cqZAo" node="7nPD14NOI_U" resolve="name" />
               </node>
@@ -2210,14 +2210,14 @@
         </node>
       </node>
       <node concept="3uibUv" id="7nPD14NOHH0" role="3clF45">
-        <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+        <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
       </node>
       <node concept="3Tm1VV" id="7nPD14NOHH1" role="1B3o_S" />
       <node concept="3clFbS" id="7nPD14NOHH2" role="3clF47">
         <node concept="3clFbF" id="7nPD14NOHH3" role="3cqZAp">
           <node concept="2ShNRf" id="7nPD14NOHH4" role="3clFbG">
             <node concept="1pGfFk" id="7nPD14NOHH5" role="2ShVmc">
-              <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
+              <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.Class)" resolve="MetaLogical" />
               <node concept="37vLTw" id="7nPD14NOHH7" role="37wK5m">
                 <ref role="3cqZAo" node="7nPD14NOHGX" resolve="type" />
               </node>
@@ -2254,7 +2254,7 @@
     <node concept="2tJIrI" id="7nPD14OaO2E" role="jymVt" />
     <node concept="3Tm1VV" id="7nPD14OaO1P" role="1B3o_S" />
     <node concept="3uibUv" id="7nPD14OaO2v" role="1zkMxy">
-      <ref role="3uigEE" to="rchb:7eGEHDlc$9y" resolve="Rule" />
+      <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
     </node>
   </node>
   <node concept="312cEu" id="4sSe4$oM01W">
@@ -2289,7 +2289,7 @@
       <node concept="3Tm6S6" id="4sSe4$oSjP3" role="1B3o_S" />
       <node concept="10Q1$e" id="4sSe4$oSjP4" role="1tU5fm">
         <node concept="3uibUv" id="4sSe4$oSjP5" role="10Q1$1">
-          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
           <node concept="3qTvmN" id="4sSe4$oSjP6" role="11_B2D" />
         </node>
       </node>
@@ -2301,7 +2301,7 @@
             </node>
           </node>
           <node concept="3uibUv" id="4sSe4$oSjPb" role="3$_nBY">
-            <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+            <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
             <node concept="3qTvmN" id="4sSe4$oSjPc" role="11_B2D" />
           </node>
         </node>
@@ -2312,7 +2312,7 @@
       <node concept="37vLTG" id="4sSe4$oM2rW" role="3clF46">
         <property role="TrG5h" value="symbol" />
         <node concept="3uibUv" id="4sSe4$oM2rX" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
         </node>
       </node>
       <node concept="3cqZAl" id="4sSe4$oM2rm" role="3clF45" />
@@ -2398,7 +2398,7 @@
         <property role="TrG5h" value="logicals" />
         <node concept="8X2XB" id="4sSe4$oM2wy" role="1tU5fm">
           <node concept="3uibUv" id="4sSe4$oM2vb" role="8Xvag">
-            <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+            <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
             <node concept="3qTvmN" id="4sSe4$oM2wb" role="11_B2D" />
           </node>
         </node>
@@ -2407,8 +2407,8 @@
     <node concept="2tJIrI" id="4sSe4$oM02l" role="jymVt" />
     <node concept="3clFb_" id="4sSe4$oM2zI" role="jymVt">
       <property role="TrG5h" value="toConstraint" />
-      <node concept="3uibUv" id="4sSe4$oM2A_" role="3clF45">
-        <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+      <node concept="3uibUv" id="1HG00HG1GZm" role="3clF45">
+        <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
       </node>
       <node concept="3Tm1VV" id="4sSe4$oM2zL" role="1B3o_S" />
       <node concept="3clFbS" id="4sSe4$oM2zM" role="3clF47">
@@ -2436,7 +2436,7 @@
       <property role="TrG5h" value="symbol" />
       <node concept="3Tm6S6" id="4sSe4$oM5Pt" role="1B3o_S" />
       <node concept="3uibUv" id="4sSe4$oM5Pv" role="1tU5fm">
-        <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+        <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
       </node>
     </node>
     <node concept="2tJIrI" id="4sSe4$oM5Zr" role="jymVt" />
@@ -2458,7 +2458,7 @@
       <node concept="3Tm6S6" id="4sSe4$oSgKR" role="1B3o_S" />
       <node concept="10Q1$e" id="4sSe4$oSgY0" role="1tU5fm">
         <node concept="3uibUv" id="4sSe4$oSgKU" role="10Q1$1">
-          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
           <node concept="3qTvmN" id="4sSe4$oSgKV" role="11_B2D" />
         </node>
       </node>
@@ -2498,7 +2498,7 @@
       <node concept="37vLTG" id="4sSe4$oM2B5" role="3clF46">
         <property role="TrG5h" value="symbol" />
         <node concept="3uibUv" id="4sSe4$oM2CN" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
         </node>
       </node>
       <node concept="3cqZAl" id="4sSe4$oM2B7" role="3clF45" />
@@ -2559,7 +2559,7 @@
     <node concept="3clFb_" id="4sSe4$oM2Bs" role="jymVt">
       <property role="TrG5h" value="toPredicate" />
       <node concept="3uibUv" id="4sSe4$oM4dc" role="3clF45">
-        <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+        <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
       </node>
       <node concept="3Tm1VV" id="4sSe4$oM2Bu" role="1B3o_S" />
       <node concept="3clFbS" id="4sSe4$oM2Bv" role="3clF47">
@@ -2571,7 +2571,7 @@
                   <ref role="37wK5l" to="cxk7:429xoyqax91" resolve="JavaPredicate" />
                   <node concept="10QFUN" id="429xoypW8pV" role="37wK5m">
                     <node concept="3uibUv" id="429xoypW8pT" role="10QFUM">
-                      <ref role="3uigEE" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+                      <ref role="3uigEE" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
                     </node>
                     <node concept="37vLTw" id="429xoypW8pU" role="10QFUP">
                       <ref role="3cqZAo" node="4sSe4$oM2YO" resolve="symbol" />
@@ -2586,7 +2586,7 @@
           </node>
           <node concept="2ZW3vV" id="429xoypW6HX" role="3clFbw">
             <node concept="3uibUv" id="429xoypW6Ld" role="2ZW6by">
-              <ref role="3uigEE" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+              <ref role="3uigEE" to="av0y:~JavaPredicateSymbol" resolve="JavaPredicateSymbol" />
             </node>
             <node concept="37vLTw" id="429xoypW6EG" role="2ZW6bz">
               <ref role="3cqZAo" node="4sSe4$oM2YO" resolve="symbol" />
@@ -2783,7 +2783,7 @@
       <property role="TrG5h" value="symbol" />
       <node concept="3Tm6S6" id="4sSe4$oM2YP" role="1B3o_S" />
       <node concept="3uibUv" id="4sSe4$oM2YR" role="1tU5fm">
-        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+        <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
       </node>
     </node>
     <node concept="2tJIrI" id="4sSe4$oMZ04" role="jymVt" />
@@ -2797,7 +2797,7 @@
         <property role="TrG5h" value="item" />
         <node concept="8X2XB" id="1hX44vNlAfY" role="1tU5fm">
           <node concept="3uibUv" id="1hX44vNlAeC" role="8Xvag">
-            <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+            <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
           </node>
         </node>
       </node>
@@ -2946,14 +2946,14 @@
       <node concept="3uibUv" id="1hX44vNl_s8" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3uibUv" id="1hX44vNl_su" role="11_B2D">
-          <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+          <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
         </node>
       </node>
       <node concept="2ShNRf" id="1hX44vNl_tC" role="33vP2m">
         <node concept="1pGfFk" id="1hX44vNl_Bu" role="2ShVmc">
           <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
           <node concept="3uibUv" id="1hX44vNlA3n" role="1pMfVU">
-            <ref role="3uigEE" to="rchb:5uFPQ7B$Pn9" resolve="AndItem" />
+            <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
           </node>
         </node>
       </node>
@@ -3570,7 +3570,7 @@
         <node concept="3Tqbb2" id="18kNIl0r2lo" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="18kNIl0Gtbu" role="3clF45">
-        <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+        <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
       </node>
       <node concept="3Tm1VV" id="18kNIl0r2jK" role="1B3o_S" />
       <node concept="3clFbS" id="18kNIl0r2jL" role="3clF47">
@@ -3615,7 +3615,7 @@
               <ref role="3cqZAo" node="18kNIl0GljU" resolve="myMultiMetaLogical" />
             </node>
             <node concept="liA8E" id="7HUwyZb22jL" role="2OqNvi">
-              <ref role="37wK5l" to="45ys:7HUwyZaNHY_" resolve="logicalAt" />
+              <ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int):jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="logicalAt" />
               <node concept="37vLTw" id="7HUwyZb22jM" role="37wK5m">
                 <ref role="3cqZAo" node="6f8YfqEw0O" resolve="idx" />
               </node>
@@ -3629,7 +3629,7 @@
       <property role="TrG5h" value="myMultiMetaLogical" />
       <node concept="3Tm6S6" id="18kNIl0GljS" role="1B3o_S" />
       <node concept="3uibUv" id="18kNIl0GljT" role="1tU5fm">
-        <ref role="3uigEE" to="45ys:7HUwyZaNIC5" resolve="MultiMetaLogical" />
+        <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
       </node>
     </node>
     <node concept="3Tm1VV" id="18kNIl0r2az" role="1B3o_S" />
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/template.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/template.mps
index cdb5cb86..da657423 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/template.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/template.mps
@@ -18,8 +18,8 @@
     <import index="ouhv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang.annotation(JDK/)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
-    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
+    <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="omn0" ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)" />
     <import index="nz6g" ref="r:ac00f724-30be-446e-805c-2345efc460d7(jetbrains.mps.lang.typesystem2.program)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
@@ -516,7 +516,7 @@
       <node concept="3clFbS" id="1ggxSI7z1S8" role="3clF47" />
       <node concept="3Tm1VV" id="1ggxSI7z1OS" role="1B3o_S" />
       <node concept="3uibUv" id="1ggxSI7z1Pj" role="3clF45">
-        <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+        <ref role="3uigEE" to="w7la:~Queryable" resolve="Queryable" />
       </node>
     </node>
     <node concept="2tJIrI" id="4OKkcnfu_xm" role="jymVt" />
@@ -530,11 +530,11 @@
       <property role="TrG5h" value="TYPEOF_SYM" />
       <node concept="3Tm1VV" id="5uFPQ7ClELk" role="1B3o_S" />
       <node concept="3uibUv" id="5uFPQ7CgjLN" role="1tU5fm">
-        <ref role="3uigEE" to="rchb:54i3FxcZHHF" resolve="ConstraintSymbol" />
+        <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
       </node>
       <node concept="2ShNRf" id="5uFPQ7CgjLO" role="33vP2m">
         <node concept="1pGfFk" id="5uFPQ7CgjLP" role="2ShVmc">
-          <ref role="37wK5l" to="rchb:54i3FxcZMv0" resolve="ConstraintSymbol" />
+          <ref role="37wK5l" to="av0y:~ConstraintSymbol.&lt;init&gt;(java.lang.String,int)" resolve="ConstraintSymbol" />
           <node concept="Xl_RD" id="5uFPQ7CgjLQ" role="37wK5m">
             <property role="Xl_RC" value="typeOf" />
           </node>
@@ -560,7 +560,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="5uFPQ7CgkmB" role="3clF45">
-        <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+        <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
       </node>
       <node concept="3Tm1VV" id="4OKkcnfu_$j" role="1B3o_S" />
       <node concept="3clFbS" id="4OKkcnfu_$k" role="3clF47">