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 85131c3e..acad30a5 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
@@ -529,6 +529,12 @@
           <ref role="3uigEE" node="3GlpCDSxTG7" resolve="ProgramProducer" />
         </node>
       </node>
+      <node concept="37vLTG" id="5tAk4yVOEzr" role="3clF46">
+        <property role="TrG5h" value="programSpec" />
+        <node concept="3uibUv" id="5tAk4yVOG6V" role="1tU5fm">
+          <ref role="3uigEE" to="av0y:~IncrementalProgramSpec" resolve="IncrementalProgramSpec" />
+        </node>
+      </node>
       <node concept="37vLTG" id="3o9wrC3sOnz" role="3clF46">
         <property role="TrG5h" value="supervisor" />
         <node concept="3uibUv" id="3o9wrC3sPQg" role="1tU5fm">
@@ -784,13 +790,8 @@
               </node>
               <node concept="liA8E" id="7eQMSyza5cw" role="2OqNvi">
                 <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withIncrSpec(jetbrains.mps.logic.reactor.program.IncrementalProgramSpec)" resolve="withIncrSpec" />
-                <node concept="2OqwBi" id="7eQMSyza5vp" role="37wK5m">
-                  <node concept="37vLTw" id="7eQMSyza5fZ" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7lt0LtQtD2v" resolve="programProducer" />
-                  </node>
-                  <node concept="liA8E" id="7eQMSyza5DB" role="2OqNvi">
-                    <ref role="37wK5l" node="1H_6AUT8p2f" resolve="getProgramSpec" />
-                  </node>
+                <node concept="37vLTw" id="5tAk4yVOGST" role="37wK5m">
+                  <ref role="3cqZAo" node="5tAk4yVOEzr" resolve="programSpec" />
                 </node>
               </node>
             </node>
@@ -4308,26 +4309,6 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="1H_6AUT8pE9" role="jymVt" />
-    <node concept="3clFb_" id="1H_6AUT8p2f" role="jymVt">
-      <property role="TrG5h" value="getProgramSpec" />
-      <node concept="3clFbS" id="1H_6AUT8p2i" role="3clF47">
-        <node concept="3clFbF" id="3L0F0kb7I5C" role="3cqZAp">
-          <node concept="2OqwBi" id="3L0F0kb7IfV" role="3clFbG">
-            <node concept="37vLTw" id="3L0F0kb7I5A" role="2Oq$k0">
-              <ref role="3cqZAo" node="7WKNeR9bpBf" resolve="ruleProcessingSession" />
-            </node>
-            <node concept="liA8E" id="3L0F0kb7LCU" role="2OqNvi">
-              <ref role="37wK5l" node="2WtKs4tZfgb" resolve="programSpec" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="1H_6AUT8oyw" role="1B3o_S" />
-      <node concept="3uibUv" id="1H_6AUT8p0g" role="3clF45">
-        <ref role="3uigEE" to="av0y:~IncrementalProgramSpec" resolve="IncrementalProgramSpec" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="6OXbTDxQQYI" role="jymVt" />
     <node concept="3clFb_" id="7kTeLbPnDc0" role="jymVt">
       <property role="TrG5h" value="doProduce" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
index 00186c99..e5809907 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
@@ -860,6 +860,24 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="5tAk4yVPpUQ" role="3cqZAp">
+          <node concept="37vLTI" id="5tAk4yVPr1B" role="3clFbG">
+            <node concept="2OqwBi" id="5tAk4yVPrzY" role="37vLTx">
+              <node concept="37vLTw" id="5tAk4yVPr90" role="2Oq$k0">
+                <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
+              </node>
+              <node concept="liA8E" id="5tAk4yVPrH1" role="2OqNvi">
+                <ref role="37wK5l" to="hano:2WtKs4tZfgb" resolve="programSpec" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="5tAk4yVPql3" role="37vLTJ">
+              <node concept="Xjq3P" id="5tAk4yVPpUO" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5tAk4yVPqFD" role="2OqNvi">
+                <ref role="2Oxat5" node="5tAk4yVPcZJ" resolve="progSpec" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="tyIfzC1OO3" role="3cqZAp">
           <node concept="37vLTI" id="tyIfzC1PST" role="3clFbG">
             <node concept="2OqwBi" id="tyIfzC1P5D" role="37vLTJ">
@@ -1204,13 +1222,8 @@
             <node concept="2ShNRf" id="3o9wrC3WGRN" role="33vP2m">
               <node concept="1pGfFk" id="5rVYEA66sG1" role="2ShVmc">
                 <ref role="37wK5l" to="hano:3o9wrC3VMfB" resolve="PrincipalNodeReportingSupervisor" />
