diff --git a/build.xml b/build.xml
index 2d8acf77..ec730f91 100644
--- a/build.xml
+++ b/build.xml
@@ -752,6 +752,7 @@
           <module ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" kind="cl" />
           <module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" kind="cl" />
           <module ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" kind="cl" />
+          <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
@@ -2237,6 +2238,7 @@
           <module ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" kind="cl" />
           <module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" kind="cl" />
           <module ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" kind="cl" />
+          <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
@@ -4553,7 +4555,7 @@
     </copy>
   </target>
   
-  <target name="java.compile.java.modules.cycle.4" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.java.modules.cycle.4" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.logic, fetchDependencies">
     <mkdir dir="${build.tmp}/java.modules.cycle.4" />
     <javac destdir="${build.tmp}/java.modules.cycle.4" fork="true" encoding="utf8" nowarn="true" includeantruntime="false">
       <compilerarg value="-Xlint:none" />
@@ -4625,11 +4627,16 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-scripts-rt.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.annotation" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
       </classpath>
     </javac>
   </target>
@@ -5269,7 +5276,7 @@
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.coderules.ui" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.4, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.coderules.ui" depends="java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.4, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.coderules.ui" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.coderules.ui" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -5299,7 +5306,15 @@
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-scripts-rt.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
@@ -5324,9 +5339,18 @@
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/trove.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <pathelement path="${build.tmp}/java.modules.cycle.4" />
       </classpath>
     </javac>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 5a81c940..011a7240 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -2299,7 +2299,43 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4sSe4$oMppe" role="2OqNvi">
-                  <ref role="37wK5l" to="ugy2:4sSe4$oM2zI" resolve="toConstraint" />
+                  <ref role="37wK5l" to="ugy2:5Nh6YP1TW6Z" resolve="toConstraint" />
+                  <node concept="Xl_RD" id="5Nh6YP1VfgW" role="37wK5m">
+                    <property role="Xl_RC" value="unsigned" />
+                    <node concept="17Uvod" id="5Nh6YP1VfSd" role="lGtFl">
+                      <property role="2qtEX9" value="value" />
+                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                      <node concept="3zFVjK" id="5Nh6YP1VfSe" role="3zH0cK">
+                        <node concept="3clFbS" id="5Nh6YP1VfSf" role="2VODD2">
+                          <node concept="3clFbF" id="5Nh6YP1Vgpw" role="3cqZAp">
+                            <node concept="2OqwBi" id="5Nh6YP1VkFf" role="3clFbG">
+                              <node concept="2OqwBi" id="5Nh6YP1ViDK" role="2Oq$k0">
+                                <node concept="2OqwBi" id="5Nh6YP1VhRe" role="2Oq$k0">
+                                  <node concept="liA8E" id="5Nh6YP1ViqN" role="2OqNvi">
+                                    <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                  </node>
+                                  <node concept="2JrnkZ" id="5Nh6YP1VhRp" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="5Nh6YP1Vh1x" role="2JrQYb">
+                                      <node concept="1iwH7S" id="5Nh6YP1Vgpv" role="2Oq$k0" />
+                                      <node concept="12$id9" id="5Nh6YP1VhhT" role="2OqNvi">
+                                        <node concept="30H73N" id="5Nh6YP1Vhqe" role="12$y8L" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="5Nh6YP1VjFY" role="2OqNvi">
+                                  <ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId()" resolve="getNodeId" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="5Nh6YP1VlY$" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
                 <node concept="raruj" id="4sSe4$oMq3O" role="lGtFl" />
               </node>
@@ -2513,7 +2549,43 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4sSe4$p4QeE" role="2OqNvi">
-                  <ref role="37wK5l" to="ugy2:4sSe4$oM2zI" resolve="toConstraint" />
+                  <ref role="37wK5l" to="ugy2:5Nh6YP1TW6Z" resolve="toConstraint" />
+                  <node concept="Xl_RD" id="5Nh6YP1Vv$5" role="37wK5m">
+                    <property role="Xl_RC" value="unsigned" />
+                    <node concept="17Uvod" id="5Nh6YP1Vv$6" role="lGtFl">
+                      <property role="2qtEX9" value="value" />
+                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                      <node concept="3zFVjK" id="5Nh6YP1Vv$7" role="3zH0cK">
+                        <node concept="3clFbS" id="5Nh6YP1Vv$8" role="2VODD2">
+                          <node concept="3clFbF" id="5Nh6YP1Vv$9" role="3cqZAp">
+                            <node concept="2OqwBi" id="5Nh6YP1Vv$a" role="3clFbG">
+                              <node concept="2OqwBi" id="5Nh6YP1Vv$b" role="2Oq$k0">
+                                <node concept="2OqwBi" id="5Nh6YP1Vv$c" role="2Oq$k0">
+                                  <node concept="liA8E" id="5Nh6YP1Vv$d" role="2OqNvi">
+                                    <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                  </node>
+                                  <node concept="2JrnkZ" id="5Nh6YP1Vv$e" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="5Nh6YP1Vv$f" role="2JrQYb">
+                                      <node concept="1iwH7S" id="5Nh6YP1Vv$g" role="2Oq$k0" />
+                                      <node concept="12$id9" id="5Nh6YP1Vv$h" role="2OqNvi">
+                                        <node concept="30H73N" id="5Nh6YP1Vv$i" role="12$y8L" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="5Nh6YP1Vv$j" role="2OqNvi">
+                                  <ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId()" resolve="getNodeId" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="5Nh6YP1Vv$k" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
                 <node concept="raruj" id="4sSe4$p4QeF" role="lGtFl" />
               </node>
@@ -2615,7 +2687,43 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4sSe4$oNneG" role="2OqNvi">
-                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:5Nh6YP2eMER" resolve="toPredicate" />
+                  <node concept="Xl_RD" id="5Nh6YP2fC2Z" role="37wK5m">
+                    <property role="Xl_RC" value="" />
+                    <node concept="17Uvod" id="5Nh6YP2fCDe" role="lGtFl">
+                      <property role="2qtEX9" value="value" />
+                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                      <node concept="3zFVjK" id="5Nh6YP2fCDf" role="3zH0cK">
+                        <node concept="3clFbS" id="5Nh6YP2fCDg" role="2VODD2">
+                          <node concept="3clFbF" id="5Nh6YP2fCGj" role="3cqZAp">
+                            <node concept="2OqwBi" id="5Nh6YP2fGxb" role="3clFbG">
+                              <node concept="2OqwBi" id="5Nh6YP2fF$D" role="2Oq$k0">
+                                <node concept="2OqwBi" id="5Nh6YP2fF1K" role="2Oq$k0">
+                                  <node concept="2JrnkZ" id="5Nh6YP2fEJy" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="5Nh6YP2fDpu" role="2JrQYb">
+                                      <node concept="1iwH7S" id="5Nh6YP2fCGi" role="2Oq$k0" />
+                                      <node concept="12$id9" id="5Nh6YP2fEuo" role="2OqNvi">
+                                        <node concept="30H73N" id="5Nh6YP2fEzn" role="12$y8L" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="5Nh6YP2fFlF" role="2OqNvi">
+                                    <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="5Nh6YP2fG1D" role="2OqNvi">
+                                  <ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId()" resolve="getNodeId" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="5Nh6YP2fH2K" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
                 <node concept="raruj" id="4sSe4$oNrUd" role="lGtFl" />
               </node>
@@ -2681,7 +2789,43 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4boCUQu3b6k" role="2OqNvi">
-                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:5Nh6YP2eMER" resolve="toPredicate" />
+                  <node concept="Xl_RD" id="5Nh6YP2gu4S" role="37wK5m">
+                    <property role="Xl_RC" value="" />
+                    <node concept="17Uvod" id="5Nh6YP2gu4T" role="lGtFl">
+                      <property role="2qtEX9" value="value" />
+                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                      <node concept="3zFVjK" id="5Nh6YP2gu4U" role="3zH0cK">
+                        <node concept="3clFbS" id="5Nh6YP2gu4V" role="2VODD2">
+                          <node concept="3clFbF" id="5Nh6YP2gu4W" role="3cqZAp">
+                            <node concept="2OqwBi" id="5Nh6YP2gu4X" role="3clFbG">
+                              <node concept="2OqwBi" id="5Nh6YP2gu4Y" role="2Oq$k0">
+                                <node concept="2OqwBi" id="5Nh6YP2gu4Z" role="2Oq$k0">
+                                  <node concept="2JrnkZ" id="5Nh6YP2gu50" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="5Nh6YP2gu51" role="2JrQYb">
+                                      <node concept="1iwH7S" id="5Nh6YP2gu52" role="2Oq$k0" />
+                                      <node concept="12$id9" id="5Nh6YP2gu53" role="2OqNvi">
+                                        <node concept="30H73N" id="5Nh6YP2gu54" role="12$y8L" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="5Nh6YP2gu55" role="2OqNvi">
+                                    <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="5Nh6YP2gu56" role="2OqNvi">
+                                  <ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId()" resolve="getNodeId" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="5Nh6YP2gu57" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
                 <node concept="raruj" id="4boCUQu3b6l" role="lGtFl" />
               </node>
@@ -2747,7 +2891,43 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="1CcQBrQdWyx" role="2OqNvi">
-                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:5Nh6YP2eMER" resolve="toPredicate" />
+                  <node concept="Xl_RD" id="5Nh6YP2guoK" role="37wK5m">
+                    <property role="Xl_RC" value="" />
+                    <node concept="17Uvod" id="5Nh6YP2guoL" role="lGtFl">
+                      <property role="2qtEX9" value="value" />
+                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                      <node concept="3zFVjK" id="5Nh6YP2guoM" role="3zH0cK">
+                        <node concept="3clFbS" id="5Nh6YP2guoN" role="2VODD2">
+                          <node concept="3clFbF" id="5Nh6YP2guoO" role="3cqZAp">
+                            <node concept="2OqwBi" id="5Nh6YP2guoP" role="3clFbG">
+                              <node concept="2OqwBi" id="5Nh6YP2guoQ" role="2Oq$k0">
+                                <node concept="2OqwBi" id="5Nh6YP2guoR" role="2Oq$k0">
+                                  <node concept="2JrnkZ" id="5Nh6YP2guoS" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="5Nh6YP2guoT" role="2JrQYb">
+                                      <node concept="1iwH7S" id="5Nh6YP2guoU" role="2Oq$k0" />
+                                      <node concept="12$id9" id="5Nh6YP2guoV" role="2OqNvi">
+                                        <node concept="30H73N" id="5Nh6YP2guoW" role="12$y8L" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="5Nh6YP2guoX" role="2OqNvi">
+                                    <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="5Nh6YP2guoY" role="2OqNvi">
+                                  <ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId()" resolve="getNodeId" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="5Nh6YP2guoZ" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
                 <node concept="raruj" id="1CcQBrQdWyy" role="lGtFl" />
               </node>
@@ -2797,7 +2977,43 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4sSe4$oNudc" role="2OqNvi">
-                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:5Nh6YP2eMER" resolve="toPredicate" />
+                  <node concept="Xl_RD" id="5Nh6YP2gv2d" role="37wK5m">
+                    <property role="Xl_RC" value="" />
+                    <node concept="17Uvod" id="5Nh6YP2gv2e" role="lGtFl">
+                      <property role="2qtEX9" value="value" />
+                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                      <node concept="3zFVjK" id="5Nh6YP2gv2f" role="3zH0cK">
+                        <node concept="3clFbS" id="5Nh6YP2gv2g" role="2VODD2">
+                          <node concept="3clFbF" id="5Nh6YP2gv2h" role="3cqZAp">
+                            <node concept="2OqwBi" id="5Nh6YP2gv2i" role="3clFbG">
+                              <node concept="2OqwBi" id="5Nh6YP2gv2j" role="2Oq$k0">
+                                <node concept="2OqwBi" id="5Nh6YP2gv2k" role="2Oq$k0">
+                                  <node concept="2JrnkZ" id="5Nh6YP2gv2l" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="5Nh6YP2gv2m" role="2JrQYb">
+                                      <node concept="1iwH7S" id="5Nh6YP2gv2n" role="2Oq$k0" />
+                                      <node concept="12$id9" id="5Nh6YP2gv2o" role="2OqNvi">
+                                        <node concept="30H73N" id="5Nh6YP2gv2p" role="12$y8L" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="5Nh6YP2gv2q" role="2OqNvi">
+                                    <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="5Nh6YP2gv2r" role="2OqNvi">
+                                  <ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId()" resolve="getNodeId" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="5Nh6YP2gv2s" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
                 <node concept="raruj" id="4sSe4$oNudd" role="lGtFl" />
               </node>
@@ -2847,7 +3063,43 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4sSe4$oNxCl" role="2OqNvi">
-                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:5Nh6YP2eMER" resolve="toPredicate" />
+                  <node concept="Xl_RD" id="5Nh6YP2gvpr" role="37wK5m">
+                    <property role="Xl_RC" value="" />
+                    <node concept="17Uvod" id="5Nh6YP2gvps" role="lGtFl">
+                      <property role="2qtEX9" value="value" />
+                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                      <node concept="3zFVjK" id="5Nh6YP2gvpt" role="3zH0cK">
+                        <node concept="3clFbS" id="5Nh6YP2gvpu" role="2VODD2">
+                          <node concept="3clFbF" id="5Nh6YP2gvpv" role="3cqZAp">
+                            <node concept="2OqwBi" id="5Nh6YP2gvpw" role="3clFbG">
+                              <node concept="2OqwBi" id="5Nh6YP2gvpx" role="2Oq$k0">
+                                <node concept="2OqwBi" id="5Nh6YP2gvpy" role="2Oq$k0">
+                                  <node concept="2JrnkZ" id="5Nh6YP2gvpz" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="5Nh6YP2gvp$" role="2JrQYb">
+                                      <node concept="1iwH7S" id="5Nh6YP2gvp_" role="2Oq$k0" />
+                                      <node concept="12$id9" id="5Nh6YP2gvpA" role="2OqNvi">
+                                        <node concept="30H73N" id="5Nh6YP2gvpB" role="12$y8L" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="5Nh6YP2gvpC" role="2OqNvi">
+                                    <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="5Nh6YP2gvpD" role="2OqNvi">
+                                  <ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId()" resolve="getNodeId" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="5Nh6YP2gvpE" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
                 <node concept="raruj" id="4sSe4$oNxCm" role="lGtFl" />
               </node>
