diff --git a/build.xml b/build.xml
index 56bee1ae..649c97d5 100644
--- a/build.xml
+++ b/build.xml
@@ -2675,6 +2675,7 @@
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
       </classpath>
     </javac>
   </target>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index b2b9f831..4e41a451 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -797,6 +797,75 @@
             <node concept="10Nm6u" id="4F3SXIF6e39" role="33vP2m" />
           </node>
         </node>
+        <node concept="3clFbH" id="70Wv0dJhMDq" role="3cqZAp" />
+        <node concept="3cpWs8" id="70Wv0dJjilv" role="3cqZAp">
+          <node concept="3cpWsn" id="70Wv0dJjilw" role="3cpWs9">
+            <property role="TrG5h" value="originIdxRef" />
+            <property role="3TUv4t" value="true" />
+            <node concept="3uibUv" id="70Wv0dJjilt" role="1tU5fm">
+              <ref role="3uigEE" to="18ew:~Reference" resolve="Reference" />
+              <node concept="3uibUv" id="70Wv0dJjirR" role="11_B2D">
+                <ref role="3uigEE" to="7n8k:70Wv0dJhQb2" resolve="OriginIndex" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="70Wv0dJjisq" role="33vP2m">
+              <node concept="1pGfFk" id="70Wv0dJjiDI" role="2ShVmc">
+                <ref role="37wK5l" to="18ew:~Reference.&lt;init&gt;()" resolve="Reference" />
+                <node concept="3uibUv" id="70Wv0dJjiEM" role="1pMfVU">
+                  <ref role="3uigEE" to="7n8k:70Wv0dJhQb2" resolve="OriginIndex" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="70Wv0dJhNgx" role="3cqZAp">
+          <node concept="3clFbS" id="70Wv0dJhNgz" role="3clFbx">
+            <node concept="3cpWs8" id="70Wv0dJhOMA" role="3cqZAp">
+              <node concept="3cpWsn" id="70Wv0dJhOMB" role="3cpWs9">
+                <property role="TrG5h" value="pex" />
+                <node concept="3uibUv" id="70Wv0dJhOM_" role="1tU5fm">
+                  <ref role="3uigEE" to="7n8k:70Wv0dJhKHy" resolve="ProgramEx" />
+                </node>
+                <node concept="1eOMI4" id="70Wv0dJhOMC" role="33vP2m">
+                  <node concept="10QFUN" id="70Wv0dJhOMD" role="1eOMHV">
+                    <node concept="3uibUv" id="70Wv0dJhOME" role="10QFUM">
+                      <ref role="3uigEE" to="7n8k:70Wv0dJhKHy" resolve="ProgramEx" />
+                    </node>
+                    <node concept="37vLTw" id="70Wv0dJhOMF" role="10QFUP">
+                      <ref role="3cqZAo" node="7lt0LtQtD2v" resolve="program" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="70Wv0dJhQs3" role="3cqZAp">
+              <node concept="2OqwBi" id="70Wv0dJjknx" role="3clFbG">
+                <node concept="37vLTw" id="70Wv0dJjiXZ" role="2Oq$k0">
+                  <ref role="3cqZAo" node="70Wv0dJjilw" resolve="originIdxRef" />
+                </node>
+                <node concept="liA8E" id="70Wv0dJjkzh" role="2OqNvi">
+                  <ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object):void" resolve="set" />
+                  <node concept="2OqwBi" id="70Wv0dJjkzH" role="37wK5m">
+                    <node concept="37vLTw" id="70Wv0dJjkzI" role="2Oq$k0">
+                      <ref role="3cqZAo" node="70Wv0dJhOMB" resolve="pex" />
+                    </node>
+                    <node concept="liA8E" id="70Wv0dJjkzJ" role="2OqNvi">
+                      <ref role="37wK5l" to="7n8k:70Wv0dJhKJo" resolve="originIndex" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2ZW3vV" id="70Wv0dJhOKj" role="3clFbw">
+            <node concept="3uibUv" id="70Wv0dJhOKw" role="2ZW6by">
+              <ref role="3uigEE" to="7n8k:70Wv0dJhKHy" resolve="ProgramEx" />
+            </node>
+            <node concept="37vLTw" id="70Wv0dJhNmD" role="2ZW6bz">
+              <ref role="3cqZAo" node="7lt0LtQtD2v" resolve="program" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbH" id="41ox5VnkhIX" role="3cqZAp" />
         <node concept="3cpWs8" id="7WKNeR9xpPO" role="3cqZAp">
           <node concept="3cpWsn" id="7WKNeR9xpPP" role="3cpWs9">
@@ -942,6 +1011,7 @@
                     <node concept="1Y3b0j" id="8odmgCo4Lf" role="YeSDq">
                       <property role="2bfB8j" value="true" />
                       <ref role="1Y3XeK" to="w7la:~FailureHandler" resolve="FailureHandler" />
+                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                       <node concept="3Tm1VV" id="8odmgCo4Lg" role="1B3o_S" />
                       <node concept="3clFb_" id="8odmgCo4Lh" role="jymVt">
                         <property role="1EzhhJ" value="false" />
@@ -965,67 +1035,113 @@
                           </node>
                         </node>
                         <node concept="3clFbS" id="8odmgCo4Lp" role="3clF47">
-                          <node concept="3clFbH" id="8odmgCoHiQ" role="3cqZAp" />
+                          <node concept="3clFbH" id="6EY0p2wrM_E" role="3cqZAp" />
                           <node concept="3clFbJ" id="8odmgCoHk0" role="3cqZAp">
                             <node concept="3clFbS" id="8odmgCoHk2" role="3clFbx">