-                <node concept="2OqwBi" id="3o9wrC3WGRP" role="37wK5m">
-                  <node concept="37vLTw" id="3o9wrC3WGRQ" role="2Oq$k0">
-                    <ref role="3cqZAo" node="tyIfzC1aUL" resolve="tplApp" />
-                  </node>
-                  <node concept="liA8E" id="3o9wrC3WIH9" role="2OqNvi">
-                    <ref role="37wK5l" to="hano:1H_6AUT8p2f" resolve="getProgramSpec" />
-                  </node>
+                <node concept="37vLTw" id="5tAk4yVPfYq" role="37wK5m">
+                  <ref role="3cqZAo" node="5tAk4yVPcZJ" resolve="progSpec" />
                 </node>
                 <node concept="37vLTw" id="WJTIIp8IAA" role="37wK5m">
                   <ref role="3cqZAo" node="WJTIIp8A0t" resolve="failuresSink" />
@@ -1242,6 +1255,9 @@
                     <node concept="37vLTw" id="3o9wrC3u78G" role="37wK5m">
                       <ref role="3cqZAo" node="tyIfzC1aUL" resolve="tplApp" />
                     </node>
+                    <node concept="37vLTw" id="5tAk4yVPgxV" role="37wK5m">
+                      <ref role="3cqZAo" node="5tAk4yVPcZJ" resolve="progSpec" />
+                    </node>
                     <node concept="37vLTw" id="6fTgyZtNj3o" role="37wK5m">
                       <ref role="3cqZAo" node="3o9wrC3WGRL" resolve="supervisor" />
                     </node>
@@ -1324,7 +1340,7 @@
       <node concept="3Tm1VV" id="tyIfzC0ZRn" role="1B3o_S" />
       <node concept="3cqZAl" id="WJTIIp9nlW" role="3clF45" />
     </node>
-    <node concept="2tJIrI" id="WJTIIoY_Uc" role="jymVt" />
+    <node concept="2tJIrI" id="5tAk4yVPiyZ" role="jymVt" />
     <node concept="3clFb_" id="WJTIIoYKsF" role="jymVt">
       <property role="TrG5h" value="findInvalidNodes" />
       <node concept="3clFbS" id="WJTIIoYKsI" role="3clF47">
@@ -1942,13 +1958,8 @@
       <property role="TrG5h" value="getProgramSpec" />
       <node concept="3clFbS" id="4VntlICnjoG" role="3clF47">
         <node concept="3clFbF" id="4VntlICnlgK" role="3cqZAp">
-          <node concept="2OqwBi" id="4VntlICnlp2" role="3clFbG">
-            <node concept="37vLTw" id="4VntlICnlgJ" role="2Oq$k0">
-              <ref role="3cqZAo" node="tyIfzC1aUL" resolve="tplApp" />
-            </node>
-            <node concept="liA8E" id="4VntlICnn4v" role="2OqNvi">
-              <ref role="37wK5l" to="hano:1H_6AUT8p2f" resolve="getProgramSpec" />
-            </node>
+          <node concept="37vLTw" id="5tAk4yVPpgW" role="3clFbG">
+            <ref role="3cqZAo" node="5tAk4yVPcZJ" resolve="progSpec" />
           </node>
         </node>
       </node>
@@ -2018,6 +2029,17 @@
         <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
       </node>
     </node>
+    <node concept="312cEg" id="5tAk4yVPcZJ" role="jymVt">
+      <property role="TrG5h" value="progSpec" />
+      <node concept="3Tm6S6" id="5tAk4yVPb4N" role="1B3o_S" />
+      <node concept="3uibUv" id="5tAk4yVPcK3" role="1tU5fm">
+        <ref role="3uigEE" to="av0y:~IncrementalProgramSpec" resolve="IncrementalProgramSpec" />
+      </node>
+      <node concept="10M0yZ" id="5tAk4yVPfhN" role="33vP2m">
+        <ref role="1PxDUh" to="av0y:~IncrementalProgramSpec" resolve="IncrementalProgramSpec" />
+        <ref role="3cqZAo" to="av0y:~IncrementalProgramSpec.DefaultSpec" resolve="DefaultSpec" />
+      </node>
+    </node>
     <node concept="312cEg" id="tyIfzC1aUL" role="jymVt">
       <property role="TrG5h" value="tplApp" />
       <node concept="3Tm6S6" id="tyIfzC1aT5" role="1B3o_S" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