@@ -2897,7 +3149,43 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="7lmP5gAmseb" role="2OqNvi">
-                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:5Nh6YP2eMER" resolve="toPredicate" />
+                  <node concept="Xl_RD" id="5Nh6YP2gvLy" role="37wK5m">
+                    <property role="Xl_RC" value="" />
+                    <node concept="17Uvod" id="5Nh6YP2gvLz" role="lGtFl">
+                      <property role="2qtEX9" value="value" />
+                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                      <node concept="3zFVjK" id="5Nh6YP2gvL$" role="3zH0cK">
+                        <node concept="3clFbS" id="5Nh6YP2gvL_" role="2VODD2">
+                          <node concept="3clFbF" id="5Nh6YP2gvLA" role="3cqZAp">
+                            <node concept="2OqwBi" id="5Nh6YP2gvLB" role="3clFbG">
+                              <node concept="2OqwBi" id="5Nh6YP2gvLC" role="2Oq$k0">
+                                <node concept="2OqwBi" id="5Nh6YP2gvLD" role="2Oq$k0">
+                                  <node concept="2JrnkZ" id="5Nh6YP2gvLE" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="5Nh6YP2gvLF" role="2JrQYb">
+                                      <node concept="1iwH7S" id="5Nh6YP2gvLG" role="2Oq$k0" />
+                                      <node concept="12$id9" id="5Nh6YP2gvLH" role="2OqNvi">
+                                        <node concept="30H73N" id="5Nh6YP2gvLI" role="12$y8L" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="5Nh6YP2gvLJ" role="2OqNvi">
+                                    <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="5Nh6YP2gvLK" role="2OqNvi">
+                                  <ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId()" resolve="getNodeId" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="5Nh6YP2gvLL" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
                 <node concept="raruj" id="7lmP5gAmsec" role="lGtFl" />
               </node>
@@ -2947,7 +3235,43 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="7lmP5gAmvA5" role="2OqNvi">
-                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:5Nh6YP2eMER" resolve="toPredicate" />
+                  <node concept="Xl_RD" id="5Nh6YP2gwbK" role="37wK5m">
+                    <property role="Xl_RC" value="" />
+                    <node concept="17Uvod" id="5Nh6YP2gwbL" role="lGtFl">
+                      <property role="2qtEX9" value="value" />
+                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                      <node concept="3zFVjK" id="5Nh6YP2gwbM" role="3zH0cK">
+                        <node concept="3clFbS" id="5Nh6YP2gwbN" role="2VODD2">
+                          <node concept="3clFbF" id="5Nh6YP2gwbO" role="3cqZAp">
+                            <node concept="2OqwBi" id="5Nh6YP2gwbP" role="3clFbG">
+                              <node concept="2OqwBi" id="5Nh6YP2gwbQ" role="2Oq$k0">
+                                <node concept="2OqwBi" id="5Nh6YP2gwbR" role="2Oq$k0">
+                                  <node concept="2JrnkZ" id="5Nh6YP2gwbS" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="5Nh6YP2gwbT" role="2JrQYb">
+                                      <node concept="1iwH7S" id="5Nh6YP2gwbU" role="2Oq$k0" />
+                                      <node concept="12$id9" id="5Nh6YP2gwbV" role="2OqNvi">
+                                        <node concept="30H73N" id="5Nh6YP2gwbW" role="12$y8L" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="5Nh6YP2gwbX" role="2OqNvi">
+                                    <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="5Nh6YP2gwbY" role="2OqNvi">
+                                  <ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId()" resolve="getNodeId" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="5Nh6YP2gwbZ" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
                 <node concept="raruj" id="7lmP5gAmvA6" role="lGtFl" />
               </node>
@@ -3026,7 +3350,43 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5WBVN_M3sEE" role="2OqNvi">
-                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:5Nh6YP2eMER" resolve="toPredicate" />
+                  <node concept="Xl_RD" id="5Nh6YP2gwTg" role="37wK5m">
+                    <property role="Xl_RC" value="" />
+                    <node concept="17Uvod" id="5Nh6YP2gwTh" role="lGtFl">
+                      <property role="2qtEX9" value="value" />
+                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                      <node concept="3zFVjK" id="5Nh6YP2gwTi" role="3zH0cK">
+                        <node concept="3clFbS" id="5Nh6YP2gwTj" role="2VODD2">
+                          <node concept="3clFbF" id="5Nh6YP2gwTk" role="3cqZAp">
+                            <node concept="2OqwBi" id="5Nh6YP2gwTl" role="3clFbG">
+                              <node concept="2OqwBi" id="5Nh6YP2gwTm" role="2Oq$k0">
+                                <node concept="2OqwBi" id="5Nh6YP2gwTn" role="2Oq$k0">
+                                  <node concept="2JrnkZ" id="5Nh6YP2gwTo" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="5Nh6YP2gwTp" role="2JrQYb">
+                                      <node concept="1iwH7S" id="5Nh6YP2gwTq" role="2Oq$k0" />
+                                      <node concept="12$id9" id="5Nh6YP2gwTr" role="2OqNvi">
+                                        <node concept="30H73N" id="5Nh6YP2gwTs" role="12$y8L" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="5Nh6YP2gwTt" role="2OqNvi">
+                                    <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="5Nh6YP2gwTu" role="2OqNvi">
+                                  <ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId()" resolve="getNodeId" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="5Nh6YP2gwTv" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
                 <node concept="raruj" id="5WBVN_M3sEF" role="lGtFl" />
               </node>
@@ -3170,7 +3530,43 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="1laj_RThtfz" role="2OqNvi">
-                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:5Nh6YP2eMER" resolve="toPredicate" />
+                  <node concept="Xl_RD" id="5Nh6YP2gxgh" role="37wK5m">
+                    <property role="Xl_RC" value="" />
+                    <node concept="17Uvod" id="5Nh6YP2gxgi" role="lGtFl">
+                      <property role="2qtEX9" value="value" />
+                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                      <node concept="3zFVjK" id="5Nh6YP2gxgj" role="3zH0cK">
+                        <node concept="3clFbS" id="5Nh6YP2gxgk" role="2VODD2">
+                          <node concept="3clFbF" id="5Nh6YP2gxgl" role="3cqZAp">
+                            <node concept="2OqwBi" id="5Nh6YP2gxgm" role="3clFbG">
+                              <node concept="2OqwBi" id="5Nh6YP2gxgn" role="2Oq$k0">
+                                <node concept="2OqwBi" id="5Nh6YP2gxgo" role="2Oq$k0">
+                                  <node concept="2JrnkZ" id="5Nh6YP2gxgp" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="5Nh6YP2gxgq" role="2JrQYb">
+                                      <node concept="1iwH7S" id="5Nh6YP2gxgr" role="2Oq$k0" />
+                                      <node concept="12$id9" id="5Nh6YP2gxgs" role="2OqNvi">
+                                        <node concept="30H73N" id="5Nh6YP2gxgt" role="12$y8L" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="5Nh6YP2gxgu" role="2OqNvi">
+                                    <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="5Nh6YP2gxgv" role="2OqNvi">
+                                  <ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId()" resolve="getNodeId" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="5Nh6YP2gxgw" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
                 <node concept="raruj" id="1laj_RThtf$" role="lGtFl" />
               </node>
@@ -3209,7 +3605,43 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4jcOV4hEQkr" role="2OqNvi">
-                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:5Nh6YP2eMER" resolve="toPredicate" />
+                  <node concept="Xl_RD" id="5Nh6YP2gymZ" role="37wK5m">
+                    <property role="Xl_RC" value="" />
+                    <node concept="17Uvod" id="5Nh6YP2gyn0" role="lGtFl">
+                      <property role="2qtEX9" value="value" />
+                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                      <node concept="3zFVjK" id="5Nh6YP2gyn1" role="3zH0cK">
+                        <node concept="3clFbS" id="5Nh6YP2gyn2" role="2VODD2">
+                          <node concept="3clFbF" id="5Nh6YP2gyn3" role="3cqZAp">
+                            <node concept="2OqwBi" id="5Nh6YP2gyn4" role="3clFbG">
+                              <node concept="2OqwBi" id="5Nh6YP2gyn5" role="2Oq$k0">
+                                <node concept="2OqwBi" id="5Nh6YP2gyn6" role="2Oq$k0">
+                                  <node concept="2JrnkZ" id="5Nh6YP2gyn7" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="5Nh6YP2gyn8" role="2JrQYb">
+                                      <node concept="1iwH7S" id="5Nh6YP2gyn9" role="2Oq$k0" />
+                                      <node concept="12$id9" id="5Nh6YP2gyna" role="2OqNvi">
+                                        <node concept="30H73N" id="5Nh6YP2gynb" role="12$y8L" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="5Nh6YP2gync" role="2OqNvi">
+                                    <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="5Nh6YP2gynd" role="2OqNvi">
+                                  <ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId()" resolve="getNodeId" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="5Nh6YP2gyne" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
                 <node concept="raruj" id="4jcOV4hEQks" role="lGtFl" />
               </node>
@@ -13007,6 +13439,41 @@
                     <property role="2bfB8j" value="true" />
                     <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                     <ref role="1Y3XeK" node="2J$kxDHVq4U" resolve="Token.ConstraintRule" />
+                    <node concept="2YIFZM" id="5Nh6YP0ygNu" role="37wK5m">
+                      <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
+                      <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
+                      <node concept="Xl_RD" id="5Nh6YP0ygNv" role="37wK5m">
+                        <property role="Xl_RC" value="" />
+                        <node concept="17Uvod" id="5Nh6YP0ygNw" role="lGtFl">
+                          <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                          <property role="2qtEX9" value="value" />
+                          <node concept="3zFVjK" id="5Nh6YP0ygNx" role="3zH0cK">
+                            <node concept="3clFbS" id="5Nh6YP0ygNy" role="2VODD2">
+                              <node concept="3clFbF" id="5Nh6YP0ygNz" role="3cqZAp">
+                                <node concept="2OqwBi" id="5Nh6YP0ygN$" role="3clFbG">
+                                  <node concept="2OqwBi" id="5Nh6YP0ygN_" role="2Oq$k0">
+                                    <node concept="2JrnkZ" id="5Nh6YP0ygNA" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="5Nh6YP0ygNB" role="2JrQYb">
+                                        <node concept="1iwH7S" id="5Nh6YP0ygNC" role="2Oq$k0" />
+                                        <node concept="12$id9" id="5Nh6YP0ygND" role="2OqNvi">
+                                          <node concept="30H73N" id="5Nh6YP0ygNE" role="12$y8L" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="liA8E" id="5Nh6YP0ygNF" role="2OqNvi">
+                                      <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="5Nh6YP0ygNG" role="2OqNvi">
+                                    <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                     <node concept="3Tm1VV" id="36tQV5AxJxH" role="1B3o_S" />
                     <node concept="3clFb_" id="36tQV5AxhPU" role="jymVt">
                       <property role="1EzhhJ" value="false" />
@@ -13088,7 +13555,7 @@
                                   </node>
                                 </node>
                                 <node concept="1rXfSq" id="6R6MIbTNlX8" role="37wK5m">
-                                  <ref role="37wK5l" to="ugy2:62MNP_kY8lD" resolve="getTemplateRef" />
+                                  <ref role="37wK5l" to="ugy2:5Nh6YP0xTiB" resolve="getCRTemplateRef" />
                                 </node>
                                 <node concept="10Nm6u" id="aZPZmIa3_t" role="37wK5m">
                                   <node concept="1sPUBX" id="aZPZmIa3Tl" role="lGtFl">
@@ -13644,6 +14111,25 @@
         <property role="1sVAO0" value="true" />
         <property role="2bfB8j" value="true" />
         <node concept="2tJIrI" id="2J$kxDHVqu$" role="jymVt" />
+        <node concept="3clFbW" id="5Nh6YP0xO$N" role="jymVt">
+          <node concept="37vLTG" id="5Nh6YP0xRt$" role="3clF46">
+            <property role="TrG5h" value="templateRef" />
+            <node concept="3uibUv" id="5Nh6YP0xRt_" role="1tU5fm">
+              <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+            </node>
+          </node>
+          <node concept="3cqZAl" id="5Nh6YP0xO$P" role="3clF45" />
+          <node concept="3Tm1VV" id="5Nh6YP0xO$Q" role="1B3o_S" />
+          <node concept="3clFbS" id="5Nh6YP0xO$R" role="3clF47">
+            <node concept="XkiVB" id="5Nh6YP0xVsX" role="3cqZAp">
+              <ref role="37wK5l" to="ugy2:5Nh6YP0xR9y" resolve="AbstractConstraitRuleTemplate" />
+              <node concept="37vLTw" id="5Nh6YP0xVxo" role="37wK5m">
+                <ref role="3cqZAo" node="5Nh6YP0xRt$" resolve="templateRef" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2tJIrI" id="5Nh6YP0xOte" role="jymVt" />
         <node concept="3clFb_" id="2J$kxDHVqPZ" role="jymVt">
           <property role="TrG5h" value="rule" />
           <node concept="3uibUv" id="2J$kxDHVqSM" role="3clF45">
@@ -13663,7 +14149,7 @@
         <node concept="3uibUv" id="2J$kxDHVqq9" role="EKbjA">
           <ref role="3uigEE" to="ugy2:36tQV5AurZW" resolve="ConstraintRuleTemplate" />
         </node>
-        <node concept="2tJIrI" id="2J$kxDHVqCo" role="jymVt" />
+        <node concept="2tJIrI" id="5Nh6YP0wU0t" role="jymVt" />
         <node concept="312cEg" id="2J$kxDHW1_A" role="jymVt">
           <property role="TrG5h" value="logical" />
           <node concept="3uibUv" id="2J$kxDHW1_B" role="1tU5fm">
@@ -13789,6 +14275,9 @@
             </node>
           </node>
         </node>
+        <node concept="3uibUv" id="5Nh6YP0xVb1" role="1zkMxy">
+          <ref role="3uigEE" to="ugy2:5Nh6YP0xR6H" resolve="AbstractConstraitRuleTemplate" />
+        </node>
       </node>
       <node concept="2tJIrI" id="2J$kxDHVq3F" role="jymVt" />
       <node concept="3Tm1VV" id="2J$kxDHVpwA" role="1B3o_S" />
@@ -14352,7 +14841,7 @@
                   </node>
                   <node concept="2ShNRf" id="5itBwM5S4x1" role="33vP2m">
                     <node concept="1pGfFk" id="5itBwM5S4x2" role="2ShVmc">
-                      <ref role="37wK5l" to="ugy2:5yr01fE1Jnt" resolve="RuleBuilder" />
+                      <ref role="37wK5l" to="ugy2:5Nh6YP2ayz0" />
                       <node concept="37vLTw" id="5itBwM5Srje" role="37wK5m">
                         <ref role="3cqZAo" node="5itBwM5SoMw" resolve="session" />
                       </node>
@@ -14375,6 +14864,41 @@
                           </node>
                         </node>
                       </node>