-                              <node concept="3clFbF" id="8odmgCoHuJ" role="3cqZAp">
-                                <node concept="2OqwBi" id="8odmgCoHQh" role="3clFbG">
-                                  <node concept="2YIFZM" id="8odmgCoHx_" role="2Oq$k0">
-                                    <ref role="37wK5l" to="9x2e:oI9YrIZUA" resolve="solver" />
-                                    <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
-                                    <node concept="2OqwBi" id="8odmgCoHDZ" role="37wK5m">
-                                      <node concept="2YIFZM" id="8odmgCoH$4" role="2Oq$k0">
-                                        <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
-                                        <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                              <node concept="3clFbJ" id="70Wv0dJhS7z" role="3cqZAp">
+                                <node concept="3clFbS" id="70Wv0dJhS7_" role="3clFbx">
+                                  <node concept="3clFbF" id="8odmgCoHuJ" role="3cqZAp">
+                                    <node concept="2OqwBi" id="8odmgCoHQh" role="3clFbG">
+                                      <node concept="2YIFZM" id="8odmgCoHx_" role="2Oq$k0">
+                                        <ref role="37wK5l" to="9x2e:oI9YrIZUA" resolve="solver" />
+                                        <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
+                                        <node concept="2OqwBi" id="8odmgCoHDZ" role="37wK5m">
+                                          <node concept="2YIFZM" id="8odmgCoH$4" role="2Oq$k0">
+                                            <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
+                                            <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                                          </node>
+                                          <node concept="liA8E" id="8odmgCoHKm" role="2OqNvi">
+                                            <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
+                                          </node>
+                                        </node>
                                       </node>
-                                      <node concept="liA8E" id="8odmgCoHKm" role="2OqNvi">
-                                        <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
+                                      <node concept="liA8E" id="8odmgCoHXm" role="2OqNvi">
+                                        <ref role="37wK5l" to="9x2e:oI9Ys2ypk" resolve="report" />
+                                        <node concept="Rm8GO" id="8odmgCoL3K" role="37wK5m">
+                                          <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
+                                          <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                                        </node>
+                                        <node concept="2OqwBi" id="8odmgCp7$l" role="37wK5m">
+                                          <node concept="1eOMI4" id="8odmgCp7$m" role="2Oq$k0">
+                                            <node concept="10QFUN" id="8odmgCp7$n" role="1eOMHV">
+                                              <node concept="3uibUv" id="8odmgCp7$o" role="10QFUM">
+                                                <ref role="3uigEE" to="6pyv:7nPD14OaO1O" resolve="RuleEx" />
+                                              </node>
+                                              <node concept="37vLTw" id="8odmgCp7$p" role="10QFUP">
+                                                <ref role="3cqZAo" node="8odmgCo4Ln" resolve="rule" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="liA8E" id="8odmgCp7$q" role="2OqNvi">
+                                            <ref role="37wK5l" to="6pyv:7nPD14Ob4em" resolve="originRef" />
+                                          </node>
+                                        </node>
+                                        <node concept="2OqwBi" id="8odmgCoMt9" role="37wK5m">
+                                          <node concept="37vLTw" id="8odmgCoMjU" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="8odmgCo4Ll" resolve="failure" />
+                                          </node>
+                                          <node concept="liA8E" id="8odmgCoMDE" role="2OqNvi">
+                                            <ref role="37wK5l" to="w7la:~EvaluationFailure.getMessage():java.lang.String" resolve="getMessage" />
+                                          </node>
+                                        </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="liA8E" id="8odmgCoHXm" role="2OqNvi">
-                                    <ref role="37wK5l" to="9x2e:oI9Ys2ypk" resolve="report" />
-                                    <node concept="Rm8GO" id="8odmgCoL3K" role="37wK5m">
-                                      <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
-                                      <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                                  <node concept="3cpWs6" id="8odmgCoMG0" role="3cqZAp">
+                                    <node concept="10Nm6u" id="8odmgCoMHh" role="3cqZAk" />
+                                  </node>
+                                  <node concept="3clFbH" id="70Wv0dJhS7$" role="3cqZAp" />
+                                </node>
+                                <node concept="2OqwBi" id="70Wv0dJhTXV" role="3clFbw">
+                                  <node concept="2OqwBi" id="70Wv0dJjmot" role="2Oq$k0">
+                                    <node concept="37vLTw" id="70Wv0dJjmck" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="70Wv0dJjilw" resolve="originIdxRef" />
                                     </node>
-                                    <node concept="2OqwBi" id="8odmgCp7$l" role="37wK5m">
-                                      <node concept="1eOMI4" id="8odmgCp7$m" role="2Oq$k0">
-                                        <node concept="10QFUN" id="8odmgCp7$n" role="1eOMHV">
-                                          <node concept="3uibUv" id="8odmgCp7$o" role="10QFUM">
+                                    <node concept="liA8E" id="70Wv0dJjmG6" role="2OqNvi">
+                                      <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="70Wv0dJhTXX" role="2OqNvi">
+                                    <ref role="37wK5l" to="7n8k:70Wv0dJhQbd" resolve="isOrigin" />
+                                    <node concept="2OqwBi" id="70Wv0dJhTXY" role="37wK5m">
+                                      <node concept="1eOMI4" id="70Wv0dJhTXZ" role="2Oq$k0">
+                                        <node concept="10QFUN" id="70Wv0dJhTY0" role="1eOMHV">
+                                          <node concept="3uibUv" id="70Wv0dJhTY1" role="10QFUM">
                                             <ref role="3uigEE" to="6pyv:7nPD14OaO1O" resolve="RuleEx" />
                                           </node>
-                                          <node concept="37vLTw" id="8odmgCp7$p" role="10QFUP">
+                                          <node concept="37vLTw" id="70Wv0dJhTY2" role="10QFUP">
                                             <ref role="3cqZAo" node="8odmgCo4Ln" resolve="rule" />
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="liA8E" id="8odmgCp7$q" role="2OqNvi">
+                                      <node concept="liA8E" id="70Wv0dJhTY3" role="2OqNvi">
                                         <ref role="37wK5l" to="6pyv:7nPD14Ob4em" resolve="originRef" />
                                       </node>
                                     </node>
-                                    <node concept="2OqwBi" id="8odmgCoMt9" role="37wK5m">
-                                      <node concept="37vLTw" id="8odmgCoMjU" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="8odmgCo4Ll" resolve="failure" />
-                                      </node>
-                                      <node concept="liA8E" id="8odmgCoMDE" role="2OqNvi">
-                                        <ref role="37wK5l" to="w7la:~EvaluationFailure.getMessage():java.lang.String" resolve="getMessage" />
-                                      </node>
-                                    </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3cpWs6" id="8odmgCoMG0" role="3cqZAp">
-                                <node concept="10Nm6u" id="8odmgCoMHh" role="3cqZAk" />
-                              </node>
                             </node>
                             <node concept="1Wc70l" id="8odmgCp724" role="3clFbw">