index e6574784..37530b86 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
@@ -1448,6 +1448,14 @@
                           <node concept="37vLTw" id="7eQMSyzaBa7" role="37wK5m">
                             <ref role="3cqZAo" node="6$7vuu2ugt3" resolve="tplApp" />
                           </node>
+                          <node concept="2OqwBi" id="5tAk4yVPvtF" role="37wK5m">
+                            <node concept="37vLTw" id="5tAk4yVPuSd" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
+                            </node>
+                            <node concept="liA8E" id="5tAk4yVPvXG" role="2OqNvi">
+                              <ref role="37wK5l" to="hano:2WtKs4tZfgb" resolve="programSpec" />
+                            </node>
+                          </node>
                           <node concept="37vLTw" id="3o9wrC3u6jn" role="37wK5m">
                             <ref role="3cqZAo" node="3o9wrC3tYXa" resolve="supervisor" />
                           </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
index 34dc6071..756d1d52 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
@@ -3312,33 +3312,58 @@
               </node>
             </node>
           </node>
+          <node concept="3cpWs8" id="5tAk4yVTBui" role="3cqZAp">
+            <node concept="3cpWsn" id="5tAk4yVTBuj" role="3cpWs9">
+              <property role="TrG5h" value="tcStep" />
+              <property role="3TUv4t" value="true" />
+              <node concept="3uibUv" id="5tAk4yVTBuk" role="1tU5fm">
+                <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+              </node>
+              <node concept="3K4zz7" id="7WKNeR8TcYc" role="33vP2m">
+                <node concept="37vLTw" id="7WKNeR8TcYd" role="3K4Cdx">
+                  <ref role="3cqZAo" node="6hqFpWnjd0A" resolve="trace" />
+                </node>
+                <node concept="2ShNRf" id="7WKNeR8TcYe" role="3K4GZi">
+                  <node concept="1pGfFk" id="7WKNeR8TcYf" role="2ShVmc">
+                    <ref role="37wK5l" to="tj24:3KN3A4vHiEF" resolve="TypecheckingStep" />
+                    <node concept="37vLTw" id="7WKNeR8TiOp" role="37wK5m">
+                      <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
+                    </node>
+                    <node concept="10Nm6u" id="5gVsyvFbxl6" role="37wK5m" />
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="7WKNeR8TcYh" role="3K4E3e">
+                  <node concept="1pGfFk" id="7WKNeR8TcYi" role="2ShVmc">
+                    <ref role="37wK5l" node="55Q$YFtIVZ9" resolve="TypecheckingWithTraceStep" />
+                    <node concept="37vLTw" id="7WKNeR8Ti$q" role="37wK5m">
+                      <ref role="3cqZAo" node="6hqFpWnfwwm" resolve="editorComponent" />
+                    </node>
+                    <node concept="37vLTw" id="7WKNeR8TcYk" role="37wK5m">
+                      <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="3clFbF" id="7WKNeR8TcY8" role="3cqZAp">
             <node concept="2OqwBi" id="7WKNeR8TcY9" role="3clFbG">
               <node concept="37vLTw" id="7WKNeR8TcYa" role="2Oq$k0">
                 <ref role="3cqZAo" node="7WKNeR8TcXs" resolve="steps" />
               </node>
               <node concept="TSZUe" id="7WKNeR8TcYb" role="2OqNvi">
-                <node concept="3K4zz7" id="7WKNeR8TcYc" role="25WWJ7">
-                  <node concept="37vLTw" id="7WKNeR8TcYd" role="3K4Cdx">
-                    <ref role="3cqZAo" node="6hqFpWnjd0A" resolve="trace" />
+                <node concept="2OqwBi" id="5tAk4yVTE76" role="25WWJ7">
+                  <node concept="37vLTw" id="5tAk4yVTD2S" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5tAk4yVTBuj" resolve="tcStep" />
                   </node>
-                  <node concept="2ShNRf" id="7WKNeR8TcYe" role="3K4GZi">
-                    <node concept="1pGfFk" id="7WKNeR8TcYf" role="2ShVmc">
-                      <ref role="37wK5l" to="tj24:3KN3A4vHiEF" resolve="TypecheckingStep" />
-                      <node concept="37vLTw" id="7WKNeR8TiOp" role="37wK5m">
-                        <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
+                  <node concept="liA8E" id="5tAk4yVTxg2" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:5tAk4yVSZ1V" resolve="withProgramSpec" />
+                    <node concept="2OqwBi" id="5tAk4yVTy59" role="37wK5m">
+                      <node concept="37vLTw" id="5tAk4yVTxAu" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6nFpYluoeMV" resolve="session" />
                       </node>