+                      <node concept="2YIFZM" id="5Nh6YP2b2DH" role="37wK5m">
+                        <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
+                        <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
+                        <node concept="Xl_RD" id="5Nh6YP2b4Pu" role="37wK5m">
+                          <property role="Xl_RC" value="" />
+                          <node concept="17Uvod" id="5Nh6YP2bfu1" role="lGtFl">
+                            <property role="2qtEX9" value="value" />
+                            <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                            <node concept="3zFVjK" id="5Nh6YP2bfu2" role="3zH0cK">
+                              <node concept="3clFbS" id="5Nh6YP2bfu3" role="2VODD2">
+                                <node concept="3clFbF" id="5Nh6YP2bhSy" role="3cqZAp">
+                                  <node concept="2OqwBi" id="5Nh6YP2bhSz" role="3clFbG">
+                                    <node concept="2OqwBi" id="5Nh6YP2bhS$" role="2Oq$k0">
+                                      <node concept="2JrnkZ" id="5Nh6YP2bhS_" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="5Nh6YP2bhSA" role="2JrQYb">
+                                          <node concept="1iwH7S" id="5Nh6YP2bhSB" role="2Oq$k0" />
+                                          <node concept="12$id9" id="5Nh6YP2bhSC" role="2OqNvi">
+                                            <node concept="30H73N" id="5Nh6YP2bhSD" role="12$y8L" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="liA8E" id="5Nh6YP2bhSE" role="2OqNvi">
+                                        <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                      </node>
+                                    </node>
+                                    <node concept="liA8E" id="5Nh6YP2bhSF" role="2OqNvi">
+                                      <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
                   <node concept="2ZBi8u" id="5itBwM5S4xc" role="lGtFl">
@@ -15234,7 +15758,7 @@
                   </node>
                   <node concept="2ShNRf" id="5itBwM6VIna" role="33vP2m">
                     <node concept="1pGfFk" id="5itBwM6VInb" role="2ShVmc">
-                      <ref role="37wK5l" to="ugy2:5yr01fE1Jnt" resolve="RuleBuilder" />
+                      <ref role="37wK5l" to="ugy2:5Nh6YP2ayz0" />
                       <node concept="37vLTw" id="5itBwM6XZAl" role="37wK5m">
                         <ref role="3cqZAo" node="5itBwM6XBHK" resolve="session" />
                       </node>
@@ -15257,6 +15781,41 @@
                           </node>
                         </node>
                       </node>
+                      <node concept="2YIFZM" id="5Nh6YP2bHGM" role="37wK5m">
+                        <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
+                        <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
+                        <node concept="Xl_RD" id="5Nh6YP2bHGN" role="37wK5m">
+                          <property role="Xl_RC" value="" />
+                          <node concept="17Uvod" id="5Nh6YP2bHGO" role="lGtFl">
+                            <property role="2qtEX9" value="value" />
+                            <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                            <node concept="3zFVjK" id="5Nh6YP2bHGP" role="3zH0cK">
+                              <node concept="3clFbS" id="5Nh6YP2bHGQ" role="2VODD2">
+                                <node concept="3clFbF" id="5Nh6YP2bHGR" role="3cqZAp">
+                                  <node concept="2OqwBi" id="5Nh6YP2bHGS" role="3clFbG">
+                                    <node concept="2OqwBi" id="5Nh6YP2bHGT" role="2Oq$k0">
+                                      <node concept="2JrnkZ" id="5Nh6YP2bHGU" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="5Nh6YP2bHGV" role="2JrQYb">
+                                          <node concept="1iwH7S" id="5Nh6YP2bHGW" role="2Oq$k0" />
+                                          <node concept="12$id9" id="5Nh6YP2bHGX" role="2OqNvi">
+                                            <node concept="30H73N" id="5Nh6YP2bHGY" role="12$y8L" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="liA8E" id="5Nh6YP2bHGZ" role="2OqNvi">
+                                        <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                      </node>
+                                    </node>
+                                    <node concept="liA8E" id="5Nh6YP2bHH0" role="2OqNvi">
+                                      <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
                   <node concept="2ZBi8u" id="5itBwM6VInl" role="lGtFl">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index bdf753e3..4607f642 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -1003,6 +1003,19 @@
         </node>
       </node>
     </node>
+    <node concept="13i0hz" id="5Nh6YP12WKP" role="13h7CS">
+      <property role="TrG5h" value="getPresentation" />
+      <ref role="13i0hy" to="tpcu:hEwIMiw" resolve="getPresentation" />
+      <node concept="3Tm1VV" id="5Nh6YP12WLg" role="1B3o_S" />
+      <node concept="3clFbS" id="5Nh6YP12WLh" role="3clF47">
+        <node concept="3clFbF" id="5Nh6YP131HI" role="3cqZAp">
+          <node concept="BsUDl" id="5Nh6YP131HH" role="3clFbG">
+            <ref role="37wK5l" node="1vsv9tPo5GP" resolve="baseName" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="5Nh6YP12WLi" role="3clF45" />
+    </node>
     <node concept="13i0hz" id="1vsv9tPo6DN" role="13h7CS">
       <property role="TrG5h" value="ruleTemplate" />
       <node concept="3Tm6S6" id="1vsv9tPo7B8" role="1B3o_S" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps
index 68b4bb38..9c3408bc 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps
@@ -23,6 +23,7 @@
     <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
     <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
     <import index="uwx2" ref="r:76101703-3fc5-4e76-aa48-9728dde91f7b(jetbrains.mps.logic.unification)" />
+    <import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -140,6 +141,9 @@
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
+      <concept id="4269842503726207156" name="jetbrains.mps.baseLanguage.structure.LongLiteral" flags="nn" index="1adDum">
+        <property id="4269842503726207157" name="value" index="1adDun" />
+      </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" />
@@ -178,6 +182,7 @@
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
+      <concept id="1068581242867" name="jetbrains.mps.baseLanguage.structure.LongType" flags="in" index="3cpWsb" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1206060495898" name="jetbrains.mps.baseLanguage.structure.ElsifClause" flags="ng" index="3eNFk2">
@@ -357,6 +362,89 @@
       </node>
     </node>
     <node concept="2tJIrI" id="6Kcfpq7B1eT" role="jymVt" />
+    <node concept="3clFb_" id="5Nh6YP298OX" role="jymVt">
+      <property role="TrG5h" value="setCRTemplateRef" />
+      <node concept="3clFbS" id="5Nh6YP298OY" role="3clF47">
+        <node concept="3clFbF" id="5Nh6YP29t0p" role="3cqZAp">
+          <node concept="37vLTI" id="5Nh6YP29t0r" role="3clFbG">
+            <node concept="2OqwBi" id="5Nh6YP29vc3" role="37vLTJ">
+              <node concept="Xjq3P" id="5Nh6YP29wgp" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5Nh6YP29vc6" role="2OqNvi">
+                <ref role="2Oxat5" node="5Nh6YP29t0l" resolve="templateRef" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="5Nh6YP29t0v" role="37vLTx">
+              <ref role="3cqZAo" node="5Nh6YP29blq" resolve="ref" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="5Nh6YP298OV" role="3clF45" />
+      <node concept="3Tm1VV" id="5Nh6YP298OW" role="1B3o_S" />
+      <node concept="37vLTG" id="5Nh6YP29blq" role="3clF46">
+        <property role="TrG5h" value="ref" />
+        <node concept="3uibUv" id="5Nh6YP29blp" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5Nh6YP29$CD" role="jymVt" />
+    <node concept="3clFb_" id="5Nh6YP29Bcl" role="jymVt">
+      <property role="TrG5h" value="getCRTemplateRef" />
+      <node concept="3uibUv" id="5Nh6YP29P0x" role="3clF45">
+        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      </node>
+      <node concept="3Tm1VV" id="5Nh6YP29Bco" role="1B3o_S" />
+      <node concept="3clFbS" id="5Nh6YP29Bcp" role="3clF47">
+        <node concept="3clFbF" id="5Nh6YP29MFm" role="3cqZAp">
+          <node concept="37vLTw" id="5Nh6YP29MFl" role="3clFbG">
+            <ref role="3cqZAo" node="5Nh6YP29t0l" resolve="templateRef" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5Nh6YP29NFH" role="jymVt" />
+    <node concept="3clFb_" id="5Nh6YP1TXyg" role="jymVt">
+      <property role="TrG5h" value="setNodeId" />
+      <node concept="37vLTG" id="5Nh6YP1U1c3" role="3clF46">
+        <property role="TrG5h" value="nodeId" />
+        <node concept="3cpWsb" id="5Nh6YP1U2ba" role="1tU5fm" />
+      </node>
+      <node concept="3clFbS" id="5Nh6YP1TXyh" role="3clF47">
+        <node concept="3clFbF" id="5Nh6YP1U2pR" role="3cqZAp">
+          <node concept="37vLTI" id="5Nh6YP1U2pT" role="3clFbG">
+            <node concept="2OqwBi" id="5Nh6YP1U5ga" role="37vLTJ">
+              <node concept="Xjq3P" id="5Nh6YP1U6dE" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5Nh6YP1U5gd" role="2OqNvi">
+                <ref role="2Oxat5" node="5Nh6YP1U2pN" resolve="nodeId" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="5Nh6YP1U2pX" role="37vLTx">
+              <ref role="3cqZAo" node="5Nh6YP1U1c3" resolve="nodeId" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="5Nh6YP1TXye" role="3clF45" />
+      <node concept="3Tm1VV" id="5Nh6YP1TXyf" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="5Nh6YP1Uin7" role="jymVt" />
+    <node concept="3clFb_" id="5Nh6YP1UdP7" role="jymVt">
+      <property role="TrG5h" value="getNodeId" />
+      <node concept="3clFbS" id="5Nh6YP1UdPa" role="3clF47">
+        <node concept="3clFbF" id="5Nh6YP1UdPb" role="3cqZAp">
+          <node concept="2OqwBi" id="5Nh6YP1UdPd" role="3clFbG">
+            <node concept="Xjq3P" id="5Nh6YP1UdPe" role="2Oq$k0" />
+            <node concept="2OwXpG" id="5Nh6YP1UdPf" role="2OqNvi">
+              <ref role="2Oxat5" node="5Nh6YP1U2pN" resolve="nodeId" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cpWsb" id="5Nh6YP1UjCi" role="3clF45" />
+      <node concept="3Tm1VV" id="5Nh6YP1UdPi" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="5Nh6YP2eTZ6" role="jymVt" />
     <node concept="3Tm1VV" id="6Kcfpq7B0Wv" role="1B3o_S" />
     <node concept="3clFb_" id="5uFPQ7BZhBG" role="jymVt">
       <property role="1EzhhJ" value="false" />
@@ -629,6 +717,21 @@
         </node>
       </node>
     </node>
+    <node concept="312cEg" id="5Nh6YP1U2pN" role="jymVt">
+      <property role="TrG5h" value="nodeId" />
+      <node concept="3Tm6S6" id="5Nh6YP1U2pO" role="1B3o_S" />
+      <node concept="3cpWsb" id="5Nh6YP1U2pQ" role="1tU5fm" />
+      <node concept="1adDum" id="5Nh6YP1UcOD" role="33vP2m">
+        <property role="1adDun" value="-1L" />
+      </node>
+    </node>
+    <node concept="312cEg" id="5Nh6YP29t0l" role="jymVt">
+      <property role="TrG5h" value="templateRef" />
+      <node concept="3Tm6S6" id="5Nh6YP29t0m" role="1B3o_S" />
+      <node concept="3uibUv" id="5Nh6YP29t0o" role="1tU5fm">
+        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="2GO7tyJVmP4">
     <property role="TrG5h" value="UnificationPredicate" />
@@ -9149,7 +9252,7 @@
               </node>
               <node concept="2YIFZM" id="4jcOV4hxADP" role="33vP2m">
                 <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(char[])" resolve="valueOf" />
                 <node concept="2OqwBi" id="4jcOV4hx_1A" role="37wK5m">
                   <node concept="2OqwBi" id="4jcOV4hx_1B" role="2Oq$k0">
                     <node concept="37vLTw" id="4jcOV4hx_1C" role="2Oq$k0">
@@ -9177,7 +9280,7 @@
               </node>
               <node concept="2YIFZM" id="1laj_RS1ySy" role="33vP2m">
                 <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(char[])" resolve="valueOf" />
                 <node concept="2OqwBi" id="1laj_RS1ySz" role="37wK5m">
                   <node concept="2OqwBi" id="1laj_RS1yS$" role="2Oq$k0">
                     <node concept="37vLTw" id="1laj_RS1yS_" role="2Oq$k0">
@@ -9750,7 +9853,7 @@
               </node>
               <node concept="2YIFZM" id="4jcOV4hENEO" role="33vP2m">
                 <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(char[])" resolve="valueOf" />
                 <node concept="2OqwBi" id="4jcOV4hENEP" role="37wK5m">
                   <node concept="2OqwBi" id="4jcOV4hENEQ" role="2Oq$k0">
                     <node concept="37vLTw" id="4jcOV4hENER" role="2Oq$k0">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps
index 20379f1d..61745ba1 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps
@@ -168,6 +168,9 @@
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
+      <concept id="4269842503726207156" name="jetbrains.mps.baseLanguage.structure.LongLiteral" flags="nn" index="1adDum">
+        <property id="4269842503726207157" name="value" index="1adDun" />
+      </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" />
@@ -207,6 +210,7 @@
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
+      <concept id="1068581242867" name="jetbrains.mps.baseLanguage.structure.LongType" flags="in" index="3cpWsb" />
       <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
@@ -332,6 +336,7 @@
       <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="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