-                              <node concept="2ZW3vV" id="8odmgCoLj4" role="3uHU7B">
-                                <node concept="3uibUv" id="8odmgCoLjk" role="2ZW6by">
-                                  <ref role="3uigEE" to="6pyv:7nPD14OaO1O" resolve="RuleEx" />
+                              <node concept="1Wc70l" id="6EY0p2wrMor" role="3uHU7B">
+                                <node concept="2ZW3vV" id="8odmgCoLj4" role="3uHU7w">
+                                  <node concept="3uibUv" id="8odmgCoLjk" role="2ZW6by">
+                                    <ref role="3uigEE" to="6pyv:7nPD14OaO1O" resolve="RuleEx" />
+                                  </node>
+                                  <node concept="37vLTw" id="8odmgCoL5g" role="2ZW6bz">
+                                    <ref role="3cqZAo" node="8odmgCo4Ln" resolve="rule" />
+                                  </node>
                                 </node>
-                                <node concept="37vLTw" id="8odmgCoL5g" role="2ZW6bz">
-                                  <ref role="3cqZAo" node="8odmgCo4Ln" resolve="rule" />
+                                <node concept="3y3z36" id="6EY0p2wrMwU" role="3uHU7B">
+                                  <node concept="10Nm6u" id="6EY0p2wrMxU" role="3uHU7w" />
+                                  <node concept="2OqwBi" id="6EY0p2wrMoA" role="3uHU7B">
+                                    <node concept="37vLTw" id="6EY0p2wrMoB" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="70Wv0dJjilw" resolve="originIdxRef" />
+                                    </node>
+                                    <node concept="liA8E" id="6EY0p2wrMoC" role="2OqNvi">
+                                      <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
+                                    </node>
+                                  </node>
                                 </node>
                               </node>
                               <node concept="3y3z36" id="8odmgCp7zc" role="3uHU7w">
@@ -5567,47 +5683,7 @@
       </node>
       <node concept="3Tm6S6" id="7kTeLbPnEee" role="1B3o_S" />
       <node concept="3clFbS" id="7kTeLbPnDc4" role="3clF47">
-        <node concept="3cpWs8" id="7kTeLbPnP2l" role="3cqZAp">
-          <node concept="3cpWsn" id="7kTeLbPnP2m" role="3cpWs9">
-            <property role="TrG5h" value="mainConstraint" />
-            <node concept="3uibUv" id="7kTeLbPnP2n" role="1tU5fm">
-              <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
-            </node>
-            <node concept="2OqwBi" id="7kTeLbPnP2o" role="33vP2m">
-              <node concept="2ShNRf" id="7kTeLbPnP2p" role="2Oq$k0">
-                <node concept="1pGfFk" id="7kTeLbPnP2q" role="2ShVmc">
-                  <ref role="37wK5l" to="6pyv:4sSe4$oM2rk" resolve="ConstraintBuilder" />
-                  <node concept="2YIFZM" id="7kTeLbPnP2r" role="37wK5m">
-                    <ref role="37wK5l" to="av0y:~ConstraintSymbol.symbol(java.lang.String,int):jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
-                    <ref role="1Pybhc" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
-                    <node concept="Xl_RD" id="7kTeLbPnP2s" role="37wK5m">
-                      <property role="Xl_RC" value="main" />
-                    </node>
-                    <node concept="3cmrfG" id="7kTeLbPnP2t" role="37wK5m">
-                      <property role="3cmrfH" value="0" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="liA8E" id="7kTeLbPnP2u" role="2OqNvi">
-                <ref role="37wK5l" to="6pyv:4sSe4$oM2zI" resolve="toConstraint" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6tPOoeTaVAX" role="3cqZAp">
-          <node concept="3cpWsn" id="6tPOoeTaVAY" role="3cpWs9">
-            <property role="TrG5h" value="programBuilder" />
-            <node concept="3uibUv" id="6tPOoeTaVAW" role="1tU5fm">
-              <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="LogicProgramBuilder" />
-            </node>
-            <node concept="2ShNRf" id="6tPOoeTaVAZ" role="33vP2m">
-              <node concept="1pGfFk" id="6tPOoeTaVB0" role="2ShVmc">
-                <ref role="37wK5l" to="7n8k:5rhZO$TZ9Ji" resolve="LogicProgramBuilder" />
-              </node>
-            </node>
-          </node>
-        </node>
+        <node concept="3clFbH" id="70Wv0dJiUvk" role="3cqZAp" />
         <node concept="3cpWs8" id="72RDgIN3C$C" role="3cqZAp">
           <node concept="3cpWsn" id="72RDgIN3C$D" role="3cpWs9">
             <property role="TrG5h" value="processing" />
@@ -5657,6 +5733,62 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="70Wv0dJiUG3" role="3cqZAp" />
+        <node concept="3cpWs8" id="7kTeLbPnP2l" role="3cqZAp">
+          <node concept="3cpWsn" id="7kTeLbPnP2m" role="3cpWs9">
+            <property role="TrG5h" value="mainConstraint" />
+            <node concept="3uibUv" id="7kTeLbPnP2n" role="1tU5fm">
+              <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
+            </node>
+            <node concept="2OqwBi" id="7kTeLbPnP2o" role="33vP2m">
+              <node concept="2ShNRf" id="7kTeLbPnP2p" role="2Oq$k0">
+                <node concept="1pGfFk" id="7kTeLbPnP2q" role="2ShVmc">
+                  <ref role="37wK5l" to="6pyv:4sSe4$oM2rk" resolve="ConstraintBuilder" />
+                  <node concept="2YIFZM" id="7kTeLbPnP2r" role="37wK5m">
+                    <ref role="37wK5l" to="av0y:~ConstraintSymbol.symbol(java.lang.String,int):jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
+                    <ref role="1Pybhc" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
+                    <node concept="Xl_RD" id="7kTeLbPnP2s" role="37wK5m">
+                      <property role="Xl_RC" value="main" />
+                    </node>
+                    <node concept="3cmrfG" id="7kTeLbPnP2t" role="37wK5m">
+                      <property role="3cmrfH" value="0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="7kTeLbPnP2u" role="2OqNvi">
+                <ref role="37wK5l" to="6pyv:4sSe4$oM2zI" resolve="toConstraint" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6tPOoeTaVAX" role="3cqZAp">
+          <node concept="3cpWsn" id="6tPOoeTaVAY" role="3cpWs9">
+            <property role="TrG5h" value="programBuilder" />
+            <node concept="3uibUv" id="6tPOoeTaVAW" role="1tU5fm">
+              <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="LogicProgramBuilder" />
+            </node>
+            <node concept="2ShNRf" id="6tPOoeTaVAZ" role="33vP2m">
+              <node concept="1pGfFk" id="6tPOoeTaVB0" role="2ShVmc">
+                <ref role="37wK5l" to="7n8k:5rhZO$TZ9Ji" resolve="LogicProgramBuilder" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="70Wv0dJiUi6" role="3cqZAp">
+          <node concept="3cpWsn" id="70Wv0dJiUi7" role="3cpWs9">
+            <property role="TrG5h" value="originIndex" />
+            <node concept="3uibUv" id="70Wv0dJiUi5" role="1tU5fm">
+              <ref role="3uigEE" to="7n8k:70Wv0dJhQb2" resolve="OriginIndex" />
+            </node>
+            <node concept="2ShNRf" id="70Wv0dJiUi8" role="33vP2m">
+              <node concept="HV5vD" id="70Wv0dJiUi9" role="2ShVmc">
+                <ref role="HV5vE" to="7n8k:70Wv0dJhQb2" resolve="OriginIndex" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="70Wv0dJiUP3" role="3cqZAp" />
         <node concept="3cpWs8" id="6OXbTDxQIa7" role="3cqZAp">
           <node concept="3cpWsn" id="6OXbTDxQIa8" role="3cpWs9">
             <property role="TrG5h" value="factory" />