-                      <node concept="10Nm6u" id="5gVsyvFbxl6" role="37wK5m" />
-                    </node>
-                  </node>
-                  <node concept="2ShNRf" id="7WKNeR8TcYh" role="3K4E3e">
-                    <node concept="1pGfFk" id="7WKNeR8TcYi" role="2ShVmc">
-                      <ref role="37wK5l" node="55Q$YFtIVZ9" resolve="TypecheckingWithTraceStep" />
-                      <node concept="37vLTw" id="7WKNeR8Ti$q" role="37wK5m">
-                        <ref role="3cqZAo" node="6hqFpWnfwwm" resolve="editorComponent" />
-                      </node>
-                      <node concept="37vLTw" id="7WKNeR8TcYk" role="37wK5m">
-                        <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
+                      <node concept="liA8E" id="5tAk4yVTyvs" role="2OqNvi">
+                        <ref role="37wK5l" to="hano:2WtKs4tZfgb" resolve="programSpec" />
                       </node>
                     </node>
                   </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index ad3e4030..87754e36 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -5059,8 +5059,39 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="RZQG98W$p$" role="jymVt" />
-    <node concept="2tJIrI" id="q1hCixVZkL" role="jymVt" />
+    <node concept="2tJIrI" id="5tAk4yVSOYv" role="jymVt" />
+    <node concept="3clFb_" id="5tAk4yVSZ1V" role="jymVt">
+      <property role="TrG5h" value="withProgramSpec" />
+      <node concept="3clFbS" id="5tAk4yVSZ1X" role="3clF47">
+        <node concept="3clFbF" id="5tAk4yVSZ1Y" role="3cqZAp">
+          <node concept="37vLTI" id="5tAk4yVSZ1Z" role="3clFbG">
+            <node concept="37vLTw" id="5tAk4yVSZ20" role="37vLTx">
+              <ref role="3cqZAo" node="5tAk4yVSZ28" resolve="progSpec" />
+            </node>
+            <node concept="2OqwBi" id="5tAk4yVSZ21" role="37vLTJ">
+              <node concept="Xjq3P" id="5tAk4yVSZ22" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5tAk4yVSZ23" role="2OqNvi">
+                <ref role="2Oxat5" node="5tAk4yVRB0S" resolve="progSpec" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="5tAk4yVT1pU" role="3cqZAp">
+          <node concept="Xjq3P" id="5tAk4yVT1rD" role="3cqZAk" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="5tAk4yVSZ27" role="3clF45">
+        <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
+      </node>
+      <node concept="37vLTG" id="5tAk4yVSZ28" role="3clF46">
+        <property role="TrG5h" value="progSpec" />
+        <node concept="3uibUv" id="5tAk4yVSZ29" role="1tU5fm">
+          <ref role="3uigEE" to="av0y:~IncrementalProgramSpec" resolve="IncrementalProgramSpec" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5tAk4yVSZ26" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="5tAk4yVRV8k" role="jymVt" />
     <node concept="3clFb_" id="RZQG98YN6h" role="jymVt">
       <property role="TrG5h" value="schedule" />
       <node concept="37vLTG" id="RZQG98YN6i" role="3clF46">