@@ -1352,6 +1357,89 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5uFPQ7BZto4" role="jymVt" />
+    <node concept="3clFb_" id="5Nh6YP298OX" role="jymVt">
+      <property role="TrG5h" value="setCRTemplateRef" />
+      <node concept="3clFbS" id="5Nh6YP298OY" role="3clF47">
+        <node concept="3clFbF" id="5Nh6YP29t0p" role="3cqZAp">
+          <node concept="37vLTI" id="5Nh6YP29t0r" role="3clFbG">
+            <node concept="2OqwBi" id="5Nh6YP29vc3" role="37vLTJ">
+              <node concept="Xjq3P" id="5Nh6YP29wgp" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5Nh6YP29vc6" role="2OqNvi">
+                <ref role="2Oxat5" node="5Nh6YP29t0l" resolve="myRef" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="5Nh6YP29t0v" role="37vLTx">
+              <ref role="3cqZAo" node="5Nh6YP29blq" resolve="ref" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="5Nh6YP298OV" role="3clF45" />
+      <node concept="3Tm1VV" id="5Nh6YP298OW" role="1B3o_S" />
+      <node concept="37vLTG" id="5Nh6YP29blq" role="3clF46">
+        <property role="TrG5h" value="ref" />
+        <node concept="3uibUv" id="5Nh6YP29blp" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5Nh6YP29$CD" role="jymVt" />
+    <node concept="3clFb_" id="5Nh6YP29Bcl" role="jymVt">
+      <property role="TrG5h" value="getCRTemplateRef" />
+      <node concept="3uibUv" id="5Nh6YP29P0x" role="3clF45">
+        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      </node>
+      <node concept="3Tm1VV" id="5Nh6YP29Bco" role="1B3o_S" />
+      <node concept="3clFbS" id="5Nh6YP29Bcp" role="3clF47">
+        <node concept="3clFbF" id="5Nh6YP29MFm" role="3cqZAp">
+          <node concept="37vLTw" id="5Nh6YP29MFl" role="3clFbG">
+            <ref role="3cqZAo" node="5Nh6YP29t0l" resolve="templateRef" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5Nh6YP29NFH" role="jymVt" />
+    <node concept="3clFb_" id="5Nh6YP1TXyg" role="jymVt">
+      <property role="TrG5h" value="setNodeId" />
+      <node concept="37vLTG" id="5Nh6YP1U1c3" role="3clF46">
+        <property role="TrG5h" value="nodeId" />
+        <node concept="3cpWsb" id="5Nh6YP1U2ba" role="1tU5fm" />
+      </node>
+      <node concept="3clFbS" id="5Nh6YP1TXyh" role="3clF47">
+        <node concept="3clFbF" id="5Nh6YP1U2pR" role="3cqZAp">
+          <node concept="37vLTI" id="5Nh6YP1U2pT" role="3clFbG">
+            <node concept="2OqwBi" id="5Nh6YP1U5ga" role="37vLTJ">
+              <node concept="Xjq3P" id="5Nh6YP1U6dE" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5Nh6YP1U5gd" role="2OqNvi">
+                <ref role="2Oxat5" node="5Nh6YP1U2pN" resolve="myNodeId" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="5Nh6YP1U2pX" role="37vLTx">
+              <ref role="3cqZAo" node="5Nh6YP1U1c3" resolve="nodeId" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="5Nh6YP1TXye" role="3clF45" />
+      <node concept="3Tm1VV" id="5Nh6YP1TXyf" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="5Nh6YP1Uin7" role="jymVt" />
+    <node concept="3clFb_" id="5Nh6YP1UdP7" role="jymVt">
+      <property role="TrG5h" value="getNodeId" />
+      <node concept="3clFbS" id="5Nh6YP1UdPa" role="3clF47">
+        <node concept="3clFbF" id="5Nh6YP1UdPb" role="3cqZAp">
+          <node concept="2OqwBi" id="5Nh6YP1UdPd" role="3clFbG">
+            <node concept="Xjq3P" id="5Nh6YP1UdPe" role="2Oq$k0" />
+            <node concept="2OwXpG" id="5Nh6YP1UdPf" role="2OqNvi">
+              <ref role="2Oxat5" node="5Nh6YP1U2pN" resolve="nodeId" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cpWsb" id="5Nh6YP1UjCi" role="3clF45" />
+      <node concept="3Tm1VV" id="5Nh6YP1UdPi" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="5Nh6YP1TZWk" role="jymVt" />
     <node concept="3clFb_" id="5uFPQ7BZsCD" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="symbol" />
@@ -1825,7 +1913,29 @@
         </node>
       </node>
     </node>
+    <node concept="312cEg" id="5Nh6YP1U2pN" role="jymVt">
+      <property role="TrG5h" value="nodeId" />
+      <node concept="3Tm6S6" id="5Nh6YP1U2pO" role="1B3o_S" />
+      <node concept="3cpWsb" id="5Nh6YP1U2pQ" role="1tU5fm" />
+      <node concept="1adDum" id="5Nh6YP1UcOD" role="33vP2m">
+        <property role="1adDun" value="-1L" />
+      </node>
+    </node>
+    <node concept="312cEg" id="5Nh6YP29t0l" role="jymVt">
+      <property role="TrG5h" value="templateRef" />
+      <node concept="3Tm6S6" id="5Nh6YP29t0m" role="1B3o_S" />
+      <node concept="3uibUv" id="5Nh6YP29t0o" role="1tU5fm">
+        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="4sSe4$oTqqS" role="jymVt" />
+    <node concept="3UR2Jj" id="5Nh6YP1b21d" role="lGtFl">
+      <node concept="TZ5HA" id="5Nh6YP1b21e" role="TZ5H$">
+        <node concept="1dT_AC" id="5Nh6YP1b21f" role="1dT_Ay">
+          <property role="1dT_AB" value="FIXME: rename to &quot;user constraint&quot;" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="3HP615" id="5WBVN_M1BKE">
     <property role="TrG5h" value="LateExpression" />
@@ -3789,6 +3899,46 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="5Nh6YP2aIir" role="jymVt" />
+    <node concept="3clFbW" id="5Nh6YP2ayz0" role="jymVt">
+      <node concept="37vLTG" id="5Nh6YP2ayz1" role="3clF46">
+        <property role="TrG5h" value="session" />
+        <node concept="3uibUv" id="5Nh6YP2ayz2" role="1tU5fm">
+          <ref role="3uigEE" node="18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5Nh6YP2ayz3" role="3clF46">
+        <property role="TrG5h" value="basetag" />
+        <node concept="17QB3L" id="5Nh6YP2ayz4" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="5Nh6YP2aOuU" role="3clF46">
+        <property role="TrG5h" value="templateRef" />
+        <node concept="3uibUv" id="5Nh6YP2aOGF" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="5Nh6YP2ayz5" role="3clF45" />
+      <node concept="3Tm1VV" id="5Nh6YP2ayz6" role="1B3o_S" />
+      <node concept="3clFbS" id="5Nh6YP2ayz7" role="3clF47">
+        <node concept="1VxSAg" id="5Nh6YP2ayz8" role="3cqZAp">
+          <ref role="37wK5l" node="7nPD14OeqYJ" resolve="RuleBuilder" />
+          <node concept="37vLTw" id="5Nh6YP2ayz9" role="37wK5m">
+            <ref role="3cqZAo" node="5Nh6YP2ayz1" resolve="session" />
+          </node>
+          <node concept="37vLTw" id="5Nh6YP2ayza" role="37wK5m">
+            <ref role="3cqZAo" node="5Nh6YP2ayz3" resolve="basetag" />
+          </node>
+          <node concept="37vLTw" id="5Nh6YP2ayzb" role="37wK5m">
+            <ref role="3cqZAo" node="5Nh6YP2ayz3" resolve="basetag" />
+          </node>
+          <node concept="37vLTw" id="5Nh6YP2aOPT" role="37wK5m">
+            <ref role="3cqZAo" node="5Nh6YP2aOuU" resolve="templateRef" />
+          </node>
+          <node concept="10Nm6u" id="5Nh6YP2ayzd" role="37wK5m" />
+          <node concept="10Nm6u" id="5Nh6YP2ayze" role="37wK5m" />
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="5yr01fE1Cbl" role="jymVt" />
     <node concept="3clFbW" id="7nPD14OeqYJ" role="jymVt">
       <node concept="37vLTG" id="5yr01fE1yBz" role="3clF46">
@@ -4159,6 +4309,83 @@
                 </node>
               </node>
             </node>
+            <node concept="3SKdUt" id="5Nh6YP2mcs3" role="3cqZAp">
+              <node concept="1PaTwC" id="5Nh6YP2mcs4" role="1aUNEU">
+                <node concept="3oM_SD" id="5Nh6YP2mcs5" role="1PaTwD">
+                  <property role="3oM_SC" value="FIXME" />
+                </node>
+                <node concept="3oM_SD" id="5Nh6YP2mjNT" role="1PaTwD">
+                  <property role="3oM_SC" value="extract" />
+                </node>
+                <node concept="3oM_SD" id="5Nh6YP2mjOb" role="1PaTwD">
+                  <property role="3oM_SC" value="interface" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="5Nh6YP28ruN" role="3cqZAp">
+              <node concept="3clFbS" id="5Nh6YP28ruP" role="3clFbx">
+                <node concept="3clFbF" id="5Nh6YP28I7C" role="3cqZAp">
+                  <node concept="2OqwBi" id="5Nh6YP28WIv" role="3clFbG">
+                    <node concept="1eOMI4" id="5Nh6YP28I7_" role="2Oq$k0">
+                      <node concept="10QFUN" id="5Nh6YP28I7y" role="1eOMHV">
+                        <node concept="3uibUv" id="5Nh6YP28I7B" role="10QFUM">
+                          <ref role="3uigEE" node="5uFPQ7BZsAX" resolve="AbstractConstraint" />
+                        </node>
+                        <node concept="37vLTw" id="5Nh6YP28LU3" role="10QFUP">
+                          <ref role="3cqZAo" node="5yr01fEdktL" resolve="it" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="5Nh6YP298OZ" role="2OqNvi">
+                      <ref role="37wK5l" node="5Nh6YP298OX" resolve="setCRTemplateRef" />
+                      <node concept="37vLTw" id="5Nh6YP2aaji" role="37wK5m">
+                        <ref role="3cqZAo" node="7nPD14Ob4vA" resolve="templateRef" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2ZW3vV" id="5Nh6YP28zl1" role="3clFbw">
+                <node concept="3uibUv" id="5Nh6YP28DCd" role="2ZW6by">
+                  <ref role="3uigEE" node="5uFPQ7BZsAX" resolve="AbstractConstraint" />
+                </node>
+                <node concept="37vLTw" id="5Nh6YP28vp7" role="2ZW6bz">
+                  <ref role="3cqZAo" node="5yr01fEdktL" resolve="it" />
+                </node>
+              </node>
+              <node concept="3eNFk2" id="5Nh6YP2la4G" role="3eNLev">
+                <node concept="2ZW3vV" id="5Nh6YP2lpQj" role="3eO9$A">
+                  <node concept="3uibUv" id="5Nh6YP2lw8U" role="2ZW6by">
+                    <ref role="3uigEE" to="tpfl:6Kcfpq7B0Wu" resolve="AbstractPredicate" />
+                  </node>
+                  <node concept="37vLTw" id="5Nh6YP2ljwP" role="2ZW6bz">
+                    <ref role="3cqZAo" node="5yr01fEdktL" resolve="it" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="5Nh6YP2la4I" role="3eOfB_">
+                  <node concept="3clFbF" id="5Nh6YP2l$vM" role="3cqZAp">
+                    <node concept="2OqwBi" id="5Nh6YP2l$vN" role="3clFbG">
+                      <node concept="1eOMI4" id="5Nh6YP2l$vO" role="2Oq$k0">
+                        <node concept="10QFUN" id="5Nh6YP2l$vP" role="1eOMHV">
+                          <node concept="3uibUv" id="5Nh6YP2l$vQ" role="10QFUM">
+                            <ref role="3uigEE" to="tpfl:6Kcfpq7B0Wu" resolve="AbstractPredicate" />
+                          </node>
+                          <node concept="37vLTw" id="5Nh6YP2l$vR" role="10QFUP">
+                            <ref role="3cqZAo" node="5yr01fEdktL" resolve="it" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="5Nh6YP2l$vS" role="2OqNvi">
+                        <ref role="37wK5l" to="tpfl:5Nh6YP298OX" resolve="setCRTemplateRef" />
+                        <node concept="37vLTw" id="5Nh6YP2l$vT" role="37wK5m">
+                          <ref role="3cqZAo" node="7nPD14Ob4vA" resolve="templateRef" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
           <node concept="3cpWsn" id="7eGEHDlc$aK" role="1Duv9x">
             <property role="TrG5h" value="i" />
@@ -6909,6 +7136,96 @@
       </node>
     </node>
     <node concept="2tJIrI" id="4sSe4$oM2Bw" role="jymVt" />
+    <node concept="3clFb_" id="5Nh6YP2eMER" role="jymVt">
+      <property role="TrG5h" value="toPredicate" />
+      <node concept="37vLTG" id="5Nh6YP2eNT7" role="3clF46">
+        <property role="TrG5h" value="nodeId" />
+        <node concept="17QB3L" id="5Nh6YP2fJRy" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="5Nh6YP2eMES" role="3clF45">
+        <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
+      </node>
+      <node concept="3Tm1VV" id="5Nh6YP2eMET" role="1B3o_S" />
+      <node concept="3clFbS" id="5Nh6YP2eMEU" role="3clF47">
+        <node concept="3clFbJ" id="5Nh6YP2eMEV" role="3cqZAp">
+          <node concept="3clFbS" id="5Nh6YP2eMEW" role="3clFbx">
+            <node concept="3cpWs8" id="5Nh6YP2eOz9" role="3cqZAp">
+              <node concept="3cpWsn" id="5Nh6YP2eOza" role="3cpWs9">
+                <property role="TrG5h" value="predicate" />
+                <node concept="3uibUv" id="5Nh6YP2eNYi" role="1tU5fm">
+                  <ref role="3uigEE" to="tpfl:6Kcfpq7B0Wu" resolve="AbstractPredicate" />
+                </node>
+                <node concept="2OqwBi" id="5Nh6YP2eOzb" role="33vP2m">
+                  <node concept="1eOMI4" id="5Nh6YP2eOzc" role="2Oq$k0">
+                    <node concept="10QFUN" id="5Nh6YP2eOzd" role="1eOMHV">
+                      <node concept="3uibUv" id="5Nh6YP2eOze" role="10QFUM">
+                        <ref role="3uigEE" to="tpfl:7lt0LtQvaw_" resolve="PredicateSymbolExt" />
+                      </node>
+                      <node concept="37vLTw" id="5Nh6YP2eOzf" role="10QFUP">
+                        <ref role="3cqZAo" node="4sSe4$oM2YO" resolve="symbol" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="5Nh6YP2eOzg" role="2OqNvi">
+                    <ref role="37wK5l" to="tpfl:7lt0LtQvpyU" resolve="predicate" />
+                    <node concept="37vLTw" id="5Nh6YP2eOzh" role="37wK5m">
+                      <ref role="3cqZAo" node="4sSe4$oM2EL" resolve="args" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="5Nh6YP2ePPJ" role="3cqZAp">
+              <node concept="2OqwBi" id="5Nh6YP2eQM9" role="3clFbG">
+                <node concept="37vLTw" id="5Nh6YP2ePPH" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5Nh6YP2eOza" resolve="predicate" />
+                </node>
+                <node concept="liA8E" id="5Nh6YP2ffpY" role="2OqNvi">
+                  <ref role="37wK5l" to="tpfl:5Nh6YP1TXyg" resolve="setNodeId" />
+                  <node concept="2YIFZM" id="5Nh6YP2fHY9" role="37wK5m">
+                    <ref role="37wK5l" to="wyt6:~Long.parseUnsignedLong(java.lang.String)" resolve="parseUnsignedLong" />
+                    <ref role="1Pybhc" to="wyt6:~Long" resolve="Long" />
+                    <node concept="37vLTw" id="5Nh6YP2fHYa" role="37wK5m">
+                      <ref role="3cqZAo" node="5Nh6YP2eNT7" resolve="nodeId" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs6" id="5Nh6YP2eMEX" role="3cqZAp">
+              <node concept="37vLTw" id="5Nh6YP2eOzi" role="3cqZAk">
+                <ref role="3cqZAo" node="5Nh6YP2eOza" resolve="predicate" />
+              </node>
+            </node>
+          </node>
+          <node concept="2ZW3vV" id="5Nh6YP2eMF5" role="3clFbw">
+            <node concept="3uibUv" id="5Nh6YP2eMF6" role="2ZW6by">
+              <ref role="3uigEE" to="tpfl:7lt0LtQvaw_" resolve="PredicateSymbolExt" />
+            </node>
+            <node concept="37vLTw" id="5Nh6YP2eMF7" role="2ZW6bz">
+              <ref role="3cqZAo" node="4sSe4$oM2YO" resolve="symbol" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="5Nh6YP2eMF8" role="3cqZAp" />
+        <node concept="YS8fn" id="5Nh6YP2eMF9" role="3cqZAp">
+          <node concept="2ShNRf" id="5Nh6YP2eMFa" role="YScLw">
+            <node concept="1pGfFk" id="5Nh6YP2eMFb" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
+              <node concept="3cpWs3" id="5Nh6YP2eMFc" role="37wK5m">
+                <node concept="37vLTw" id="5Nh6YP2eMFd" role="3uHU7w">
+                  <ref role="3cqZAo" node="4sSe4$oM2YO" resolve="symbol" />
+                </node>
+                <node concept="Xl_RD" id="5Nh6YP2eMFe" role="3uHU7B">
+                  <property role="Xl_RC" value="unknown predicate symbol: " />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5Nh6YP2eMEQ" role="jymVt" />
     <node concept="3Tm1VV" id="4sSe4$oM2Bx" role="1B3o_S" />
     <node concept="312cEg" id="4sSe4$oM2EL" role="jymVt">
       <property role="TrG5h" value="args" />