@@ -5675,6 +5807,9 @@
                 <node concept="37vLTw" id="6tPOoeTaVB1" role="37wK5m">
                   <ref role="3cqZAo" node="6tPOoeTaVAY" resolve="programBuilder" />
                 </node>
+                <node concept="37vLTw" id="70Wv0dJiZ8h" role="37wK5m">
+                  <ref role="3cqZAo" node="70Wv0dJiUi7" resolve="originIndex" />
+                </node>
               </node>
             </node>
           </node>
@@ -5719,6 +5854,9 @@
                     <node concept="37vLTw" id="6tPOoeTb8N4" role="37wK5m">
                       <ref role="3cqZAo" node="6OXbTDxtYkB" resolve="name" />
                     </node>
+                    <node concept="37vLTw" id="70Wv0dJiUia" role="37wK5m">
+                      <ref role="3cqZAo" node="70Wv0dJiUi7" resolve="originIndex" />
+                    </node>
                   </node>
                 </node>
                 <node concept="2OqwBi" id="6tPOoeTb47l" role="37vLTJ">
@@ -5851,6 +5989,19 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbF" id="70Wv0dJiUYC" role="3cqZAp">
+            <node concept="37vLTI" id="70Wv0dJiUYE" role="3clFbG">
+              <node concept="2OqwBi" id="70Wv0dJiZ0$" role="37vLTJ">
+                <node concept="Xjq3P" id="70Wv0dJiZ73" role="2Oq$k0" />
+                <node concept="2OwXpG" id="70Wv0dJiZ0B" role="2OqNvi">
+                  <ref role="2Oxat5" node="70Wv0dJiUY$" resolve="originIndex" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="70Wv0dJiUYI" role="37vLTx">
+                <ref role="3cqZAo" node="70Wv0dJiUYa" resolve="originIndex" />
+              </node>
+            </node>
+          </node>
         </node>
         <node concept="37vLTG" id="6OXbTDxQtT2" role="3clF46">
           <property role="TrG5h" value="applicationSession" />
@@ -5870,6 +6021,12 @@
             <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="LogicProgramBuilder" />
           </node>
         </node>
+        <node concept="37vLTG" id="70Wv0dJiUYa" role="3clF46">
+          <property role="TrG5h" value="originIndex" />
+          <node concept="3uibUv" id="70Wv0dJiUYw" role="1tU5fm">
+            <ref role="3uigEE" to="7n8k:70Wv0dJhQb2" resolve="OriginIndex" />
+          </node>
+        </node>
       </node>
       <node concept="2tJIrI" id="6i42QSspmaL" role="jymVt" />
       <node concept="3clFb_" id="4QPCta1bMC1" role="jymVt">
@@ -5970,7 +6127,7 @@
                   <node concept="2OqwBi" id="4QPCta1bMCu" role="37wK5m">
                     <node concept="Xjq3P" id="4QPCta1bMCv" role="2Oq$k0" />
                     <node concept="liA8E" id="4QPCta1bMCw" role="2OqNvi">
-                      <ref role="37wK5l" node="4QPCta1aZLs" resolve="process" />
+                      <ref role="37wK5l" node="4QPCta1aZLs" resolve="processInput" />
                       <node concept="37vLTw" id="4QPCta1bMCx" role="37wK5m">
                         <ref role="3cqZAo" node="4QPCta1bMC2" resolve="input" />
                       </node>
@@ -6329,7 +6486,7 @@
       </node>
       <node concept="2tJIrI" id="7Oc59RSy_Bt" role="jymVt" />
       <node concept="3clFb_" id="4QPCta1aZLs" role="jymVt">
-        <property role="TrG5h" value="process" />
+        <property role="TrG5h" value="processInput" />
         <node concept="37vLTG" id="4QPCta1aZLt" role="3clF46">
           <property role="TrG5h" value="input" />
           <node concept="A3Dl8" id="4QPCta1bceI" role="1tU5fm">
@@ -6347,6 +6504,21 @@
         </node>
         <node concept="3Tm6S6" id="4QPCta1aZLw" role="1B3o_S" />
         <node concept="3clFbS" id="4QPCta1aZLx" role="3clF47">