@@ -5253,24 +5284,83 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="3cpWs6" id="51ek2rQPAle" role="3cqZAp">
-                        <node concept="2YIFZM" id="51ek2rQPCrK" role="3cqZAk">
-                          <ref role="37wK5l" to="1yqb:6BMBBPCUL2C" resolve="of" />
-                          <ref role="1Pybhc" to="1yqb:2daneBOWXQd" resolve="Effect" />
-                          <node concept="2OqwBi" id="51ek2rQPCrL" role="37wK5m">
-                            <node concept="10M0yZ" id="51ek2rQPCrM" role="2Oq$k0">
-                              <ref role="1PxDUh" to="1yqb:RZQG98UNsT" resolve="ConfigureEvalStep" />
-                              <ref role="3cqZAo" to="1yqb:RZQG98Ve3Q" resolve="TRACE" />
-                            </node>
-                            <node concept="liA8E" id="51ek2rQPCrN" role="2OqNvi">
-                              <ref role="37wK5l" to="1yqb:6BMBBPCRIcz" resolve="is" />
-                              <node concept="37vLTw" id="51ek2rQPCrO" role="37wK5m">
-                                <ref role="3cqZAo" node="51ek2rQxWIe" resolve="evtrace" />
+                      <node concept="3clFbH" id="5tAk4yVRnQX" role="3cqZAp" />
+                      <node concept="3cpWs8" id="5tAk4yVSjzM" role="3cqZAp">
+                        <node concept="3cpWsn" id="5tAk4yVSjzN" role="3cpWs9">
+                          <property role="TrG5h" value="outEff" />
+                          <node concept="3uibUv" id="5tAk4yVSjzO" role="1tU5fm">
+                            <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                          </node>
+                          <node concept="2YIFZM" id="51ek2rQPCrK" role="33vP2m">
+                            <ref role="37wK5l" to="1yqb:6BMBBPCUL2C" resolve="of" />
+                            <ref role="1Pybhc" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                            <node concept="2OqwBi" id="51ek2rQPCrL" role="37wK5m">
+                              <node concept="10M0yZ" id="51ek2rQPCrM" role="2Oq$k0">
+                                <ref role="1PxDUh" to="1yqb:RZQG98UNsT" resolve="ConfigureEvalStep" />
+                                <ref role="3cqZAo" to="1yqb:RZQG98Ve3Q" resolve="TRACE" />
+                              </node>
+                              <node concept="liA8E" id="51ek2rQPCrN" role="2OqNvi">
+                                <ref role="37wK5l" to="1yqb:6BMBBPCRIcz" resolve="is" />
+                                <node concept="37vLTw" id="51ek2rQPCrO" role="37wK5m">
+                                  <ref role="3cqZAo" node="51ek2rQxWIe" resolve="evtrace" />
+                                </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
+                      <node concept="3clFbJ" id="5tAk4yVSrvQ" role="3cqZAp">
+                        <node concept="3clFbS" id="5tAk4yVSrvS" role="3clFbx">
+                          <node concept="3clFbF" id="5tAk4yVSwzK" role="3cqZAp">
+                            <node concept="37vLTI" id="5tAk4yVSxWh" role="3clFbG">
+                              <node concept="37vLTw" id="5tAk4yVSwzI" role="37vLTJ">
+                                <ref role="3cqZAo" node="5tAk4yVSjzN" resolve="outEff" />
+                              </node>
+                              <node concept="2OqwBi" id="5tAk4yVQS_a" role="37vLTx">
+                                <node concept="liA8E" id="5tAk4yVQTL9" role="2OqNvi">
+                                  <ref role="37wK5l" to="1yqb:51ek2rQD9Pw" resolve="compose" />
+                                  <node concept="1bVj0M" id="5tAk4yVR1Jk" role="37wK5m">
+                                    <node concept="3clFbS" id="5tAk4yVR1Jl" role="1bW5cS">
+                                      <node concept="3clFbF" id="5tAk4yVR2Ns" role="3cqZAp">
+                                        <node concept="2YIFZM" id="5tAk4yVRlsW" role="3clFbG">
+                                          <ref role="1Pybhc" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                                          <ref role="37wK5l" to="1yqb:6BMBBPCUL2C" resolve="of" />
+                                          <node concept="2OqwBi" id="5tAk4yVQYm4" role="37wK5m">
+                                            <node concept="10M0yZ" id="5tAk4yVQXfR" role="2Oq$k0">
+                                              <ref role="3cqZAo" to="1yqb:5tAk4yVOMI9" resolve="PROGRAM_SPEC" />
+                                              <ref role="1PxDUh" to="1yqb:RZQG98UNsT" resolve="ConfigureEvalStep" />
+                                            </node>
+                                            <node concept="liA8E" id="5tAk4yVQZDO" role="2OqNvi">
+                                              <ref role="37wK5l" to="1yqb:6BMBBPCRIcz" resolve="is" />
+                                              <node concept="37vLTw" id="5tAk4yVRP0o" role="37wK5m">
+                                                <ref role="3cqZAo" node="5tAk4yVRB0S" resolve="progSpec" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="37vLTw" id="5tAk4yVSz57" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="5tAk4yVSjzN" resolve="outEff" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3y3z36" id="5tAk4yVSueI" role="3clFbw">
+                          <node concept="10Nm6u" id="5tAk4yVSvhG" role="3uHU7w" />
+                          <node concept="37vLTw" id="5tAk4yVSsQX" role="3uHU7B">
+                            <ref role="3cqZAo" node="5tAk4yVRB0S" resolve="progSpec" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3cpWs6" id="51ek2rQPAle" role="3cqZAp">
+                        <node concept="37vLTw" id="5tAk4yVSHqx" role="3cqZAk">
+                          <ref role="3cqZAo" node="5tAk4yVSjzN" resolve="outEff" />
+                        </node>
+                      </node>
                       <node concept="3clFbH" id="51ek2rQPKju" role="3cqZAp" />
                     </node>
                     <node concept="1Wc70l" id="51ek2rQxWI$" role="3clFbw">