@@ -7107,6 +7424,64 @@
       </node>
     </node>
     <node concept="2tJIrI" id="4sSe4$oM2yz" role="jymVt" />
+    <node concept="3clFb_" id="5Nh6YP1TW6Z" role="jymVt">
+      <property role="TrG5h" value="toConstraint" />
+      <node concept="37vLTG" id="5Nh6YP1TWg9" role="3clF46">
+        <property role="TrG5h" value="nodeId" />
+        <node concept="17QB3L" id="5Nh6YP1V8bk" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="5Nh6YP1TW70" role="3clF45">
+        <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
+      </node>
+      <node concept="3Tm1VV" id="5Nh6YP1TW71" role="1B3o_S" />
+      <node concept="3clFbS" id="5Nh6YP1TW72" role="3clF47">
+        <node concept="3cpWs8" id="5Nh6YP1TWre" role="3cqZAp">
+          <node concept="3cpWsn" id="5Nh6YP1TWrf" role="3cpWs9">
+            <property role="TrG5h" value="constraint" />
+            <node concept="3uibUv" id="5Nh6YP1TWlx" role="1tU5fm">
+              <ref role="3uigEE" node="5uFPQ7BZsAX" resolve="AbstractConstraint" />
+            </node>
+            <node concept="2ShNRf" id="5Nh6YP1TWrg" role="33vP2m">
+              <node concept="1pGfFk" id="5Nh6YP1TWrh" role="2ShVmc">
+                <ref role="37wK5l" node="5uFPQ7BZtsU" resolve="AbstractConstraint" />
+                <node concept="37vLTw" id="5Nh6YP1TWri" role="37wK5m">
+                  <ref role="3cqZAo" node="4sSe4$oM5Ps" resolve="symbol" />
+                </node>
+                <node concept="37vLTw" id="5Nh6YP1TWrj" role="37wK5m">
+                  <ref role="3cqZAo" node="4sSe4$oM5S_" resolve="args" />
+                </node>
+                <node concept="37vLTw" id="5Nh6YP1TWrk" role="37wK5m">
+                  <ref role="3cqZAo" node="4sSe4$oSgKQ" resolve="logicals" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5Nh6YP1TW73" role="3cqZAp">
+          <node concept="2OqwBi" id="5Nh6YP1TWMJ" role="3clFbG">
+            <node concept="37vLTw" id="5Nh6YP1TWrl" role="2Oq$k0">
+              <ref role="3cqZAo" node="5Nh6YP1TWrf" resolve="constraint" />
+            </node>
+            <node concept="liA8E" id="5Nh6YP1TXyi" role="2OqNvi">
+              <ref role="37wK5l" node="5Nh6YP1TXyg" resolve="setNodeId" />
+              <node concept="2YIFZM" id="5Nh6YP1V96V" role="37wK5m">
+                <ref role="37wK5l" to="wyt6:~Long.parseUnsignedLong(java.lang.String)" resolve="parseUnsignedLong" />
+                <ref role="1Pybhc" to="wyt6:~Long" resolve="Long" />
+                <node concept="37vLTw" id="5Nh6YP1V9j5" role="37wK5m">
+                  <ref role="3cqZAo" node="5Nh6YP1TWg9" resolve="nodeId" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5Nh6YP1UstF" role="3cqZAp">
+          <node concept="37vLTw" id="5Nh6YP1UstD" role="3clFbG">
+            <ref role="3cqZAo" node="5Nh6YP1TWrf" resolve="constraint" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5Nh6YP1TW6Y" role="jymVt" />
     <node concept="3Tm1VV" id="4sSe4$oM01X" role="1B3o_S" />
     <node concept="312cEg" id="4sSe4$oM5Ps" role="jymVt">
       <property role="TrG5h" value="symbol" />
@@ -9342,5 +9717,66 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="5Nh6YP0xR6H">
+    <property role="3GE5qa" value="rule" />
+    <property role="TrG5h" value="AbstractConstraitRuleTemplate" />
+    <property role="1sVAO0" value="true" />
+    <node concept="2tJIrI" id="5Nh6YP0xR92" role="jymVt" />
+    <node concept="3clFbW" id="5Nh6YP0xR9y" role="jymVt">
+      <node concept="37vLTG" id="5Nh6YP0xRt$" role="3clF46">
+        <property role="TrG5h" value="templateRef" />
+        <node concept="3uibUv" id="5Nh6YP0xRt_" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="5Nh6YP0xR9$" role="3clF45" />
+      <node concept="3Tm1VV" id="5Nh6YP0xR9_" role="1B3o_S" />
+      <node concept="3clFbS" id="5Nh6YP0xR9A" role="3clF47">
+        <node concept="3clFbF" id="5Nh6YP0xRv5" role="3cqZAp">
+          <node concept="37vLTI" id="5Nh6YP0xRv7" role="3clFbG">
+            <node concept="2OqwBi" id="5Nh6YP0xTmB" role="37vLTJ">
+              <node concept="Xjq3P" id="5Nh6YP0xTo9" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5Nh6YP0xTmE" role="2OqNvi">
+                <ref role="2Oxat5" node="5Nh6YP0xRv1" resolve="templateRef" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="5Nh6YP0xRvb" role="37vLTx">
+              <ref role="3cqZAo" node="5Nh6YP0xRt$" resolve="templateRef" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5Nh6YP0xR$2" role="jymVt" />
+    <node concept="3clFb_" id="5Nh6YP0xTiB" role="jymVt">
+      <property role="TrG5h" value="getCRTemplateRef" />
+      <node concept="3uibUv" id="5Nh6YP0xTiC" role="3clF45">
+        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      </node>
+      <node concept="3Tm1VV" id="5Nh6YP0xTiD" role="1B3o_S" />
+      <node concept="3clFbS" id="5Nh6YP0xTiE" role="3clF47">
+        <node concept="3clFbF" id="5Nh6YP0xTiF" role="3cqZAp">
+          <node concept="37vLTw" id="5Nh6YP0xTiG" role="3clFbG">
+            <ref role="3cqZAo" node="5Nh6YP0xRv1" resolve="templateRef" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5Nh6YP0xTiI" role="jymVt" />
+    <node concept="2tJIrI" id="5Nh6YP0xR$3" role="jymVt" />
+    <node concept="312cEg" id="5Nh6YP0xRv1" role="jymVt">
+      <property role="TrG5h" value="templateRef" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm6S6" id="5Nh6YP0xRv2" role="1B3o_S" />
+      <node concept="3uibUv" id="5Nh6YP0xRv4" role="1tU5fm">
+        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5Nh6YP0xRyn" role="jymVt" />
+    <node concept="3Tm1VV" id="5Nh6YP0xR6I" role="1B3o_S" />
+    <node concept="3uibUv" id="5Nh6YP0xR8t" role="EKbjA">
+      <ref role="3uigEE" node="36tQV5AurZW" resolve="ConstraintRuleTemplate" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
index 89d41b9a..d6661b97 100644
--- a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
@@ -2755,6 +2755,11 @@
             <ref role="3bR37D" node="74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Nh6YP1t04N" role="3bR37C">
+          <node concept="3bR9La" id="5Nh6YP1t04O" role="1SiIV1">
+            <ref role="3bR37D" node="7BVjoXzUx6U" resolve="jetbrains.mps.lang.coderules" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="7BVjoXzUx6U" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd b/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
index c60879ba..ab18c4fa 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
@@ -21,6 +21,7 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
+    <dependency reexport="false">c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -49,10 +50,24 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+    <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
     <module reference="4d5d9aa1-7b71-4888-9100-1b793e5328a6(jetbrains.mps.coderules.ui)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
+    <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
+    <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+    <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" 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" />
     <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index 21ce5230..995a44c3 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -106,6 +106,8 @@
     <import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
     <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
     <import index="uwx2" ref="r:76101703-3fc5-4e76-aa48-9728dde91f7b(jetbrains.mps.logic.unification)" />
+    <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" />
+    <import index="tpfl" ref="r:97d6f79f-4a27-4a9b-9122-9bccfb5317c9(jetbrains.mps.lang.coderules.predicate)" />
     <import index="2sud" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.treeStructure(MPS.IDEA/)" implicit="true" />
     <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
   </imports>
@@ -385,6 +387,7 @@
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
+      <concept id="1068581242867" name="jetbrains.mps.baseLanguage.structure.LongType" flags="in" index="3cpWsb" />
       <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
@@ -21278,7 +21281,787 @@
           </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="5Nh6YP1baCg" role="jymVt" />