+          <node concept="3clFbH" id="70Wv0dJj0jN" role="3cqZAp" />
+          <node concept="3clFbF" id="70Wv0dJiZP4" role="3cqZAp">
+            <node concept="2OqwBi" id="70Wv0dJj0hQ" role="3clFbG">
+              <node concept="37vLTw" id="70Wv0dJiZP3" role="2Oq$k0">
+                <ref role="3cqZAo" node="70Wv0dJiUY$" resolve="originIndex" />
+              </node>
+              <node concept="liA8E" id="70Wv0dJj0Ot" role="2OqNvi">
+                <ref role="37wK5l" to="7n8k:70Wv0dJj0l_" resolve="addAllOrigin" />
+                <node concept="37vLTw" id="70Wv0dJj12a" role="37wK5m">
+                  <ref role="3cqZAo" node="4QPCta1aZLt" resolve="input" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="70Wv0dJj131" role="3cqZAp" />
           <node concept="3SKdUt" id="4QPCta1aZLy" role="3cqZAp">
             <node concept="3SKdUq" id="4QPCta1aZLz" role="3SKWNk">
               <property role="3SKdUp" value="walk the AST and apply templates" />
@@ -8495,7 +8667,7 @@
             </node>
           </node>
         </node>
-        <node concept="2tJIrI" id="xaaVXvi$K0" role="jymVt" />
+        <node concept="2tJIrI" id="6EY0p2wqgRW" role="jymVt" />
         <node concept="3clFb_" id="5ntLU8GlzgF" role="jymVt">
           <property role="1EzhhJ" value="false" />
           <property role="TrG5h" value="doAction" />
@@ -8505,6 +8677,28 @@
           </node>
           <node concept="3Tm1VV" id="5ntLU8GlzgJ" role="1B3o_S" />
           <node concept="3clFbS" id="5ntLU8GlzgL" role="3clF47">
+            <node concept="3clFbJ" id="6EY0p2wqrQp" role="3cqZAp">
+              <node concept="3clFbS" id="6EY0p2wqrQr" role="3clFbx">
+                <node concept="3clFbF" id="6EY0p2wqsbo" role="3cqZAp">
+                  <node concept="2OqwBi" id="6EY0p2wqsuQ" role="3clFbG">
+                    <node concept="37vLTw" id="6EY0p2wqsbm" role="2Oq$k0">
+                      <ref role="3cqZAo" node="70Wv0dJiUY$" resolve="originIndex" />
+                    </node>
+                    <node concept="liA8E" id="6EY0p2wqsGP" role="2OqNvi">
+                      <ref role="37wK5l" to="7n8k:70Wv0dJjDa1" resolve="addProcessed" />
+                      <node concept="37vLTw" id="6EY0p2wqsQK" role="37wK5m">
+                        <ref role="3cqZAo" node="5ntLU8GlzgG" resolve="node" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3fqX7Q" id="6EY0p2wqtvV" role="3clFbw">
+                <node concept="37vLTw" id="6EY0p2wqtIN" role="3fr31v">
+                  <ref role="3cqZAo" node="xaaVXvi$LI" resolve="skipPrincipal" />
+                </node>
+              </node>
+            </node>
             <node concept="3cpWs8" id="5ntLU8GlzSI" role="3cqZAp">
               <node concept="3cpWsn" id="5ntLU8GlzSJ" role="3cpWs9">
                 <property role="TrG5h" value="tpls" />
@@ -8740,6 +8934,11 @@
           <node concept="3Tm6S6" id="xaaVXvi$LJ" role="1B3o_S" />
           <node concept="10P_77" id="xaaVXvi$LL" role="1tU5fm" />
         </node>
+        <node concept="312cEg" id="6EY0p2wqh3a" role="jymVt">
+          <property role="TrG5h" value="recordProcessed" />
+          <node concept="3Tm6S6" id="6EY0p2wqh3b" role="1B3o_S" />
+          <node concept="10P_77" id="6EY0p2wqh3d" role="1tU5fm" />
+        </node>
       </node>
       <node concept="2tJIrI" id="5ntLU8GlzbG" role="jymVt" />
       <node concept="312cEu" id="4MqhgXU$YdP" role="jymVt">
@@ -8919,6 +9118,13 @@
           <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="LogicProgramBuilder" />
         </node>
       </node>
+      <node concept="312cEg" id="70Wv0dJiUY$" role="jymVt">
+        <property role="TrG5h" value="originIndex" />
+        <node concept="3Tm6S6" id="70Wv0dJiUY_" role="1B3o_S" />
+        <node concept="3uibUv" id="70Wv0dJiUYB" role="1tU5fm">
+          <ref role="3uigEE" to="7n8k:70Wv0dJhQb2" resolve="OriginIndex" />
+        </node>
+      </node>
       <node concept="3Tm6S6" id="7DvO2M9BJbW" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="7kTeLbPfZyz" role="jymVt" />
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd b/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
index 9e296646..010058c0 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
+++ b/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
@@ -9,6 +9,8 @@
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
+    <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
+    <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
@@ -25,7 +27,11 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.program.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.program.mps
index 1dfa3b5c..9a04cab6 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.program.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.program.mps
@@ -4,6 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
   </languages>
   <imports>
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
@@ -14,9 +15,12 @@
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1219920932475" name="jetbrains.mps.baseLanguage.structure.VariableArityType" flags="in" index="8X2XB">
         <child id="1219921048460" name="componentType" index="8Xvag" />
       </concept>
@@ -72,6 +76,7 @@
       </concept>
       <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
       <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
+      <concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
@@ -239,6 +244,13 @@
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
     </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
+      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
+        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
+      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
+    </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
@@ -254,6 +266,23 @@
         <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
       </concept>
     </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
+        <child id="540871147943773366" name="argument" index="25WWJ7" />
+      </concept>
+      <concept id="1226511727824" name="jetbrains.mps.baseLanguage.collections.structure.SetType" flags="in" index="2hMVRd">
+        <child id="1226511765987" name="elementType" index="2hN53Y" />
+      </concept>
+      <concept id="1226516258405" name="jetbrains.mps.baseLanguage.collections.structure.HashSetCreator" flags="nn" index="2i4dXS" />
+      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
+        <child id="1151689745422" name="elementType" index="A3Ik2" />
+      </concept>
+      <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
+        <child id="1237721435807" name="elementType" index="HW$YZ" />
+      </concept>
+      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
+      <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
+    </language>
   </registry>
   <node concept="312cEu" id="5rhZO$TYZJM">
     <property role="TrG5h" value="LogicProgramBuilder" />
@@ -287,6 +316,12 @@
         <property role="TrG5h" value="name" />
         <node concept="17QB3L" id="5rhZO$TZiL3" role="1tU5fm" />
       </node>