@@ -5460,6 +5550,13 @@
         </node>
       </node>
     </node>
+    <node concept="312cEg" id="5tAk4yVRB0S" role="jymVt">
+      <property role="TrG5h" value="progSpec" />
+      <node concept="3Tm6S6" id="5tAk4yVR$P7" role="1B3o_S" />
+      <node concept="3uibUv" id="5tAk4yVRDcT" role="1tU5fm">
+        <ref role="3uigEE" to="av0y:~IncrementalProgramSpec" resolve="IncrementalProgramSpec" />
+      </node>
+    </node>
     <node concept="3Tm1VV" id="NKt6yn81z_" role="1B3o_S" />
     <node concept="3uibUv" id="5gVsyvERbQR" role="1zkMxy">
       <ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
@@ -18281,30 +18378,63 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="7i3KM7gOQTj" role="3cqZAp">
-            <node concept="2ShNRf" id="7i3KM7gOQTk" role="3clFbG">
-              <node concept="1pGfFk" id="7i3KM7gOQTl" role="2ShVmc">
-                <ref role="37wK5l" node="3KN3A4vHiEF" resolve="TypecheckingStep" />
-                <node concept="2OqwBi" id="61G6TdCq5fI" role="37wK5m">
-                  <node concept="37vLTw" id="61G6TdCq5qB" role="2Oq$k0">
-                    <ref role="3cqZAo" node="61G6TdCj0F7" resolve="typecheckingService" />
-                  </node>
-                  <node concept="liA8E" id="61G6TdCq8qe" role="2OqNvi">
-                    <ref role="37wK5l" node="61G6TdCmasW" resolve="getRepository" />
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="7i3KM7gP786" role="37wK5m">
-                  <node concept="37vLTw" id="6nFpYluDJTw" role="2Oq$k0">
+          <node concept="3cpWs8" id="5tAk4yVTd8L" role="3cqZAp">
+            <node concept="3cpWsn" id="5tAk4yVTd8M" role="3cpWs9">
+              <property role="TrG5h" value="incrProgSpec" />
+              <node concept="3uibUv" id="5tAk4yVTd8N" role="1tU5fm">
+                <ref role="3uigEE" to="av0y:~IncrementalProgramSpec" resolve="IncrementalProgramSpec" />
+              </node>
+              <node concept="2OqwBi" id="5tAk4yVTktT" role="33vP2m">
+                <node concept="2OqwBi" id="5tAk4yVTdwx" role="2Oq$k0">
+                  <node concept="37vLTw" id="5tAk4yVTdo8" role="2Oq$k0">
                     <ref role="3cqZAo" node="6nFpYluDJTp" resolve="cachedSessionData" />
                   </node>
-                  <node concept="liA8E" id="7i3KM7gP78d" role="2OqNvi">
+                  <node concept="liA8E" id="5tAk4yVTdBS" role="2OqNvi">
                     <ref role="37wK5l" node="7i3KM7g1KV4" resolve="getData" />
-                    <node concept="10M0yZ" id="61G6TdCq_wk" role="37wK5m">
+                    <node concept="10M0yZ" id="5tAk4yVTh3b" role="37wK5m">
+                      <ref role="3cqZAo" node="6$F3Z5zitgp" resolve="RULES_SESSION" />
                       <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-                      <ref role="3cqZAo" node="7i3KM7g3FBB" resolve="SESSION_TOKEN" />
                     </node>
                   </node>
                 </node>