+      <node concept="3clFb_" id="5Nh6YP1baA9" role="jymVt">
+        <property role="TrG5h" value="forInvocation" />
+        <node concept="37vLTG" id="5Nh6YP1baAa" role="3clF46">
+          <property role="TrG5h" value="inv" />
+          <node concept="3uibUv" id="5Nh6YP1baAb" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="5Nh6YP1baAg" role="3clF45">
+          <ref role="3uigEE" node="5pDu2jaXzDG" resolve="TableCellInfo" />
+        </node>
+        <node concept="3Tm1VV" id="5Nh6YP1baAh" role="1B3o_S" />
+        <node concept="3clFbS" id="5Nh6YP1baAi" role="3clF47">
+          <node concept="3cpWs8" id="5Nh6YP1baAp" role="3cqZAp">
+            <node concept="3cpWsn" id="5Nh6YP1baAq" role="3cpWs9">
+              <property role="TrG5h" value="crTemplateRef" />
+              <node concept="3uibUv" id="5Nh6YP1baAr" role="1tU5fm">
+                <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+              </node>
+              <node concept="2OqwBi" id="5Nh6YP2dp8e" role="33vP2m">
+                <node concept="1eOMI4" id="5Nh6YP2djbC" role="2Oq$k0">
+                  <node concept="10QFUN" id="5Nh6YP2djbB" role="1eOMHV">
+                    <node concept="2OqwBi" id="5Nh6YP2djb$" role="10QFUP">
+                      <node concept="37vLTw" id="5Nh6YP2djb_" role="2Oq$k0">
+                        <ref role="3cqZAo" node="5Nh6YP1baAa" resolve="occ" />
+                      </node>
+                      <node concept="liA8E" id="5Nh6YP2djbA" role="2OqNvi">
+                        <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate()" resolve="predicate" />
+                      </node>
+                    </node>
+                    <node concept="3uibUv" id="5Nh6YP2dmpc" role="10QFUM">
+                      <ref role="3uigEE" to="tpfl:6Kcfpq7B0Wu" resolve="AbstractPredicate" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="5Nh6YP1baAu" role="2OqNvi">
+                  <ref role="37wK5l" to="tpfl:5Nh6YP29Bcl" resolve="getCRTemplateRef" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="5Nh6YP24ypg" role="3cqZAp">
+            <node concept="3cpWsn" id="5Nh6YP24yph" role="3cpWs9">
+              <property role="TrG5h" value="symbol" />
+              <node concept="3uibUv" id="5Nh6YP24wxy" role="1tU5fm">
+                <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
+              </node>
+              <node concept="2OqwBi" id="5Nh6YP24ypi" role="33vP2m">
+                <node concept="2OqwBi" id="5Nh6YP24ypj" role="2Oq$k0">
+                  <node concept="37vLTw" id="5Nh6YP24ypk" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5Nh6YP1baAa" resolve="occ" />
+                  </node>
+                  <node concept="liA8E" id="5Nh6YP24ypl" role="2OqNvi">
+                    <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate()" resolve="predicate" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="5Nh6YP24ypm" role="2OqNvi">
+                  <ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="5Nh6YP24_w3" role="3cqZAp">
+            <node concept="3cpWsn" id="5Nh6YP24_w4" role="3cpWs9">
+              <property role="TrG5h" value="fullname" />
+              <node concept="17QB3L" id="5Nh6YP24_w5" role="1tU5fm" />
+              <node concept="2YIFZM" id="5Nh6YP24_w6" role="33vP2m">
+                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
+                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                <node concept="37vLTw" id="5Nh6YP24_w7" role="37wK5m">
+                  <ref role="3cqZAo" node="5Nh6YP24yph" resolve="symbol" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="5Nh6YP24_w8" role="3cqZAp">
+            <node concept="3cpWsn" id="5Nh6YP24_w9" role="3cpWs9">
+              <property role="TrG5h" value="lastDot" />
+              <node concept="10Oyi0" id="5Nh6YP24_wa" role="1tU5fm" />
+              <node concept="2OqwBi" id="5Nh6YP24_wb" role="33vP2m">
+                <node concept="37vLTw" id="5Nh6YP24_wc" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5Nh6YP24_w4" resolve="fullname" />
+                </node>
+                <node concept="liA8E" id="5Nh6YP24_wd" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~String.lastIndexOf(java.lang.String)" resolve="lastIndexOf" />
+                  <node concept="Xl_RD" id="5Nh6YP24_we" role="37wK5m">
+                    <property role="Xl_RC" value="." />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="5Nh6YP24KBL" role="3cqZAp">
+            <node concept="3cpWsn" id="5Nh6YP24KBM" role="3cpWs9">
+              <property role="TrG5h" value="text" />
+              <node concept="17QB3L" id="5Nh6YP2dPhz" role="1tU5fm" />
+              <node concept="3K4zz7" id="5Nh6YP24KBN" role="33vP2m">
+                <node concept="2OqwBi" id="5Nh6YP24KBO" role="3K4E3e">
+                  <node concept="37vLTw" id="5Nh6YP24KBP" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5Nh6YP24_w4" resolve="fullname" />
+                  </node>
+                  <node concept="liA8E" id="5Nh6YP24KBQ" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
+                    <node concept="3cpWs3" id="5Nh6YP24KBR" role="37wK5m">
+                      <node concept="3cmrfG" id="5Nh6YP24KBS" role="3uHU7w">
+                        <property role="3cmrfH" value="1" />
+                      </node>
+                      <node concept="37vLTw" id="5Nh6YP24KBT" role="3uHU7B">
+                        <ref role="3cqZAo" node="5Nh6YP24_w9" resolve="lastDot" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="5Nh6YP24KBU" role="3K4GZi">
+                  <ref role="3cqZAo" node="5Nh6YP24_w4" resolve="fullname" />
+                </node>
+                <node concept="2d3UOw" id="5Nh6YP24KBV" role="3K4Cdx">
+                  <node concept="3cmrfG" id="5Nh6YP24KBW" role="3uHU7w">
+                    <property role="3cmrfH" value="0" />
+                  </node>
+                  <node concept="37vLTw" id="5Nh6YP24KBX" role="3uHU7B">
+                    <ref role="3cqZAo" node="5Nh6YP24_w9" resolve="lastDot" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="5Nh6YP24hu0" role="3cqZAp" />
+          <node concept="3cpWs8" id="5Nh6YP1baAH" role="3cqZAp">
+            <node concept="3cpWsn" id="5Nh6YP1baAI" role="3cpWs9">
+              <property role="TrG5h" value="info" />
+              <node concept="3uibUv" id="5Nh6YP1baAJ" role="1tU5fm">
+                <ref role="3uigEE" node="5pDu2jaXzDG" resolve="TableCellInfo" />
+              </node>
+              <node concept="2ShNRf" id="5Nh6YP1baC3" role="33vP2m">
+                <node concept="1pGfFk" id="5Nh6YP1baC4" role="2ShVmc">
+                  <ref role="37wK5l" node="3WU9yfAaFst" />
+                  <node concept="37vLTw" id="5Nh6YP1baC6" role="37wK5m">
+                    <ref role="3cqZAo" node="5Nh6YP24KBM" resolve="text" />
+                  </node>
+                  <node concept="37vLTw" id="5Nh6YP1nZhs" role="37wK5m">
+                    <ref role="3cqZAo" node="5Nh6YP24KBM" resolve="text" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbJ" id="5Nh6YP1baAv" role="3cqZAp">
+            <node concept="3clFbS" id="5Nh6YP1baAw" role="3clFbx">
+              <node concept="3cpWs6" id="5Nh6YP1baAx" role="3cqZAp">
+                <node concept="37vLTw" id="5Nh6YP1o7m$" role="3cqZAk">
+                  <ref role="3cqZAo" node="5Nh6YP1baAI" resolve="info" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbC" id="5Nh6YP1baAD" role="3clFbw">
+              <node concept="37vLTw" id="5Nh6YP1baAF" role="3uHU7B">
+                <ref role="3cqZAo" node="5Nh6YP1baAq" resolve="crTemplateRef" />
+              </node>
+              <node concept="10Nm6u" id="5Nh6YP1baAE" role="3uHU7w" />
+            </node>
+          </node>
+          <node concept="3clFbH" id="5Nh6YP1gHy3" role="3cqZAp" />
+          <node concept="1QHqEK" id="5Nh6YP1baAL" role="3cqZAp">
+            <node concept="1QHqEC" id="5Nh6YP1baAM" role="1QHqEI">
+              <node concept="3clFbS" id="5Nh6YP1baAN" role="1bW5cS">
+                <node concept="3cpWs8" id="5Nh6YP1baAT" role="3cqZAp">
+                  <node concept="3cpWsn" id="5Nh6YP1baAU" role="3cpWs9">
+                    <property role="TrG5h" value="crule" />
+                    <node concept="10QFUN" id="5Nh6YP1f$sn" role="33vP2m">
+                      <node concept="2OqwBi" id="5Nh6YP1f$sh" role="10QFUP">
+                        <node concept="37vLTw" id="5Nh6YP1f$si" role="2Oq$k0">
+                          <ref role="3cqZAo" node="5Nh6YP1baAq" resolve="templateRef" />
+                        </node>
+                        <node concept="liA8E" id="5Nh6YP1f$sj" role="2OqNvi">
+                          <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
+                          <node concept="2OqwBi" id="5Nh6YP1f$sk" role="37wK5m">
+                            <node concept="37vLTw" id="5Nh6YP1f$sl" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
+                            </node>
+                            <node concept="liA8E" id="5Nh6YP1f$sm" role="2OqNvi">
+                              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3Tqbb2" id="5Nh6YP1f$sg" role="10QFUM" />
+                    </node>
+                    <node concept="3Tqbb2" id="5Nh6YP1Wpkb" role="1tU5fm" />
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="5Nh6YP1baB2" role="3cqZAp">
+                  <node concept="3clFbS" id="5Nh6YP1baB3" role="3clFbx">
+                    <node concept="3clFbF" id="5Nh6YP1Wyoe" role="3cqZAp">
+                      <node concept="2OqwBi" id="5Nh6YP1WRA$" role="3clFbG">
+                        <node concept="2OqwBi" id="5Nh6YP1WHJ6" role="2Oq$k0">
+                          <node concept="liA8E" id="5Nh6YP1WQs2" role="2OqNvi">
+                            <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                          </node>
+                          <node concept="2JrnkZ" id="5Nh6YP1WHJb" role="2Oq$k0">
+                            <node concept="37vLTw" id="5Nh6YP1Wyoc" role="2JrQYb">
+                              <ref role="3cqZAo" node="5Nh6YP1baAU" resolve="crule" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="5Nh6YP1WU_$" role="2OqNvi">
+                          <ref role="37wK5l" to="mhbf:~SNodeReference.getModelReference()" resolve="getModelReference" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWs8" id="5Nh6YP1Yz8w" role="3cqZAp">
+                      <node concept="3cpWsn" id="5Nh6YP1Yz8x" role="3cpWs9">
+                        <property role="TrG5h" value="nodeId" />
+                        <node concept="3cpWsb" id="5Nh6YP1Yx8a" role="1tU5fm" />
+                        <node concept="2OqwBi" id="5Nh6YP1Yz8y" role="33vP2m">
+                          <node concept="1eOMI4" id="5Nh6YP1Yz8z" role="2Oq$k0">
+                            <node concept="10QFUN" id="5Nh6YP1Yz8$" role="1eOMHV">
+                              <node concept="2OqwBi" id="5Nh6YP1Yz8_" role="10QFUP">
+                                <node concept="37vLTw" id="5Nh6YP1Yz8A" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="5Nh6YP1baAa" resolve="occ" />
+                                </node>
+                                <node concept="liA8E" id="5Nh6YP1Yz8B" role="2OqNvi">
+                                  <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate()" resolve="predicate" />
+                                </node>
+                              </node>
+                              <node concept="3uibUv" id="5Nh6YP1Yz8C" role="10QFUM">
+                                <ref role="3uigEE" to="tpfl:6Kcfpq7B0Wu" resolve="AbstractPredicate" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="5Nh6YP1Yz8D" role="2OqNvi">
+                            <ref role="37wK5l" to="tpfl:5Nh6YP1UdP7" resolve="getNodeId" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbJ" id="5Nh6YP26rwG" role="3cqZAp">
+                      <node concept="3clFbS" id="5Nh6YP26rwI" role="3clFbx">
+                        <node concept="3cpWs8" id="5Nh6YP1YFBZ" role="3cqZAp">
+                          <node concept="3cpWsn" id="5Nh6YP1YFC0" role="3cpWs9">
+                            <property role="TrG5h" value="ref" />
+                            <node concept="3uibUv" id="5Nh6YP1YFdr" role="1tU5fm">
+                              <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+                            </node>
+                            <node concept="2YIFZM" id="5Nh6YP1YFC1" role="33vP2m">
+                              <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
+                              <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
+                              <node concept="3cpWs3" id="5Nh6YP1YFC2" role="37wK5m">
+                                <node concept="37vLTw" id="5Nh6YP1YFC3" role="3uHU7w">
+                                  <ref role="3cqZAo" node="5Nh6YP1Yz8x" resolve="nodeId" />
+                                </node>
+                                <node concept="3cpWs3" id="5Nh6YP1YFC4" role="3uHU7B">
+                                  <node concept="2OqwBi" id="5Nh6YP1YFC5" role="3uHU7B">
+                                    <node concept="2OqwBi" id="5Nh6YP1YFC6" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="5Nh6YP1YFC7" role="2Oq$k0">
+                                        <node concept="liA8E" id="5Nh6YP1YFC8" role="2OqNvi">
+                                          <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                        </node>
+                                        <node concept="2JrnkZ" id="5Nh6YP1YFC9" role="2Oq$k0">
+                                          <node concept="37vLTw" id="5Nh6YP1YFCa" role="2JrQYb">
+                                            <ref role="3cqZAo" node="5Nh6YP1baAU" resolve="crule" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="liA8E" id="5Nh6YP1YFCb" role="2OqNvi">
+                                        <ref role="37wK5l" to="mhbf:~SNodeReference.getModelReference()" resolve="getModelReference" />
+                                      </node>
+                                    </node>
+                                    <node concept="liA8E" id="5Nh6YP1YFCc" role="2OqNvi">
+                                      <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                                    </node>
+                                  </node>
+                                  <node concept="Xl_RD" id="5Nh6YP1YFCd" role="3uHU7w">
+                                    <property role="Xl_RC" value="/" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbF" id="5Nh6YP1baBr" role="3cqZAp">
+                          <node concept="37vLTI" id="5Nh6YP1baBs" role="3clFbG">
+                            <node concept="2ShNRf" id="5Nh6YP1baBt" role="37vLTx">
+                              <node concept="1pGfFk" id="5Nh6YP1baBu" role="2ShVmc">
+                                <ref role="37wK5l" node="5pDu2jaXBtq" />
+                                <node concept="37vLTw" id="5Nh6YP1baBw" role="37wK5m">
+                                  <ref role="3cqZAo" node="5Nh6YP24KBM" resolve="text" />
+                                </node>
+                                <node concept="37vLTw" id="5Nh6YP1baBy" role="37wK5m">
+                                  <ref role="3cqZAo" node="5Nh6YP24KBM" resolve="text" />
+                                </node>
+                                <node concept="2ShNRf" id="5Nh6YP1baB$" role="37wK5m">
+                                  <node concept="YeOm9" id="5Nh6YP1baB_" role="2ShVmc">
+                                    <node concept="1Y3b0j" id="5Nh6YP1baBA" role="YeSDq">
+                                      <property role="2bfB8j" value="true" />
+                                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                                      <ref role="1Y3XeK" to="wyt6:~Runnable" resolve="Runnable" />
+                                      <node concept="3Tm1VV" id="5Nh6YP1baBB" role="1B3o_S" />
+                                      <node concept="3clFb_" id="5Nh6YP1baBC" role="jymVt">
+                                        <property role="1EzhhJ" value="false" />
+                                        <property role="TrG5h" value="run" />
+                                        <property role="DiZV1" value="false" />
+                                        <property role="od$2w" value="false" />
+                                        <node concept="3Tm1VV" id="5Nh6YP1baBD" role="1B3o_S" />
+                                        <node concept="3cqZAl" id="5Nh6YP1baBE" role="3clF45" />
+                                        <node concept="3clFbS" id="5Nh6YP1baBF" role="3clF47">
+                                          <node concept="3clFbF" id="5Nh6YP1baBG" role="3cqZAp">
+                                            <node concept="2OqwBi" id="5Nh6YP1baBH" role="3clFbG">
+                                              <node concept="2OqwBi" id="5Nh6YP1baBI" role="2Oq$k0">
+                                                <node concept="2OqwBi" id="5Nh6YP1baBJ" role="2Oq$k0">
+                                                  <node concept="2ShNRf" id="5Nh6YP1baBK" role="2Oq$k0">
+                                                    <node concept="1pGfFk" id="5Nh6YP1baBL" role="2ShVmc">
+                                                      <ref role="37wK5l" to="kz9k:~EditorNavigator.&lt;init&gt;(jetbrains.mps.project.Project)" resolve="EditorNavigator" />
+                                                      <node concept="37vLTw" id="5Nh6YP1baBM" role="37wK5m">
+                                                        <ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                  <node concept="liA8E" id="5Nh6YP1baBN" role="2OqNvi">
+                                                    <ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean)" resolve="shallFocus" />
+                                                    <node concept="3clFbT" id="5Nh6YP1baBO" role="37wK5m">
+                                                      <property role="3clFbU" value="false" />
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                                <node concept="liA8E" id="5Nh6YP1baBP" role="2OqNvi">
+                                                  <ref role="37wK5l" to="kz9k:~EditorNavigator.shallSelect(boolean)" resolve="shallSelect" />
+                                                  <node concept="3clFbT" id="5Nh6YP1baBQ" role="37wK5m">
+                                                    <property role="3clFbU" value="true" />
+                                                  </node>
+                                                </node>
+                                              </node>
+                                              <node concept="liA8E" id="5Nh6YP1baBR" role="2OqNvi">
+                                                <ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="open" />
+                                                <node concept="37vLTw" id="5Nh6YP1baBS" role="37wK5m">
+                                                  <ref role="3cqZAo" node="5Nh6YP1YFC0" resolve="ref" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="37vLTw" id="5Nh6YP1baBT" role="37vLTJ">
+                              <ref role="3cqZAo" node="5Nh6YP1baAI" resolve="info" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3y3z36" id="5Nh6YP26_0a" role="3clFbw">
+                        <node concept="3cmrfG" id="5Nh6YP26ES5" role="3uHU7w">
+                          <property role="3cmrfH" value="-1" />
+                        </node>
+                        <node concept="37vLTw" id="5Nh6YP26vHY" role="3uHU7B">
+                          <ref role="3cqZAo" node="5Nh6YP1Yz8x" resolve="nodeId" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3y3z36" id="5Nh6YP1baBV" role="3clFbw">
+                    <node concept="10Nm6u" id="5Nh6YP1baBW" role="3uHU7w" />
+                    <node concept="37vLTw" id="5Nh6YP1baBX" role="3uHU7B">
+                      <ref role="3cqZAo" node="5Nh6YP1baAU" resolve="snode" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="5Nh6YP1baCa" role="ukAjM">
+              <node concept="37vLTw" id="5Nh6YP1baCb" role="2Oq$k0">
+                <ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
+              </node>
+              <node concept="liA8E" id="5Nh6YP1baCc" role="2OqNvi">
+                <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="5Nh6YP26N5w" role="3cqZAp" />
+          <node concept="3cpWs6" id="5Nh6YP1baCe" role="3cqZAp">
+            <node concept="37vLTw" id="5Nh6YP1baCf" role="3cqZAk">
+              <ref role="3cqZAo" node="5Nh6YP1baAI" resolve="info" />
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="2tJIrI" id="6QkkSolKD0E" role="jymVt" />
+      <node concept="3clFb_" id="5Nh6YP2hywO" role="jymVt">
+        <property role="TrG5h" value="forOccurrence" />
+        <node concept="37vLTG" id="5Nh6YP2hywP" role="3clF46">
+          <property role="TrG5h" value="occ" />
+          <node concept="3uibUv" id="5Nh6YP2hywQ" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="5Nh6YP2hywR" role="3clF45">
+          <ref role="3uigEE" node="5pDu2jaXzDG" resolve="TableCellInfo" />
+        </node>
+        <node concept="3Tm1VV" id="5Nh6YP2hywS" role="1B3o_S" />
+        <node concept="3clFbS" id="5Nh6YP2hywT" role="3clF47">
+          <node concept="3cpWs8" id="5Nh6YP2hywU" role="3cqZAp">
+            <node concept="3cpWsn" id="5Nh6YP2hywV" role="3cpWs9">
+              <property role="TrG5h" value="crTemplateRef" />
+              <node concept="3uibUv" id="5Nh6YP2hywW" role="1tU5fm">
+                <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+              </node>
+              <node concept="2OqwBi" id="5Nh6YP2hywX" role="33vP2m">
+                <node concept="1eOMI4" id="5Nh6YP2hywY" role="2Oq$k0">
+                  <node concept="10QFUN" id="5Nh6YP2hywZ" role="1eOMHV">
+                    <node concept="2OqwBi" id="5Nh6YP2hyx0" role="10QFUP">
+                      <node concept="37vLTw" id="5Nh6YP2hyx1" role="2Oq$k0">
+                        <ref role="3cqZAo" node="5Nh6YP2hywP" resolve="occ" />
+                      </node>
+                      <node concept="liA8E" id="5Nh6YP2hyx2" role="2OqNvi">
+                        <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint()" resolve="constraint" />
+                      </node>
+                    </node>
+                    <node concept="3uibUv" id="5Nh6YP2hyx3" role="10QFUM">
+                      <ref role="3uigEE" to="ugy2:5uFPQ7BZsAX" resolve="AbstractConstraint" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="5Nh6YP2hyx4" role="2OqNvi">
+                  <ref role="37wK5l" to="ugy2:5Nh6YP29Bcl" resolve="getCRTemplateRef" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="5Nh6YP2hyx5" role="3cqZAp">
+            <node concept="3cpWsn" id="5Nh6YP2hyx6" role="3cpWs9">
+              <property role="TrG5h" value="symbol" />
+              <node concept="3uibUv" id="5Nh6YP2hyx7" role="1tU5fm">
+                <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
+              </node>
+              <node concept="2OqwBi" id="5Nh6YP2hyx8" role="33vP2m">
+                <node concept="2OqwBi" id="5Nh6YP2hyx9" role="2Oq$k0">
+                  <node concept="37vLTw" id="5Nh6YP2hyxa" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5Nh6YP2hywP" resolve="occ" />
+                  </node>
+                  <node concept="liA8E" id="5Nh6YP2hyxb" role="2OqNvi">
+                    <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint()" resolve="constraint" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="5Nh6YP2hyxc" role="2OqNvi">
+                  <ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="5Nh6YP2hyxd" role="3cqZAp">
+            <node concept="3cpWsn" id="5Nh6YP2hyxe" role="3cpWs9">
+              <property role="TrG5h" value="fullname" />
+              <node concept="17QB3L" id="5Nh6YP2hyxf" role="1tU5fm" />
+              <node concept="2YIFZM" id="5Nh6YP2hyxg" role="33vP2m">
+                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
+                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                <node concept="37vLTw" id="5Nh6YP2hyxh" role="37wK5m">
+                  <ref role="3cqZAo" node="5Nh6YP2hyx6" resolve="symbol" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="5Nh6YP2hyxi" role="3cqZAp">
+            <node concept="3cpWsn" id="5Nh6YP2hyxj" role="3cpWs9">
+              <property role="TrG5h" value="lastDot" />
+              <node concept="10Oyi0" id="5Nh6YP2hyxk" role="1tU5fm" />
+              <node concept="2OqwBi" id="5Nh6YP2hyxl" role="33vP2m">
+                <node concept="37vLTw" id="5Nh6YP2hyxm" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5Nh6YP2hyxe" resolve="fullname" />
+                </node>
+                <node concept="liA8E" id="5Nh6YP2hyxn" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~String.lastIndexOf(java.lang.String)" resolve="lastIndexOf" />
+                  <node concept="Xl_RD" id="5Nh6YP2hyxo" role="37wK5m">
+                    <property role="Xl_RC" value="." />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="5Nh6YP2hyxp" role="3cqZAp">
+            <node concept="3cpWsn" id="5Nh6YP2hyxq" role="3cpWs9">
+              <property role="TrG5h" value="text" />
+              <node concept="17QB3L" id="5Nh6YP2hyxr" role="1tU5fm" />
+              <node concept="3K4zz7" id="5Nh6YP2hyxs" role="33vP2m">
+                <node concept="2OqwBi" id="5Nh6YP2hyxt" role="3K4E3e">
+                  <node concept="37vLTw" id="5Nh6YP2hyxu" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5Nh6YP2hyxe" resolve="fullname" />
+                  </node>
+                  <node concept="liA8E" id="5Nh6YP2hyxv" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
+                    <node concept="3cpWs3" id="5Nh6YP2hyxw" role="37wK5m">
+                      <node concept="3cmrfG" id="5Nh6YP2hyxx" role="3uHU7w">
+                        <property role="3cmrfH" value="1" />
+                      </node>
+                      <node concept="37vLTw" id="5Nh6YP2hyxy" role="3uHU7B">
+                        <ref role="3cqZAo" node="5Nh6YP2hyxj" resolve="lastDot" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="5Nh6YP2hyxz" role="3K4GZi">
+                  <ref role="3cqZAo" node="5Nh6YP2hyxe" resolve="fullname" />
+                </node>
+                <node concept="2d3UOw" id="5Nh6YP2hyx$" role="3K4Cdx">
+                  <node concept="3cmrfG" id="5Nh6YP2hyx_" role="3uHU7w">
+                    <property role="3cmrfH" value="0" />
+                  </node>
+                  <node concept="37vLTw" id="5Nh6YP2hyxA" role="3uHU7B">
+                    <ref role="3cqZAo" node="5Nh6YP2hyxj" resolve="lastDot" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="5Nh6YP2hyxB" role="3cqZAp" />
+          <node concept="3cpWs8" id="5Nh6YP2hyxC" role="3cqZAp">
+            <node concept="3cpWsn" id="5Nh6YP2hyxD" role="3cpWs9">
+              <property role="TrG5h" value="info" />
+              <node concept="3uibUv" id="5Nh6YP2hyxE" role="1tU5fm">
+                <ref role="3uigEE" node="5pDu2jaXzDG" resolve="TableCellInfo" />
+              </node>
+              <node concept="2ShNRf" id="5Nh6YP2hyxF" role="33vP2m">
+                <node concept="1pGfFk" id="5Nh6YP2hyxG" role="2ShVmc">
+                  <ref role="37wK5l" node="3WU9yfAaFst" resolve="TableCellInfo" />
+                  <node concept="37vLTw" id="5Nh6YP2hyxH" role="37wK5m">
+                    <ref role="3cqZAo" node="5Nh6YP2hyxq" resolve="text" />
+                  </node>
+                  <node concept="37vLTw" id="5Nh6YP2hyxI" role="37wK5m">
+                    <ref role="3cqZAo" node="5Nh6YP2hyxq" resolve="text" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbJ" id="5Nh6YP2hyxJ" role="3cqZAp">
+            <node concept="3clFbS" id="5Nh6YP2hyxK" role="3clFbx">
+              <node concept="3cpWs6" id="5Nh6YP2hyxL" role="3cqZAp">
+                <node concept="37vLTw" id="5Nh6YP2hyxM" role="3cqZAk">
+                  <ref role="3cqZAo" node="5Nh6YP2hyxD" resolve="info" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbC" id="5Nh6YP2hyxN" role="3clFbw">
+              <node concept="37vLTw" id="5Nh6YP2hyxO" role="3uHU7B">
+                <ref role="3cqZAo" node="5Nh6YP2hywV" resolve="crTemplateRef" />
+              </node>
+              <node concept="10Nm6u" id="5Nh6YP2hyxP" role="3uHU7w" />
+            </node>
+          </node>
+          <node concept="3clFbH" id="5Nh6YP2hyxQ" role="3cqZAp" />
+          <node concept="1QHqEK" id="5Nh6YP2hyxR" role="3cqZAp">
+            <node concept="1QHqEC" id="5Nh6YP2hyxS" role="1QHqEI">
+              <node concept="3clFbS" id="5Nh6YP2hyxT" role="1bW5cS">
+                <node concept="3cpWs8" id="5Nh6YP2hyxU" role="3cqZAp">
+                  <node concept="3cpWsn" id="5Nh6YP2hyxV" role="3cpWs9">
+                    <property role="TrG5h" value="crule" />
+                    <node concept="10QFUN" id="5Nh6YP2hyxW" role="33vP2m">
+                      <node concept="2OqwBi" id="5Nh6YP2hyxX" role="10QFUP">
+                        <node concept="37vLTw" id="5Nh6YP2hyxY" role="2Oq$k0">
+                          <ref role="3cqZAo" node="5Nh6YP2hywV" resolve="crTemplateRef" />
+                        </node>
+                        <node concept="liA8E" id="5Nh6YP2hyxZ" role="2OqNvi">
+                          <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
+                          <node concept="2OqwBi" id="5Nh6YP2hyy0" role="37wK5m">
+                            <node concept="37vLTw" id="5Nh6YP2hyy1" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
+                            </node>
+                            <node concept="liA8E" id="5Nh6YP2hyy2" role="2OqNvi">
+                              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3Tqbb2" id="5Nh6YP2hyy3" role="10QFUM" />
+                    </node>
+                    <node concept="3Tqbb2" id="5Nh6YP2hyy4" role="1tU5fm" />
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="5Nh6YP2hyy5" role="3cqZAp">
+                  <node concept="3clFbS" id="5Nh6YP2hyy6" role="3clFbx">
+                    <node concept="3clFbF" id="5Nh6YP2hyy7" role="3cqZAp">
+                      <node concept="2OqwBi" id="5Nh6YP2hyy8" role="3clFbG">
+                        <node concept="2OqwBi" id="5Nh6YP2hyy9" role="2Oq$k0">
+                          <node concept="liA8E" id="5Nh6YP2hyya" role="2OqNvi">
+                            <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                          </node>
+                          <node concept="2JrnkZ" id="5Nh6YP2hyyb" role="2Oq$k0">
+                            <node concept="37vLTw" id="5Nh6YP2hyyc" role="2JrQYb">
+                              <ref role="3cqZAo" node="5Nh6YP2hyxV" resolve="crule" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="5Nh6YP2hyyd" role="2OqNvi">
+                          <ref role="37wK5l" to="mhbf:~SNodeReference.getModelReference()" resolve="getModelReference" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWs8" id="5Nh6YP2hyye" role="3cqZAp">
+                      <node concept="3cpWsn" id="5Nh6YP2hyyf" role="3cpWs9">
+                        <property role="TrG5h" value="nodeId" />
+                        <node concept="3cpWsb" id="5Nh6YP2hyyg" role="1tU5fm" />
+                        <node concept="2OqwBi" id="5Nh6YP2hyyh" role="33vP2m">
+                          <node concept="1eOMI4" id="5Nh6YP2hyyi" role="2Oq$k0">
+                            <node concept="10QFUN" id="5Nh6YP2hyyj" role="1eOMHV">
+                              <node concept="2OqwBi" id="5Nh6YP2hyyk" role="10QFUP">
+                                <node concept="37vLTw" id="5Nh6YP2hyyl" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="5Nh6YP2hywP" resolve="occ" />
+                                </node>
+                                <node concept="liA8E" id="5Nh6YP2hyym" role="2OqNvi">
+                                  <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint()" resolve="constraint" />
+                                </node>
+                              </node>
+                              <node concept="3uibUv" id="5Nh6YP2hyyn" role="10QFUM">
+                                <ref role="3uigEE" to="ugy2:5uFPQ7BZsAX" resolve="AbstractConstraint" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="5Nh6YP2hyyo" role="2OqNvi">
+                            <ref role="37wK5l" to="ugy2:5Nh6YP1UdP7" resolve="getNodeId" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbJ" id="5Nh6YP2hyyp" role="3cqZAp">
+                      <node concept="3clFbS" id="5Nh6YP2hyyq" role="3clFbx">
+                        <node concept="3cpWs8" id="5Nh6YP2hyyr" role="3cqZAp">
+                          <node concept="3cpWsn" id="5Nh6YP2hyys" role="3cpWs9">
+                            <property role="TrG5h" value="ref" />
+                            <node concept="3uibUv" id="5Nh6YP2hyyt" role="1tU5fm">
+                              <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+                            </node>
+                            <node concept="2YIFZM" id="5Nh6YP2hyyu" role="33vP2m">
+                              <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
+                              <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
+                              <node concept="3cpWs3" id="5Nh6YP2hyyv" role="37wK5m">
+                                <node concept="37vLTw" id="5Nh6YP2hyyw" role="3uHU7w">
+                                  <ref role="3cqZAo" node="5Nh6YP2hyyf" resolve="nodeId" />
+                                </node>
+                                <node concept="3cpWs3" id="5Nh6YP2hyyx" role="3uHU7B">
+                                  <node concept="2OqwBi" id="5Nh6YP2hyyy" role="3uHU7B">
+                                    <node concept="2OqwBi" id="5Nh6YP2hyyz" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="5Nh6YP2hyy$" role="2Oq$k0">
+                                        <node concept="liA8E" id="5Nh6YP2hyy_" role="2OqNvi">
+                                          <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                        </node>
+                                        <node concept="2JrnkZ" id="5Nh6YP2hyyA" role="2Oq$k0">
+                                          <node concept="37vLTw" id="5Nh6YP2hyyB" role="2JrQYb">
+                                            <ref role="3cqZAo" node="5Nh6YP2hyxV" resolve="crule" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="liA8E" id="5Nh6YP2hyyC" role="2OqNvi">
+                                        <ref role="37wK5l" to="mhbf:~SNodeReference.getModelReference()" resolve="getModelReference" />
+                                      </node>
+                                    </node>
+                                    <node concept="liA8E" id="5Nh6YP2hyyD" role="2OqNvi">
+                                      <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                                    </node>
+                                  </node>
+                                  <node concept="Xl_RD" id="5Nh6YP2hyyE" role="3uHU7w">
+                                    <property role="Xl_RC" value="/" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbF" id="5Nh6YP2hyyF" role="3cqZAp">
+                          <node concept="37vLTI" id="5Nh6YP2hyyG" role="3clFbG">
+                            <node concept="2ShNRf" id="5Nh6YP2hyyH" role="37vLTx">
+                              <node concept="1pGfFk" id="5Nh6YP2hyyI" role="2ShVmc">
+                                <ref role="37wK5l" node="5pDu2jaXBtq" resolve="TableCellInfo" />
+                                <node concept="37vLTw" id="5Nh6YP2hyyJ" role="37wK5m">
+                                  <ref role="3cqZAo" node="5Nh6YP2hyxq" resolve="text" />
+                                </node>
+                                <node concept="37vLTw" id="5Nh6YP2hyyK" role="37wK5m">
+                                  <ref role="3cqZAo" node="5Nh6YP2hyxq" resolve="text" />
+                                </node>
+                                <node concept="2ShNRf" id="5Nh6YP2hyyL" role="37wK5m">
+                                  <node concept="YeOm9" id="5Nh6YP2hyyM" role="2ShVmc">
+                                    <node concept="1Y3b0j" id="5Nh6YP2hyyN" role="YeSDq">
+                                      <property role="2bfB8j" value="true" />
+                                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                                      <ref role="1Y3XeK" to="wyt6:~Runnable" resolve="Runnable" />
+                                      <node concept="3Tm1VV" id="5Nh6YP2hyyO" role="1B3o_S" />
+                                      <node concept="3clFb_" id="5Nh6YP2hyyP" role="jymVt">
+                                        <property role="1EzhhJ" value="false" />
+                                        <property role="TrG5h" value="run" />
+                                        <property role="DiZV1" value="false" />
+                                        <property role="od$2w" value="false" />
+                                        <node concept="3Tm1VV" id="5Nh6YP2hyyQ" role="1B3o_S" />
+                                        <node concept="3cqZAl" id="5Nh6YP2hyyR" role="3clF45" />
+                                        <node concept="3clFbS" id="5Nh6YP2hyyS" role="3clF47">
+                                          <node concept="3clFbF" id="5Nh6YP2hyyT" role="3cqZAp">
+                                            <node concept="2OqwBi" id="5Nh6YP2hyyU" role="3clFbG">
+                                              <node concept="2OqwBi" id="5Nh6YP2hyyV" role="2Oq$k0">
+                                                <node concept="2OqwBi" id="5Nh6YP2hyyW" role="2Oq$k0">
+                                                  <node concept="2ShNRf" id="5Nh6YP2hyyX" role="2Oq$k0">
+                                                    <node concept="1pGfFk" id="5Nh6YP2hyyY" role="2ShVmc">
+                                                      <ref role="37wK5l" to="kz9k:~EditorNavigator.&lt;init&gt;(jetbrains.mps.project.Project)" resolve="EditorNavigator" />
+                                                      <node concept="37vLTw" id="5Nh6YP2hyyZ" role="37wK5m">
+                                                        <ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                  <node concept="liA8E" id="5Nh6YP2hyz0" role="2OqNvi">
+                                                    <ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean)" resolve="shallFocus" />
+                                                    <node concept="3clFbT" id="5Nh6YP2hyz1" role="37wK5m">
+                                                      <property role="3clFbU" value="false" />
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                                <node concept="liA8E" id="5Nh6YP2hyz2" role="2OqNvi">
+                                                  <ref role="37wK5l" to="kz9k:~EditorNavigator.shallSelect(boolean)" resolve="shallSelect" />
+                                                  <node concept="3clFbT" id="5Nh6YP2hyz3" role="37wK5m">
+                                                    <property role="3clFbU" value="true" />
+                                                  </node>
+                                                </node>
+                                              </node>
+                                              <node concept="liA8E" id="5Nh6YP2hyz4" role="2OqNvi">
+                                                <ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="open" />
+                                                <node concept="37vLTw" id="5Nh6YP2hyz5" role="37wK5m">
+                                                  <ref role="3cqZAo" node="5Nh6YP2hyys" resolve="ref" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="37vLTw" id="5Nh6YP2hyz6" role="37vLTJ">
+                              <ref role="3cqZAo" node="5Nh6YP2hyxD" resolve="info" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3y3z36" id="5Nh6YP2hyz7" role="3clFbw">
+                        <node concept="3cmrfG" id="5Nh6YP2hyz8" role="3uHU7w">
+                          <property role="3cmrfH" value="-1" />
+                        </node>
+                        <node concept="37vLTw" id="5Nh6YP2hyz9" role="3uHU7B">
+                          <ref role="3cqZAo" node="5Nh6YP2hyyf" resolve="nodeId" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3y3z36" id="5Nh6YP2hyza" role="3clFbw">
+                    <node concept="10Nm6u" id="5Nh6YP2hyzb" role="3uHU7w" />
+                    <node concept="37vLTw" id="5Nh6YP2hyzc" role="3uHU7B">
+                      <ref role="3cqZAo" node="5Nh6YP2hyxV" resolve="crule" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="5Nh6YP2hyzd" role="ukAjM">
+              <node concept="37vLTw" id="5Nh6YP2hyze" role="2Oq$k0">
+                <ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
+              </node>
+              <node concept="liA8E" id="5Nh6YP2hyzf" role="2OqNvi">
+                <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="5Nh6YP2hyzg" role="3cqZAp" />
+          <node concept="3cpWs6" id="5Nh6YP2hyzh" role="3cqZAp">
+            <node concept="37vLTw" id="5Nh6YP2hyzi" role="3cqZAk">
+              <ref role="3cqZAo" node="5Nh6YP2hyxD" resolve="info" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="5Nh6YP2hywN" role="jymVt" />
       <node concept="3clFb_" id="9UUIHLyjFi" role="jymVt">
         <property role="TrG5h" value="forSymbol" />
         <node concept="3Tm1VV" id="9UUIHLzwjl" role="1B3o_S" />