+      <node concept="37vLTG" id="70Wv0dJiIGc" role="3clF46">
+        <property role="TrG5h" value="originIndex" />
+        <node concept="3uibUv" id="70Wv0dJiIGk" role="1tU5fm">
+          <ref role="3uigEE" node="70Wv0dJhQb2" resolve="OriginIndex" />
+        </node>
+      </node>
       <node concept="3uibUv" id="5rhZO$U0jE9" role="3clF45">
         <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
       </node>
@@ -341,6 +376,9 @@
               <node concept="37vLTw" id="5rhZO$TZmsR" role="37wK5m">
                 <ref role="3cqZAo" node="7eGEHDldhr$" resolve="registry" />
               </node>
+              <node concept="37vLTw" id="70Wv0dJiJjz" role="37wK5m">
+                <ref role="3cqZAo" node="70Wv0dJiIGc" resolve="originIndex" />
+              </node>
             </node>
           </node>
         </node>
@@ -661,8 +699,8 @@
   </node>
   <node concept="312cEu" id="7eGEHDlcEJ0">
     <property role="TrG5h" value="LogicProgram" />
-    <node concept="3uibUv" id="78CwJJcTnG5" role="1zkMxy">
-      <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+    <node concept="3uibUv" id="70Wv0dJiKOg" role="1zkMxy">
+      <ref role="3uigEE" node="70Wv0dJhKHy" resolve="ProgramEx" />
     </node>
     <node concept="2tJIrI" id="78CwJJd1ZwT" role="jymVt" />
     <node concept="3clFbW" id="7eGEHDlcF69" role="jymVt">
@@ -695,6 +733,12 @@
           <ref role="3uigEE" node="7eGEHDldgwf" resolve="ConstraintRegistry" />
         </node>
       </node>
+      <node concept="37vLTG" id="70Wv0dJiJjG" role="3clF46">
+        <property role="TrG5h" value="originIndex" />
+        <node concept="3uibUv" id="70Wv0dJiJjU" role="1tU5fm">
+          <ref role="3uigEE" node="70Wv0dJhQb2" resolve="OriginIndex" />
+        </node>
+      </node>
       <node concept="3cqZAl" id="7eGEHDlcF6b" role="3clF45" />
       <node concept="3clFbS" id="7eGEHDlcF6d" role="3clF47">
         <node concept="3clFbF" id="7Oc59RSE6QA" role="3cqZAp">
@@ -749,6 +793,38 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="70Wv0dJiJk1" role="3cqZAp">
+          <node concept="37vLTI" id="70Wv0dJiJk3" role="3clFbG">
+            <node concept="2OqwBi" id="70Wv0dJiKNS" role="37vLTJ">
+              <node concept="Xjq3P" id="70Wv0dJiKOd" role="2Oq$k0" />
+              <node concept="2OwXpG" id="70Wv0dJiKNV" role="2OqNvi">
+                <ref role="2Oxat5" node="70Wv0dJiJjX" resolve="originIndex" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="70Wv0dJiJk7" role="37vLTx">
+              <ref role="3cqZAo" node="70Wv0dJiJjG" resolve="originIndex" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="70Wv0dJiKOi" role="jymVt" />
+    <node concept="3clFb_" id="70Wv0dJiKW2" role="jymVt">
+      <property role="TrG5h" value="originIndex" />
+      <property role="1EzhhJ" value="false" />
+      <node concept="3uibUv" id="70Wv0dJiKW3" role="3clF45">
+        <ref role="3uigEE" node="70Wv0dJhQb2" resolve="OriginIndex" />
+      </node>
+      <node concept="3Tm1VV" id="70Wv0dJiKW4" role="1B3o_S" />
+      <node concept="3clFbS" id="70Wv0dJiKW6" role="3clF47">
+        <node concept="3clFbF" id="70Wv0dJiL0k" role="3cqZAp">
+          <node concept="37vLTw" id="70Wv0dJiL0j" role="3clFbG">
+            <ref role="3cqZAo" node="70Wv0dJiJjX" resolve="originIndex" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="70Wv0dJiKW7" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="4MqhgXURXJo" role="jymVt" />
@@ -1233,6 +1309,13 @@
         <ref role="3uigEE" node="7eGEHDldgwf" resolve="ConstraintRegistry" />
       </node>
     </node>
+    <node concept="312cEg" id="70Wv0dJiJjX" role="jymVt">
+      <property role="TrG5h" value="originIndex" />
+      <node concept="3Tm6S6" id="70Wv0dJiJjY" role="1B3o_S" />
+      <node concept="3uibUv" id="70Wv0dJiJk0" role="1tU5fm">
+        <ref role="3uigEE" node="70Wv0dJhQb2" resolve="OriginIndex" />
+      </node>
+    </node>
     <node concept="3Tm1VV" id="7nPD14O5B_4" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="7eGEHDldgwf">
@@ -2696,5 +2779,262 @@
     <node concept="2tJIrI" id="4TCblo5NlYH" role="jymVt" />
     <node concept="3Tm1VV" id="677NV565N1y" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="70Wv0dJhKHy">