+                <node concept="liA8E" id="5tAk4yVTnUs" role="2OqNvi">
+                  <ref role="37wK5l" to="hano:2WtKs4tZfgb" resolve="programSpec" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="7i3KM7gOQTj" role="3cqZAp">
+            <node concept="2OqwBi" id="5tAk4yVTodK" role="3clFbG">
+              <node concept="2ShNRf" id="7i3KM7gOQTk" role="2Oq$k0">
+                <node concept="1pGfFk" id="7i3KM7gOQTl" role="2ShVmc">
+                  <ref role="37wK5l" node="3KN3A4vHiEF" resolve="TypecheckingStep" />
+                  <node concept="2OqwBi" id="61G6TdCq5fI" role="37wK5m">
+                    <node concept="37vLTw" id="61G6TdCq5qB" role="2Oq$k0">
+                      <ref role="3cqZAo" node="61G6TdCj0F7" resolve="typecheckingService" />
+                    </node>
+                    <node concept="liA8E" id="61G6TdCq8qe" role="2OqNvi">
+                      <ref role="37wK5l" node="61G6TdCmasW" resolve="getRepository" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="7i3KM7gP786" role="37wK5m">
+                    <node concept="37vLTw" id="6nFpYluDJTw" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6nFpYluDJTp" resolve="cachedSessionData" />
+                    </node>
+                    <node concept="liA8E" id="7i3KM7gP78d" role="2OqNvi">
+                      <ref role="37wK5l" node="7i3KM7g1KV4" resolve="getData" />
+                      <node concept="10M0yZ" id="61G6TdCq_wk" role="37wK5m">
+                        <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                        <ref role="3cqZAo" node="7i3KM7g3FBB" resolve="SESSION_TOKEN" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="5tAk4yVTo_k" role="2OqNvi">
+                <ref role="37wK5l" node="5tAk4yVSZ1V" resolve="withProgramSpec" />
+                <node concept="37vLTw" id="5tAk4yVTstK" role="37wK5m">
+                  <ref role="3cqZAo" node="5tAk4yVTd8M" resolve="incrProgSpec" />
+                </node>
               </node>
             </node>
           </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index 5c8f1449..b56a79ee 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -2315,7 +2315,28 @@
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbH" id="7WKNeR9AmNV" role="3cqZAp" />
+                <node concept="3cpWs8" id="5tAk4yVP0GG" role="3cqZAp">
+                  <node concept="3cpWsn" id="5tAk4yVP0GH" role="3cpWs9">
+                    <property role="TrG5h" value="programSpec" />
+                    <property role="3TUv4t" value="true" />
+                    <node concept="3uibUv" id="5tAk4yVP0GI" role="1tU5fm">
+                      <ref role="3uigEE" to="av0y:~IncrementalProgramSpec" resolve="IncrementalProgramSpec" />
+                    </node>
+                    <node concept="2OqwBi" id="5tAk4yVP3fT" role="33vP2m">
+                      <node concept="37vLTw" id="5tAk4yVP2gX" role="2Oq$k0">
+                        <ref role="3cqZAo" node="51ek2rQHHIn" resolve="inEff" />
+                      </node>
+                      <node concept="liA8E" id="5tAk4yVP3RE" role="2OqNvi">
+                        <ref role="37wK5l" node="2daneBOX8cN" resolve="getValue" />
+                        <node concept="10M0yZ" id="5tAk4yVP6pz" role="37wK5m">
+                          <ref role="3cqZAo" node="5tAk4yVOMI9" resolve="PROGRAM_SPEC" />
+                          <ref role="1PxDUh" node="RZQG98UNsT" resolve="ConfigureEvalStep" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="5tAk4yVPasS" role="3cqZAp" />
                 <node concept="3clFbF" id="Hg6Enc7CQd" role="3cqZAp">
                   <node concept="37vLTI" id="Hg6Enc7CQe" role="3clFbG">
                     <node concept="37vLTw" id="Hg6Enc7CQf" role="37vLTJ">
@@ -2339,6 +2360,9 @@
                             <node concept="37vLTw" id="7WKNeR9AoxM" role="37wK5m">
                               <ref role="3cqZAo" node="7WKNeR9AoxI" resolve="programProducer" />
                             </node>
+                            <node concept="37vLTw" id="5tAk4yVP86g" role="37wK5m">
+                              <ref role="3cqZAo" node="5tAk4yVP0GH" resolve="programSpec" />
+                            </node>
                             <node concept="37vLTw" id="5DfcI9UuzgE" role="37wK5m">
                               <ref role="3cqZAo" node="3o9wrC3tl4w" resolve="supervisor" />
                             </node>
@@ -7409,6 +7433,23 @@
         </node>
       </node>
     </node>
+    <node concept="Wx3nA" id="5tAk4yVOMI9" role="jymVt">
+      <property role="TrG5h" value="PROGRAM_SPEC" />
+      <node concept="3Tm1VV" id="5tAk4yVOMIa" role="1B3o_S" />
+      <node concept="3uibUv" id="5tAk4yVOMIb" role="1tU5fm">
+        <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKey" />
+        <node concept="3uibUv" id="5tAk4yVOOip" role="11_B2D">
+          <ref role="3uigEE" to="av0y:~IncrementalProgramSpec" resolve="IncrementalProgramSpec" />
+        </node>
+      </node>
+      <node concept="2YIFZM" id="5tAk4yVOMId" role="33vP2m">
+        <ref role="1Pybhc" node="2daneBOWXQd" resolve="Effect" />
+        <ref role="37wK5l" node="6BMBBPD1Gnj" resolve="valueKey" />
+        <node concept="3VsKOn" id="5tAk4yVOO2l" role="37wK5m">
+          <ref role="3VsUkX" to="av0y:~IncrementalProgramSpec" resolve="IncrementalProgramSpec" />
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="2j1FRbwZcsx" role="jymVt" />
     <node concept="3clFbW" id="RZQG98V8sL" role="jymVt">
       <node concept="3cqZAl" id="RZQG98V8sN" role="3clF45" />