@@ -23731,6 +24514,20 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbJ" id="5Nh6YP1clWB" role="3cqZAp">
+            <node concept="3clFbS" id="5Nh6YP1clWD" role="3clFbx">
+              <node concept="3cpWs6" id="5Nh6YP1cEiO" role="3cqZAp">
+                <node concept="10Nm6u" id="5Nh6YP1cIG0" role="3cqZAk" />
+              </node>
+            </node>
+            <node concept="3clFbC" id="5Nh6YP1cy0y" role="3clFbw">
+              <node concept="10Nm6u" id="5Nh6YP1cyXt" role="3uHU7w" />
+              <node concept="37vLTw" id="5Nh6YP1cqkd" role="3uHU7B">
+                <ref role="3cqZAo" node="2T1p0CFIIyn" resolve="data" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="5Nh6YP1cMn$" role="3cqZAp" />
           <node concept="3cpWs8" id="2T1p0CFIIyx" role="3cqZAp">
             <node concept="3cpWsn" id="2T1p0CFIIyy" role="3cpWs9">
               <property role="TrG5h" value="text" />
@@ -23923,7 +24720,7 @@
               <property role="TrG5h" value="prefix" />
               <node concept="17QB3L" id="2T1p0CFKe_H" role="1tU5fm" />
               <node concept="Xl_RD" id="32fHqDfepjj" role="33vP2m">