+    <property role="TrG5h" value="ProgramEx" />
+    <property role="1sVAO0" value="true" />
+    <node concept="2tJIrI" id="70Wv0dJhKHK" role="jymVt" />
+    <node concept="3clFbW" id="70Wv0dJhKHT" role="jymVt">
+      <node concept="3cqZAl" id="70Wv0dJhKHV" role="3clF45" />
+      <node concept="3Tm1VV" id="70Wv0dJhKHW" role="1B3o_S" />
+      <node concept="3clFbS" id="70Wv0dJhKHX" role="3clF47">
+        <node concept="XkiVB" id="70Wv0dJhKId" role="3cqZAp">
+          <ref role="37wK5l" to="av0y:~Program.&lt;init&gt;()" resolve="Program" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="70Wv0dJhKIL" role="jymVt" />
+    <node concept="3clFb_" id="70Wv0dJhKJo" role="jymVt">
+      <property role="TrG5h" value="originIndex" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="3uibUv" id="70Wv0dJhQbP" role="3clF45">
+        <ref role="3uigEE" node="70Wv0dJhQb2" resolve="OriginIndex" />
+      </node>
+      <node concept="3Tm1VV" id="70Wv0dJhKJr" role="1B3o_S" />
+      <node concept="3clFbS" id="70Wv0dJhKJs" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="70Wv0dJhKHP" role="jymVt" />
+    <node concept="3Tm1VV" id="70Wv0dJhKHz" role="1B3o_S" />
+    <node concept="3uibUv" id="70Wv0dJhKHC" role="1zkMxy">
+      <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+    </node>
+  </node>
+  <node concept="312cEu" id="70Wv0dJhQb2">
+    <property role="TrG5h" value="OriginIndex" />
+    <node concept="2tJIrI" id="70Wv0dJhQb4" role="jymVt" />
+    <node concept="3clFb_" id="70Wv0dJhQbd" role="jymVt">
+      <property role="TrG5h" value="isOrigin" />
+      <node concept="37vLTG" id="70Wv0dJhQbs" role="3clF46">
+        <property role="TrG5h" value="ref" />
+        <node concept="2sp9CU" id="70Wv0dJhQbw" role="1tU5fm" />
+      </node>
+      <node concept="10P_77" id="70Wv0dJhQbp" role="3clF45" />
+      <node concept="3Tm1VV" id="70Wv0dJhQbg" role="1B3o_S" />
+      <node concept="3clFbS" id="70Wv0dJhQbh" role="3clF47">
+        <node concept="3clFbF" id="70Wv0dJk3YO" role="3cqZAp">
+          <node concept="22lmx$" id="70Wv0dJk6g2" role="3clFbG">
+            <node concept="2OqwBi" id="70Wv0dJk7pt" role="3uHU7w">
+              <node concept="37vLTw" id="70Wv0dJk6hD" role="2Oq$k0">
+                <ref role="3cqZAo" node="70Wv0dJjR_A" resolve="processedOriginRefs" />
+              </node>
+              <node concept="3JPx81" id="70Wv0dJk8uu" role="2OqNvi">
+                <node concept="37vLTw" id="70Wv0dJk8Ec" role="25WWJ7">
+                  <ref role="3cqZAo" node="70Wv0dJhQbs" resolve="ref" />
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="70Wv0dJk4Ke" role="3uHU7B">
+              <node concept="37vLTw" id="70Wv0dJk3YN" role="2Oq$k0">
+                <ref role="3cqZAo" node="70Wv0dJjMTf" resolve="originRefs" />
+              </node>
+              <node concept="3JPx81" id="70Wv0dJk5KL" role="2OqNvi">
+                <node concept="37vLTw" id="70Wv0dJk5Vx" role="25WWJ7">
+                  <ref role="3cqZAo" node="70Wv0dJhQbs" resolve="ref" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="70Wv0dJhQb9" role="jymVt" />
+    <node concept="3clFb_" id="70Wv0dJj0l7" role="jymVt">
+      <property role="TrG5h" value="addOrigin" />
+      <node concept="37vLTG" id="70Wv0dJj0ls" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="70Wv0dJj0ly" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="70Wv0dJj0l9" role="3clF45" />
+      <node concept="3Tm1VV" id="70Wv0dJj0la" role="1B3o_S" />
+      <node concept="3clFbS" id="70Wv0dJj0lb" role="3clF47">
+        <node concept="3clFbF" id="70Wv0dJjIU2" role="3cqZAp">
+          <node concept="2OqwBi" id="70Wv0dJjKVZ" role="3clFbG">
+            <node concept="37vLTw" id="70Wv0dJk0$2" role="2Oq$k0">
+              <ref role="3cqZAo" node="70Wv0dJjMTf" resolve="originRefs" />
+            </node>
+            <node concept="TSZUe" id="70Wv0dJjMCE" role="2OqNvi">
+              <node concept="2OqwBi" id="70Wv0dJk1wt" role="25WWJ7">
+                <node concept="2JrnkZ" id="70Wv0dJk1eT" role="2Oq$k0">
+                  <node concept="37vLTw" id="70Wv0dJjMRB" role="2JrQYb">
+                    <ref role="3cqZAo" node="70Wv0dJj0ls" resolve="node" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="70Wv0dJk23L" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="70Wv0dJj0m2" role="jymVt" />
+    <node concept="3clFb_" id="70Wv0dJj0l_" role="jymVt">
+      <property role="TrG5h" value="addAllOrigin" />
+      <node concept="37vLTG" id="70Wv0dJj0lA" role="3clF46">
+        <property role="TrG5h" value="nodes" />
+        <node concept="A3Dl8" id="70Wv0dJj0mv" role="1tU5fm">
+          <node concept="3Tqbb2" id="70Wv0dJj0mw" role="A3Ik2" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="70Wv0dJj0lC" role="3clF45" />
+      <node concept="3Tm1VV" id="70Wv0dJj0lD" role="1B3o_S" />
+      <node concept="3clFbS" id="70Wv0dJj0lE" role="3clF47">
+        <node concept="1DcWWT" id="70Wv0dJkbgr" role="3cqZAp">
+          <node concept="3clFbS" id="70Wv0dJkbgu" role="2LFqv$">
+            <node concept="3clFbF" id="70Wv0dJjFnm" role="3cqZAp">
+              <node concept="2OqwBi" id="70Wv0dJjGd4" role="3clFbG">
+                <node concept="37vLTw" id="70Wv0dJk2zg" role="2Oq$k0">
+                  <ref role="3cqZAo" node="70Wv0dJjMTf" resolve="originRefs" />
+                </node>
+                <node concept="TSZUe" id="70Wv0dJkd05" role="2OqNvi">
+                  <node concept="2OqwBi" id="70Wv0dJk23O" role="25WWJ7">
+                    <node concept="2JrnkZ" id="70Wv0dJk23P" role="2Oq$k0">
+                      <node concept="37vLTw" id="70Wv0dJkeOD" role="2JrQYb">
+                        <ref role="3cqZAo" node="70Wv0dJkbgv" resolve="n" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="70Wv0dJk23R" role="2OqNvi">
+                      <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="70Wv0dJkbgv" role="1Duv9x">
+            <property role="TrG5h" value="n" />
+            <node concept="3Tqbb2" id="70Wv0dJkbgz" role="1tU5fm" />
+          </node>
+          <node concept="37vLTw" id="70Wv0dJkbg$" role="1DdaDG">
+            <ref role="3cqZAo" node="70Wv0dJj0lA" resolve="nodes" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="70Wv0dJjD99" role="jymVt" />
+    <node concept="3clFb_" id="70Wv0dJjDa1" role="jymVt">
+      <property role="TrG5h" value="addProcessed" />
+      <node concept="37vLTG" id="70Wv0dJjDa_" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="70Wv0dJjDaK" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="70Wv0dJjDa3" role="3clF45" />
+      <node concept="3Tm1VV" id="70Wv0dJjDa4" role="1B3o_S" />
+      <node concept="3clFbS" id="70Wv0dJjDa5" role="3clF47">
+        <node concept="3clFbF" id="70Wv0dJjXxv" role="3cqZAp">
+          <node concept="2OqwBi" id="70Wv0dJjY4G" role="3clFbG">
+            <node concept="37vLTw" id="70Wv0dJjXxu" role="2Oq$k0">
+              <ref role="3cqZAo" node="70Wv0dJjR_A" resolve="processedOriginRefs" />
+            </node>
+            <node concept="TSZUe" id="70Wv0dJkdpd" role="2OqNvi">
+              <node concept="2OqwBi" id="70Wv0dJkdp9" role="25WWJ7">
+                <node concept="2JrnkZ" id="70Wv0dJkdpa" role="2Oq$k0">
+                  <node concept="37vLTw" id="70Wv0dJkdpb" role="2JrQYb">
+                    <ref role="3cqZAo" node="70Wv0dJjDa_" resolve="node" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="70Wv0dJkdpc" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="70Wv0dJjMWX" role="jymVt" />
+    <node concept="3clFb_" id="70Wv0dJjMVT" role="jymVt">
+      <property role="TrG5h" value="addAllProcessed" />
+      <node concept="37vLTG" id="70Wv0dJjMVU" role="3clF46">
+        <property role="TrG5h" value="nodes" />
+        <node concept="A3Dl8" id="70Wv0dJjMY1" role="1tU5fm">
+          <node concept="3Tqbb2" id="70Wv0dJjMY2" role="A3Ik2" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="70Wv0dJjMVW" role="3clF45" />
+      <node concept="3Tm1VV" id="70Wv0dJjMVX" role="1B3o_S" />
+      <node concept="3clFbS" id="70Wv0dJjMVY" role="3clF47">
+        <node concept="1DcWWT" id="70Wv0dJjOpF" role="3cqZAp">
+          <node concept="3clFbS" id="70Wv0dJjOpI" role="2LFqv$">
+            <node concept="3cpWs8" id="70Wv0dJjVpL" role="3cqZAp">
+              <node concept="3cpWsn" id="70Wv0dJjVpM" role="3cpWs9">
+                <property role="TrG5h" value="ref" />
+                <node concept="3uibUv" id="70Wv0dJjVpF" role="1tU5fm">
+                  <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+                </node>
+                <node concept="2OqwBi" id="70Wv0dJjVpN" role="33vP2m">
+                  <node concept="2JrnkZ" id="70Wv0dJjVpO" role="2Oq$k0">
+                    <node concept="37vLTw" id="70Wv0dJk0p4" role="2JrQYb">
+                      <ref role="3cqZAo" node="70Wv0dJjOpJ" resolve="n" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="70Wv0dJjVpQ" role="2OqNvi">
+                    <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="70Wv0dJjVCn" role="3cqZAp">
+              <node concept="2OqwBi" id="70Wv0dJjWfE" role="3clFbG">
+                <node concept="37vLTw" id="70Wv0dJjVCl" role="2Oq$k0">
+                  <ref role="3cqZAo" node="70Wv0dJjR_A" resolve="processedOriginRefs" />
+                </node>
+                <node concept="TSZUe" id="70Wv0dJkfUm" role="2OqNvi">
+                  <node concept="37vLTw" id="70Wv0dJkfUl" role="25WWJ7">
+                    <ref role="3cqZAo" node="70Wv0dJjVpM" resolve="ref" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="70Wv0dJjOpJ" role="1Duv9x">
+            <property role="TrG5h" value="n" />
+            <node concept="3Tqbb2" id="70Wv0dJjOpN" role="1tU5fm" />
+          </node>
+          <node concept="37vLTw" id="70Wv0dJjOpO" role="1DdaDG">
+            <ref role="3cqZAo" node="70Wv0dJjMVU" resolve="nodes" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="70Wv0dJk25C" role="jymVt" />
+    <node concept="312cEg" id="70Wv0dJjMTf" role="jymVt">
+      <property role="TrG5h" value="originRefs" />
+      <node concept="3Tm6S6" id="70Wv0dJjMTg" role="1B3o_S" />
+      <node concept="2hMVRd" id="70Wv0dJjMUm" role="1tU5fm">
+        <node concept="2sp9CU" id="70Wv0dJjMUu" role="2hN53Y" />
+      </node>
+      <node concept="2ShNRf" id="70Wv0dJjMVO" role="33vP2m">
+        <node concept="2i4dXS" id="70Wv0dJjMVe" role="2ShVmc">
+          <node concept="2sp9CU" id="70Wv0dJjMVf" role="HW$YZ" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="70Wv0dJk2zj" role="jymVt" />
+    <node concept="312cEg" id="70Wv0dJjR_A" role="jymVt">
+      <property role="TrG5h" value="processedOriginRefs" />
+      <node concept="3Tm6S6" id="70Wv0dJjR_B" role="1B3o_S" />
+      <node concept="2hMVRd" id="70Wv0dJjR_C" role="1tU5fm">
+        <node concept="2sp9CU" id="70Wv0dJjR_D" role="2hN53Y" />
+      </node>
+      <node concept="2ShNRf" id="70Wv0dJjR_E" role="33vP2m">
+        <node concept="2i4dXS" id="70Wv0dJjR_F" role="2ShVmc">
+          <node concept="2sp9CU" id="70Wv0dJjR_G" role="HW$YZ" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="70Wv0dJjEJM" role="jymVt" />
+    <node concept="3Tm1VV" id="70Wv0dJhQb3" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
index 53bf4c87..f5164735 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
@@ -495,6 +495,18 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="70Wv0dJkDFs" role="3bR37C">
+          <node concept="3bR9La" id="70Wv0dJkDFt" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="70Wv0dJkDFu" role="3bR37C">
+          <node concept="3bR9La" id="70Wv0dJkDFv" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="7BVjoXzUxkQ" role="2G$12L">
         <property role="BnDLt" value="true" />