@@ -7458,21 +7499,48 @@
             <node concept="1bVj0M" id="51ek2rQGYnn" role="37wK5m">
               <node concept="3clFbS" id="51ek2rQGYno" role="1bW5cS">
                 <node concept="3clFbF" id="q1hCixUuxf" role="3cqZAp">
-                  <node concept="2YIFZM" id="q1hCixUuxh" role="3clFbG">
-                    <ref role="37wK5l" node="6BMBBPCQBuH" resolve="of" />
-                    <ref role="1Pybhc" node="2daneBOWXQd" resolve="Effect" />
-                    <node concept="Xl_RD" id="q1hCixUuxi" role="37wK5m">
-                      <property role="Xl_RC" value="configuring" />
-                    </node>
-                    <node concept="2OqwBi" id="q1hCixUuxj" role="37wK5m">
-                      <node concept="37vLTw" id="q1hCixUuxw" role="2Oq$k0">
-                        <ref role="3cqZAo" node="RZQG98Ve3Q" resolve="TRACE" />
+                  <node concept="2OqwBi" id="5tAk4yVORJZ" role="3clFbG">
+                    <node concept="2YIFZM" id="q1hCixUuxh" role="2Oq$k0">
+                      <ref role="37wK5l" node="6BMBBPCQBuH" resolve="of" />
+                      <ref role="1Pybhc" node="2daneBOWXQd" resolve="Effect" />
+                      <node concept="Xl_RD" id="q1hCixUuxi" role="37wK5m">
+                        <property role="Xl_RC" value="configuring" />
                       </node>
-                      <node concept="liA8E" id="q1hCixUuxk" role="2OqNvi">
-                        <ref role="37wK5l" node="6BMBBPCRIcz" resolve="is" />
-                        <node concept="10M0yZ" id="q1hCixUuxl" role="37wK5m">
-                          <ref role="3cqZAo" to="hano:24Vro6cS5rK" resolve="NULL" />
-                          <ref role="1PxDUh" to="hano:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                      <node concept="2OqwBi" id="q1hCixUuxj" role="37wK5m">
+                        <node concept="37vLTw" id="q1hCixUuxw" role="2Oq$k0">
+                          <ref role="3cqZAo" node="RZQG98Ve3Q" resolve="TRACE" />
+                        </node>
+                        <node concept="liA8E" id="q1hCixUuxk" role="2OqNvi">
+                          <ref role="37wK5l" node="6BMBBPCRIcz" resolve="is" />
+                          <node concept="10M0yZ" id="q1hCixUuxl" role="37wK5m">
+                            <ref role="3cqZAo" to="hano:24Vro6cS5rK" resolve="NULL" />
+                            <ref role="1PxDUh" to="hano:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="5tAk4yVOSrN" role="2OqNvi">
+                      <ref role="37wK5l" node="51ek2rQD9Pw" resolve="compose" />
+                      <node concept="1bVj0M" id="5tAk4yVOT5b" role="37wK5m">
+                        <node concept="3clFbS" id="5tAk4yVOT5c" role="1bW5cS">
+                          <node concept="3clFbF" id="5tAk4yVOTqE" role="3cqZAp">
+                            <node concept="2YIFZM" id="5tAk4yVOTYi" role="3clFbG">
+                              <ref role="37wK5l" node="6BMBBPCUL2C" resolve="of" />
+                              <ref role="1Pybhc" node="2daneBOWXQd" resolve="Effect" />
+                              <node concept="2OqwBi" id="5tAk4yVOV2A" role="37wK5m">
+                                <node concept="37vLTw" id="5tAk4yVOUlf" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="5tAk4yVOMI9" resolve="PROGRAM_SPEC" />
+                                </node>
+                                <node concept="liA8E" id="5tAk4yVOVpe" role="2OqNvi">
+                                  <ref role="37wK5l" node="6BMBBPCRIcz" resolve="is" />
+                                  <node concept="10M0yZ" id="5tAk4yVOWRB" role="37wK5m">
+                                    <ref role="3cqZAo" to="av0y:~IncrementalProgramSpec.DefaultSpec" resolve="DefaultSpec" />
+                                    <ref role="1PxDUh" to="av0y:~IncrementalProgramSpec" resolve="IncrementalProgramSpec" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>