-                <property role="Xl_RC" value="? @" />
+                <property role="Xl_RC" value="? " />
               </node>
             </node>
           </node>
@@ -23937,7 +24734,7 @@
                 <node concept="3clFbF" id="32fHqDfeoJV" role="3cqZAp">
                   <node concept="37vLTI" id="32fHqDfeoJW" role="3clFbG">
                     <node concept="Xl_RD" id="32fHqDfeoJX" role="37vLTx">
-                      <property role="Xl_RC" value="trying @" />
+                      <property role="Xl_RC" value="trying " />
                     </node>
                     <node concept="37vLTw" id="32fHqDfeoJY" role="37vLTJ">
                       <ref role="3cqZAo" node="2T1p0CFKeAa" resolve="prefix" />
@@ -23956,7 +24753,7 @@
                 <node concept="3clFbF" id="32fHqDfeoMw" role="3cqZAp">
                   <node concept="37vLTI" id="32fHqDfeoMx" role="3clFbG">
                     <node concept="Xl_RD" id="32fHqDfeoMy" role="37vLTx">
-                      <property role="Xl_RC" value="trigger @" />
+                      <property role="Xl_RC" value="trigger " />
                     </node>
                     <node concept="37vLTw" id="32fHqDfeoMz" role="37vLTJ">
                       <ref role="3cqZAo" node="2T1p0CFKeAa" resolve="prefix" />
@@ -23975,7 +24772,7 @@
                 <node concept="3clFbF" id="32fHqDfenCZ" role="3cqZAp">
                   <node concept="37vLTI" id="32fHqDfenWG" role="3clFbG">
                     <node concept="Xl_RD" id="32fHqDfeoeg" role="37vLTx">
-                      <property role="Xl_RC" value="retry @" />
+                      <property role="Xl_RC" value="retry " />
                     </node>
                     <node concept="37vLTw" id="32fHqDfenCY" role="37vLTJ">
                       <ref role="3cqZAo" node="2T1p0CFKeAa" resolve="prefix" />
@@ -24665,29 +25462,19 @@
               </node>
             </node>
           </node>
-          <node concept="3cpWs6" id="9UUIHLzfY7" role="3cqZAp">
-            <node concept="2OqwBi" id="9UUIHLzrUJ" role="3cqZAk">
-              <node concept="37vLTw" id="9UUIHLznrF" role="2Oq$k0">
+          <node concept="3cpWs6" id="5Nh6YP20pAQ" role="3cqZAp">
+            <node concept="2OqwBi" id="5Nh6YP20pAR" role="3cqZAk">
+              <node concept="37vLTw" id="5Nh6YP20pAS" role="2Oq$k0">
                 <ref role="3cqZAo" node="6QkkSolLkpg" resolve="treeCellInfoFactory" />
               </node>
-              <node concept="liA8E" id="9UUIHLzyle" role="2OqNvi">
-                <ref role="37wK5l" node="9UUIHLyjFi" resolve="forSymbol" />
-                <node concept="2OqwBi" id="9UUIHLzB8h" role="37wK5m">
-                  <node concept="2OqwBi" id="9UUIHLzB8i" role="2Oq$k0">
-                    <node concept="1LFfDK" id="9UUIHLzB8j" role="2Oq$k0">
-                      <node concept="37vLTw" id="9UUIHLzB8k" role="1LFl5Q">
-                        <ref role="3cqZAo" node="9UUIHLtQYX" resolve="data" />
-                      </node>
-                      <node concept="3cmrfG" id="9UUIHLzB8l" role="1LF_Uc">
-                        <property role="3cmrfH" value="0" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="9UUIHLzB8m" role="2OqNvi">
-                      <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint()" resolve="constraint" />
-                    </node>
+              <node concept="liA8E" id="5Nh6YP20pAT" role="2OqNvi">
+                <ref role="37wK5l" node="5Nh6YP2hywO" resolve="forOccurrence" />
+                <node concept="1LFfDK" id="5Nh6YP2jt7s" role="37wK5m">
+                  <node concept="37vLTw" id="5Nh6YP2jt7t" role="1LFl5Q">
+                    <ref role="3cqZAo" node="9UUIHLtQYX" resolve="data" />
                   </node>
-                  <node concept="liA8E" id="9UUIHLzB8n" role="2OqNvi">
-                    <ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
+                  <node concept="3cmrfG" id="5Nh6YP2jt7u" role="1LF_Uc">
+                    <property role="3cmrfH" value="0" />
                   </node>
                 </node>
               </node>
@@ -24746,23 +25533,13 @@
                 <ref role="3cqZAo" node="6QkkSolLkpg" resolve="treeCellInfoFactory" />
               </node>
               <node concept="liA8E" id="9UUIHLzH0P" role="2OqNvi">
-                <ref role="37wK5l" node="9UUIHLyjFi" resolve="forSymbol" />
-                <node concept="2OqwBi" id="9UUIHLzMdv" role="37wK5m">
-                  <node concept="2OqwBi" id="9UUIHLzMdw" role="2Oq$k0">
-                    <node concept="1LFfDK" id="9UUIHLzMdx" role="2Oq$k0">
-                      <node concept="3cmrfG" id="9UUIHLzMdy" role="1LF_Uc">
-                        <property role="3cmrfH" value="0" />
-                      </node>
-                      <node concept="37vLTw" id="9UUIHLzMdz" role="1LFl5Q">
-                        <ref role="3cqZAo" node="9UUIHLssMi" resolve="data" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="9UUIHLzMd$" role="2OqNvi">
-                      <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate()" resolve="predicate" />
-                    </node>
+                <ref role="37wK5l" node="5Nh6YP1baA9" resolve="forInvocation" />
+                <node concept="1LFfDK" id="5Nh6YP2jwNp" role="37wK5m">
+                  <node concept="3cmrfG" id="5Nh6YP2jwNq" role="1LF_Uc">
+                    <property role="3cmrfH" value="0" />
                   </node>
-                  <node concept="liA8E" id="9UUIHLzMd_" role="2OqNvi">
-                    <ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
+                  <node concept="37vLTw" id="5Nh6YP2jwNr" role="1LFl5Q">
+                    <ref role="3cqZAo" node="9UUIHLssMi" resolve="data" />
                   </node>
                 </node>
               </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
index 97b8d022..2945765f 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
@@ -5454,7 +5454,7 @@
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
-      <node concept="2tJIrI" id="6QkkSol_6jv" role="jymVt" />
+      <node concept="2tJIrI" id="5Nh6YP1SNQU" role="jymVt" />
       <node concept="312cEg" id="3mz2_dYazRU" role="jymVt">
         <property role="TrG5h" value="original" />
         <node concept="3Tm6S6" id="3mz2_dYazRV" role="1B3o_S" />