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 1fd64223..c2ff9c09 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
@@ -1370,6 +1370,12 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="MFuM6QKKWH" role="3clF46">
+        <property role="TrG5h" value="options" />
+        <node concept="3uibUv" id="MFuM6QKOro" role="1tU5fm">
+          <ref role="3uigEE" to="1yqb:MFuM6QJLE2" resolve="Step.Options" />
+        </node>
+      </node>
       <node concept="37vLTG" id="6kREIVkNB3d" role="3clF46">
         <property role="TrG5h" value="subscribeScheduler" />
         <node concept="3uibUv" id="6kREIVkNB3e" role="1tU5fm">
@@ -1669,6 +1675,12 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="MFuM6QKYXW" role="3clF46">
+        <property role="TrG5h" value="options" />
+        <node concept="3uibUv" id="MFuM6QL0Jk" role="1tU5fm">
+          <ref role="3uigEE" to="1yqb:MFuM6QJLE2" resolve="Step.Options" />
+        </node>
+      </node>
       <node concept="37vLTG" id="6kREIVkNs$S" role="3clF46">
         <property role="TrG5h" value="subscribeScheduler" />
         <node concept="3uibUv" id="6kREIVkNs$T" role="1tU5fm">
@@ -1843,6 +1855,9 @@
                 <node concept="37vLTw" id="55Q$YFtIv91" role="37wK5m">
                   <ref role="3cqZAo" node="Hg6EncXntT" resolve="input_trace" />
                 </node>
+                <node concept="37vLTw" id="MFuM6RahGd" role="37wK5m">
+                  <ref role="3cqZAo" node="MFuM6QKYXW" resolve="options" />
+                </node>
                 <node concept="37vLTw" id="55Q$YFtIvC0" role="37wK5m">
                   <ref role="3cqZAo" node="6kREIVkNs$S" resolve="subscribeScheduler" />
                 </node>
@@ -3558,6 +3573,12 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="MFuM6QKUqK" role="3clF46">
+        <property role="TrG5h" value="options" />
+        <node concept="3uibUv" id="MFuM6QKWgC" role="1tU5fm">
+          <ref role="3uigEE" to="1yqb:MFuM6QJLE2" resolve="Step.Options" />
+        </node>
+      </node>
       <node concept="37vLTG" id="4vBwiiV$adA" role="3clF46">
         <property role="TrG5h" value="subscribeScheduler" />
         <node concept="3uibUv" id="4vBwiiV$adB" role="1tU5fm">
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
index 7aedd584..be83155a 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
@@ -1463,6 +1463,68 @@
         </node>
       </node>
       <node concept="2tJIrI" id="4MaHsBDeIUW" role="jymVt" />
+      <node concept="3clFb_" id="MFuM6RlFvN" role="jymVt">
+        <property role="TrG5h" value="options" />
+        <node concept="3uibUv" id="MFuM6RlIKq" role="3clF45">
+          <ref role="3uigEE" to="1yqb:MFuM6QJLE2" resolve="Step.Options" />
+        </node>
+        <node concept="3Tm1VV" id="MFuM6RlFvQ" role="1B3o_S" />
+        <node concept="3clFbS" id="MFuM6RlFvR" role="3clF47">
+          <node concept="3clFbF" id="MFuM6RlNn6" role="3cqZAp">
+            <node concept="2ShNRf" id="MFuM6RlNn4" role="3clFbG">
+              <node concept="YeOm9" id="MFuM6RlQo1" role="2ShVmc">
+                <node concept="1Y3b0j" id="MFuM6RlQo4" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                  <ref role="1Y3XeK" to="1yqb:MFuM6QJLE2" resolve="Step.Options" />
+                  <node concept="3Tm1VV" id="MFuM6RlQo5" role="1B3o_S" />
+                  <node concept="3clFb_" id="MFuM6RlRm8" role="jymVt">
+                    <property role="TrG5h" value="getOption" />
+                    <node concept="37vLTG" id="MFuM6RlRm9" role="3clF46">
+                      <property role="TrG5h" value="key" />
+                      <node concept="17QB3L" id="MFuM6RlRma" role="1tU5fm" />
+                    </node>
+                    <node concept="3uibUv" id="MFuM6RlRmb" role="3clF45">
+                      <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                    </node>
+                    <node concept="3Tm1VV" id="MFuM6RlRmc" role="1B3o_S" />
+                    <node concept="3clFbS" id="MFuM6RlRmf" role="3clF47">
+                      <node concept="3clFbJ" id="MFuM6RlSCX" role="3cqZAp">
+                        <node concept="2OqwBi" id="MFuM6RlTh0" role="3clFbw">
+                          <node concept="Xl_RD" id="MFuM6RlSYv" role="2Oq$k0">
+                            <property role="Xl_RC" value="typechecking.trace" />
+                          </node>
+                          <node concept="liA8E" id="MFuM6RlTCV" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                            <node concept="37vLTw" id="MFuM6RlTZf" role="37wK5m">
+                              <ref role="3cqZAo" node="MFuM6RlRm9" resolve="key" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbS" id="MFuM6RlSCZ" role="3clFbx">
+                          <node concept="3cpWs6" id="MFuM6RlUrh" role="3cqZAp">
+                            <node concept="10M0yZ" id="MFuM6RlUSx" role="3cqZAk">
+                              <ref role="3cqZAo" to="wyt6:~Boolean.TRUE" resolve="TRUE" />
+                              <ref role="1PxDUh" to="wyt6:~Boolean" resolve="Boolean" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="MFuM6RlVnw" role="3cqZAp">
+                        <node concept="10Nm6u" id="MFuM6RlVnu" role="3clFbG" />
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="MFuM6RlRmg" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="MFuM6RlDGR" role="jymVt" />
       <node concept="3clFb_" id="siuT5mmA08" role="jymVt">
         <property role="TrG5h" value="getTypeOf" />
         <node concept="3Tm1VV" id="siuT5mmA09" role="1B3o_S" />
@@ -1494,18 +1556,26 @@
               <property role="TrG5h" value="typeOf" />
               <node concept="3Tqbb2" id="4MaHsBE64Yq" role="1tU5fm" />
               <node concept="2OqwBi" id="2qsG4AwK3fF" role="33vP2m">
-                <node concept="2OqwBi" id="2qsG4AwK3fG" role="2Oq$k0">
-                  <node concept="2YIFZM" id="2qsG4AwK3fH" role="2Oq$k0">
-                    <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
-                    <ref role="37wK5l" to="tj24:3IIf9O_Z6Ip" resolve="forNode" />
-                    <node concept="37vLTw" id="2qsG4AwK3fI" role="37wK5m">
-                      <ref role="3cqZAo" node="siuT5mmA0c" resolve="node" />
+                <node concept="2OqwBi" id="MFuM6RlVxv" role="2Oq$k0">
+                  <node concept="2OqwBi" id="2qsG4AwK3fG" role="2Oq$k0">
+                    <node concept="2YIFZM" id="2qsG4AwK3fH" role="2Oq$k0">
+                      <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
+                      <ref role="37wK5l" to="tj24:3IIf9O_Z6Ip" resolve="forNode" />
+                      <node concept="37vLTw" id="2qsG4AwK3fI" role="37wK5m">
+                        <ref role="3cqZAo" node="siuT5mmA0c" resolve="node" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="2qsG4AwK3fJ" role="2OqNvi">
+                      <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
+                      <node concept="37vLTw" id="2qsG4AwK3fK" role="37wK5m">
+                        <ref role="3cqZAo" node="2qsG4AwJYbT" resolve="to" />
+                      </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="2qsG4AwK3fJ" role="2OqNvi">
-                    <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
-                    <node concept="37vLTw" id="2qsG4AwK3fK" role="37wK5m">
-                      <ref role="3cqZAo" node="2qsG4AwJYbT" resolve="to" />
+                  <node concept="liA8E" id="MFuM6RlW_g" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:MFuM6Rlhvn" resolve="withOptions" />
+                    <node concept="1rXfSq" id="MFuM6RlXBs" role="37wK5m">
+                      <ref role="37wK5l" node="MFuM6RlFvN" resolve="options" />
                     </node>
                   </node>
                 </node>
@@ -1620,21 +1690,29 @@
               <property role="TrG5h" value="convertsTo" />
               <node concept="10P_77" id="2qsG4AwKFoY" role="1tU5fm" />
               <node concept="2OqwBi" id="2qsG4AwKAu2" role="33vP2m">
-                <node concept="2OqwBi" id="2qsG4AwKAu3" role="2Oq$k0">
-                  <node concept="2YIFZM" id="2qsG4AwKB6p" role="2Oq$k0">
-                    <ref role="37wK5l" to="tj24:2qsG4AwIYLn" resolve="for2Node" />
-                    <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
-                    <node concept="37vLTw" id="2qsG4AwKBBk" role="37wK5m">
-                      <ref role="3cqZAo" node="siuT5mmA0n" resolve="type" />
+                <node concept="2OqwBi" id="MFuM6RlY9h" role="2Oq$k0">
+                  <node concept="2OqwBi" id="2qsG4AwKAu3" role="2Oq$k0">
+                    <node concept="2YIFZM" id="2qsG4AwKB6p" role="2Oq$k0">
+                      <ref role="37wK5l" to="tj24:2qsG4AwIYLn" resolve="for2Node" />
+                      <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
+                      <node concept="37vLTw" id="2qsG4AwKBBk" role="37wK5m">
+                        <ref role="3cqZAo" node="siuT5mmA0n" resolve="type" />
+                      </node>
+                      <node concept="37vLTw" id="2qsG4AwKCh1" role="37wK5m">
+                        <ref role="3cqZAo" node="siuT5mmA0p" resolve="trgType" />
+                      </node>
                     </node>
-                    <node concept="37vLTw" id="2qsG4AwKCh1" role="37wK5m">
-                      <ref role="3cqZAo" node="siuT5mmA0p" resolve="trgType" />
+                    <node concept="liA8E" id="2qsG4AwKAu6" role="2OqNvi">
+                      <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
+                      <node concept="37vLTw" id="2qsG4AwKAu7" role="37wK5m">
+                        <ref role="3cqZAo" node="2qsG4AwKAtV" resolve="to" />
+                      </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="2qsG4AwKAu6" role="2OqNvi">
-                    <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
-                    <node concept="37vLTw" id="2qsG4AwKAu7" role="37wK5m">
-                      <ref role="3cqZAo" node="2qsG4AwKAtV" resolve="to" />
+                  <node concept="liA8E" id="MFuM6RlY9L" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:MFuM6Rlhvn" resolve="withOptions" />
+                    <node concept="1rXfSq" id="MFuM6RlY9M" role="37wK5m">
+                      <ref role="37wK5l" node="MFuM6RlFvN" resolve="options" />
                     </node>
                   </node>
                 </node>
@@ -1764,21 +1842,29 @@
               <property role="TrG5h" value="coerceTo" />
               <node concept="3Tqbb2" id="2qsG4AwKKKV" role="1tU5fm" />
               <node concept="2OqwBi" id="2qsG4AwKIeL" role="33vP2m">
-                <node concept="2OqwBi" id="2qsG4AwKIeM" role="2Oq$k0">
-                  <node concept="2YIFZM" id="2qsG4AwKIRV" role="2Oq$k0">
-                    <ref role="37wK5l" to="tj24:2qsG4AwKdr0" resolve="forNodeAndConcept" />
-                    <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
-                    <node concept="37vLTw" id="2qsG4AwKIRW" role="37wK5m">
-                      <ref role="3cqZAo" node="siuT5mmA0$" resolve="type" />
+                <node concept="2OqwBi" id="MFuM6RlYRr" role="2Oq$k0">
+                  <node concept="2OqwBi" id="2qsG4AwKIeM" role="2Oq$k0">
+                    <node concept="2YIFZM" id="2qsG4AwKIRV" role="2Oq$k0">
+                      <ref role="37wK5l" to="tj24:2qsG4AwKdr0" resolve="forNodeAndConcept" />
+                      <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
+                      <node concept="37vLTw" id="2qsG4AwKIRW" role="37wK5m">
+                        <ref role="3cqZAo" node="siuT5mmA0$" resolve="type" />
+                      </node>
+                      <node concept="37vLTw" id="2qsG4AwKJrR" role="37wK5m">
+                        <ref role="3cqZAo" node="siuT5mmA0A" resolve="trgConcept" />
+                      </node>
                     </node>
-                    <node concept="37vLTw" id="2qsG4AwKJrR" role="37wK5m">
-                      <ref role="3cqZAo" node="siuT5mmA0A" resolve="trgConcept" />
+                    <node concept="liA8E" id="2qsG4AwKIeQ" role="2OqNvi">
+                      <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
+                      <node concept="37vLTw" id="2qsG4AwKIeR" role="37wK5m">
+                        <ref role="3cqZAo" node="2qsG4AwKIeE" resolve="to" />
+                      </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="2qsG4AwKIeQ" role="2OqNvi">
-                    <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
-                    <node concept="37vLTw" id="2qsG4AwKIeR" role="37wK5m">
-                      <ref role="3cqZAo" node="2qsG4AwKIeE" resolve="to" />
+                  <node concept="liA8E" id="MFuM6RlZd2" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:MFuM6Rlhvn" resolve="withOptions" />
+                    <node concept="1rXfSq" id="MFuM6RlZd3" role="37wK5m">
+                      <ref role="37wK5l" node="MFuM6RlFvN" resolve="options" />
                     </node>
                   </node>
                 </node>
@@ -2110,18 +2196,26 @@
           <node concept="3clFbF" id="2qsG4AwKYP$" role="3cqZAp">
             <node concept="2OqwBi" id="2qsG4AwKZwC" role="3clFbG">
               <node concept="2OqwBi" id="2qsG4AwL2gk" role="2Oq$k0">
-                <node concept="2OqwBi" id="2qsG4AwL2gl" role="2Oq$k0">
-                  <node concept="2YIFZM" id="2qsG4AwL2gm" role="2Oq$k0">
-                    <ref role="37wK5l" to="tj24:3IIf9O_Z6Ip" resolve="forNode" />
-                    <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
-                    <node concept="37vLTw" id="2qsG4AwL2gn" role="37wK5m">
-                      <ref role="3cqZAo" node="2Hyoxv0bBG" resolve="node" />
+                <node concept="2OqwBi" id="MFuM6RlZUf" role="2Oq$k0">
+                  <node concept="2OqwBi" id="2qsG4AwL2gl" role="2Oq$k0">
+                    <node concept="2YIFZM" id="2qsG4AwL2gm" role="2Oq$k0">
+                      <ref role="37wK5l" to="tj24:3IIf9O_Z6Ip" resolve="forNode" />
+                      <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
+                      <node concept="37vLTw" id="2qsG4AwL2gn" role="37wK5m">
+                        <ref role="3cqZAo" node="2Hyoxv0bBG" resolve="node" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="2qsG4AwL2go" role="2OqNvi">
+                      <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
+                      <node concept="37vLTw" id="2qsG4AwL2gp" role="37wK5m">
+                        <ref role="3cqZAo" node="2qsG4AwKPDy" resolve="to" />
+                      </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="2qsG4AwL2go" role="2OqNvi">
-                    <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
-                    <node concept="37vLTw" id="2qsG4AwL2gp" role="37wK5m">
-                      <ref role="3cqZAo" node="2qsG4AwKPDy" resolve="to" />
+                  <node concept="liA8E" id="MFuM6RlZUF" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:MFuM6Rlhvn" resolve="withOptions" />
+                    <node concept="1rXfSq" id="MFuM6RlZUG" role="37wK5m">
+                      <ref role="37wK5l" node="MFuM6RlFvN" resolve="options" />
                     </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 8e9410f3..a60f699d 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
@@ -3540,6 +3540,12 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="MFuM6QKnFQ" role="3clF46">
+        <property role="TrG5h" value="options" />
+        <node concept="3uibUv" id="MFuM6QKrKf" role="1tU5fm">
+          <ref role="3uigEE" to="1yqb:MFuM6QJLE2" resolve="Step.Options" />
+        </node>
+      </node>
       <node concept="37vLTG" id="HOeeeUbp7S" role="3clF46">
         <property role="TrG5h" value="subscribeScheduler" />
         <node concept="3uibUv" id="HOeeeUbp7T" role="1tU5fm">
@@ -4233,6 +4239,12 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="MFuM6R0U3f" role="3clF46">
+        <property role="TrG5h" value="options" />
+        <node concept="3uibUv" id="MFuM6R0X4h" role="1tU5fm">
+          <ref role="3uigEE" to="1yqb:MFuM6QJLE2" resolve="Step.Options" />
+        </node>
+      </node>
       <node concept="37vLTG" id="78H58of4zU6" role="3clF46">
         <property role="TrG5h" value="subscribeScheduler" />
         <node concept="3uibUv" id="78H58of4zU7" role="1tU5fm">
@@ -4313,57 +4325,142 @@
                   </node>
                   <node concept="3clFbS" id="1G9Y_Qv8wBg" role="1bW5cS">
                     <node concept="3clFbH" id="1G9Y_Qv8wBh" role="3cqZAp" />
-                    <node concept="3cpWs8" id="1G9Y_Qv8wBi" role="3cqZAp">
-                      <node concept="3cpWsn" id="1G9Y_Qv8wBj" role="3cpWs9">
-                        <property role="TrG5h" value="program" />
-                        <node concept="3uibUv" id="1G9Y_Qv8wBk" role="1tU5fm">
-                          <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+                    <node concept="3cpWs8" id="7zbZjJ1MPjJ" role="3cqZAp">
+                      <node concept="3cpWsn" id="7zbZjJ1MPjK" role="3cpWs9">
+                        <property role="TrG5h" value="evtrace" />
+                        <node concept="3uibUv" id="7zbZjJ1MME3" role="1tU5fm">
+                          <ref role="3uigEE" to="hano:qubcdtxBiR" resolve="EvaluationTraceExt" />
                         </node>
-                        <node concept="2OqwBi" id="1G9Y_Qv8wBl" role="33vP2m">
-                          <node concept="2OqwBi" id="1G9Y_Qv8wBm" role="2Oq$k0">
-                            <node concept="liA8E" id="1G9Y_Qv8wBn" role="2OqNvi">
-                              <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
-                              <node concept="10M0yZ" id="1G9Y_Qv8wBo" role="37wK5m">
-                                <ref role="3cqZAo" to="1yqb:2daneBPSu1V" resolve="PROGRAM_PRODUCER" />
-                                <ref role="1PxDUh" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-                              </node>
-                            </node>
-                            <node concept="1LFfDK" id="1G9Y_Qv8wBp" role="2Oq$k0">
-                              <node concept="3cmrfG" id="1G9Y_Qv8wBq" role="1LF_Uc">
-                                <property role="3cmrfH" value="0" />
-                              </node>
-                              <node concept="37vLTw" id="1G9Y_Qv8wBr" role="1LFl5Q">
-                                <ref role="3cqZAo" node="1G9Y_Qv8wBa" resolve="inEff_trace" />
-                              </node>
-                            </node>
+                        <node concept="1LFfDK" id="7zbZjJ1NaUa" role="33vP2m">
+                          <node concept="3cmrfG" id="7zbZjJ1NaYE" role="1LF_Uc">
+                            <property role="3cmrfH" value="1" />
                           </node>
-                          <node concept="liA8E" id="1G9Y_Qv8wBs" role="2OqNvi">
-                            <ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getProgram" />
+                          <node concept="37vLTw" id="7zbZjJ1N8A6" role="1LFl5Q">
+                            <ref role="3cqZAo" node="1G9Y_Qv8wBa" resolve="inEff_trace" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbF" id="1G9Y_Qv8wBt" role="3cqZAp">
-                      <node concept="37vLTI" id="1G9Y_Qv8wBu" role="3clFbG">
-                        <node concept="2ShNRf" id="1G9Y_Qv8wBv" role="37vLTx">
-                          <node concept="1pGfFk" id="1G9Y_Qv8wBw" role="2ShVmc">
-                            <ref role="37wK5l" to="31yc:2daneBOSyP4" resolve="TraceEventsCollector" />
-                            <node concept="2OqwBi" id="1G9Y_Qv8wBx" role="37wK5m">
-                              <node concept="37vLTw" id="1G9Y_Qv8wBy" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1G9Y_Qv8wBj" resolve="program" />
+                    <node concept="3clFbH" id="7zbZjJ1Nh9y" role="3cqZAp" />
+                    <node concept="3clFbJ" id="7zbZjJ1Ncm3" role="3cqZAp">
+                      <node concept="3clFbS" id="7zbZjJ1Ncm5" role="3clFbx">
+                        <node concept="3clFbH" id="MFuM6RkjjI" role="3cqZAp" />
+                        <node concept="3cpWs8" id="1G9Y_Qv8wBi" role="3cqZAp">
+                          <node concept="3cpWsn" id="1G9Y_Qv8wBj" role="3cpWs9">
+                            <property role="TrG5h" value="program" />
+                            <node concept="3uibUv" id="1G9Y_Qv8wBk" role="1tU5fm">
+                              <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+                            </node>
+                            <node concept="2OqwBi" id="1G9Y_Qv8wBl" role="33vP2m">
+                              <node concept="2OqwBi" id="1G9Y_Qv8wBm" role="2Oq$k0">
+                                <node concept="liA8E" id="1G9Y_Qv8wBn" role="2OqNvi">
+                                  <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                                  <node concept="10M0yZ" id="1G9Y_Qv8wBo" role="37wK5m">
+                                    <ref role="3cqZAo" to="1yqb:2daneBPSu1V" resolve="PROGRAM_PRODUCER" />
+                                    <ref role="1PxDUh" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                                  </node>
+                                </node>
+                                <node concept="1LFfDK" id="1G9Y_Qv8wBp" role="2Oq$k0">
+                                  <node concept="3cmrfG" id="1G9Y_Qv8wBq" role="1LF_Uc">
+                                    <property role="3cmrfH" value="0" />
+                                  </node>
+                                  <node concept="37vLTw" id="1G9Y_Qv8wBr" role="1LFl5Q">
+                                    <ref role="3cqZAo" node="1G9Y_Qv8wBa" resolve="inEff_trace" />
+                                  </node>
+                                </node>
                               </node>
-                              <node concept="liA8E" id="1G9Y_Qv8wBz" role="2OqNvi">
-                                <ref role="37wK5l" to="av0y:~Program.name()" resolve="name" />
+                              <node concept="liA8E" id="1G9Y_Qv8wBs" role="2OqNvi">
+                                <ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getProgram" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="37vLTw" id="1G9Y_Qv8wB$" role="37vLTJ">
-                          <ref role="3cqZAo" node="1G9Y_Qv8cvj" resolve="traceEventsCollector" />
+                        <node concept="3clFbF" id="1G9Y_Qv8wBt" role="3cqZAp">
+                          <node concept="37vLTI" id="1G9Y_Qv8wBu" role="3clFbG">
+                            <node concept="2ShNRf" id="1G9Y_Qv8wBv" role="37vLTx">
+                              <node concept="1pGfFk" id="1G9Y_Qv8wBw" role="2ShVmc">
+                                <ref role="37wK5l" to="31yc:2daneBOSyP4" resolve="TraceEventsCollector" />
+                                <node concept="2OqwBi" id="1G9Y_Qv8wBx" role="37wK5m">
+                                  <node concept="37vLTw" id="1G9Y_Qv8wBy" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="1G9Y_Qv8wBj" resolve="program" />
+                                  </node>
+                                  <node concept="liA8E" id="1G9Y_Qv8wBz" role="2OqNvi">
+                                    <ref role="37wK5l" to="av0y:~Program.name()" resolve="name" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="37vLTw" id="1G9Y_Qv8wB$" role="37vLTJ">
+                              <ref role="3cqZAo" node="1G9Y_Qv8cvj" resolve="traceEventsCollector" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbH" id="1G9Y_Qv8wB_" role="3cqZAp" />
+                        <node concept="3clFbF" id="7zbZjJ1MWmo" role="3cqZAp">
+                          <node concept="37vLTI" id="7zbZjJ1MWmq" role="3clFbG">
+                            <node concept="1eOMI4" id="7zbZjJ1MPjL" role="37vLTx">
+                              <node concept="10QFUN" id="7zbZjJ1MPjM" role="1eOMHV">
+                                <node concept="2ShNRf" id="7zbZjJ1MPjN" role="10QFUP">
+                                  <node concept="1pGfFk" id="7zbZjJ1MPjO" role="2ShVmc">
+                                    <ref role="37wK5l" to="1yqb:7nPD14NbIzp" resolve="MultiTrace" />
+                                    <node concept="2OqwBi" id="7zbZjJ1MPjP" role="37wK5m">
+                                      <node concept="37vLTw" id="7zbZjJ1MPjQ" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="1G9Y_Qv8cvj" resolve="traceEventsCollector" />
+                                      </node>
+                                      <node concept="liA8E" id="7zbZjJ1MPjR" role="2OqNvi">
+                                        <ref role="37wK5l" to="31yc:YGS68MEx_L" resolve="trace" />
+                                      </node>
+                                    </node>
+                                    <node concept="1LFfDK" id="7zbZjJ1MPjS" role="37wK5m">
+                                      <node concept="3cmrfG" id="7zbZjJ1MPjT" role="1LF_Uc">
+                                        <property role="3cmrfH" value="1" />
+                                      </node>
+                                      <node concept="37vLTw" id="7zbZjJ1MPjU" role="1LFl5Q">
+                                        <ref role="3cqZAo" node="1G9Y_Qv8wBa" resolve="inEff_trace" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3uibUv" id="7zbZjJ1MPjV" role="10QFUM">
+                                  <ref role="3uigEE" to="hano:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="37vLTw" id="7zbZjJ1MWmu" role="37vLTJ">
+                              <ref role="3cqZAo" node="7zbZjJ1MPjK" resolve="evtrace" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbH" id="MFuM6RkkZQ" role="3cqZAp" />
+                      </node>
+                      <node concept="1Wc70l" id="MFuM6RjMkh" role="3clFbw">
+                        <node concept="3clFbC" id="MFuM6Rk3KM" role="3uHU7w">
+                          <node concept="10M0yZ" id="MFuM6Rk2o7" role="3uHU7B">
+                            <ref role="3cqZAo" to="wyt6:~Boolean.TRUE" resolve="TRUE" />
+                            <ref role="1PxDUh" to="wyt6:~Boolean" resolve="Boolean" />
+                          </node>
+                          <node concept="2OqwBi" id="MFuM6RjS_Z" role="3uHU7w">
+                            <node concept="37vLTw" id="MFuM6RjRg4" role="2Oq$k0">
+                              <ref role="3cqZAo" node="MFuM6R0U3f" resolve="options" />
+                            </node>
+                            <node concept="liA8E" id="MFuM6RjUAS" role="2OqNvi">
+                              <ref role="37wK5l" to="1yqb:MFuM6QK9xq" resolve="getOption" />
+                              <node concept="Xl_RD" id="MFuM6RjW0G" role="37wK5m">
+                                <property role="Xl_RC" value="typechecking.trace" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3y3z36" id="MFuM6RjIYg" role="3uHU7B">
+                          <node concept="37vLTw" id="MFuM6RjGW2" role="3uHU7B">
+                            <ref role="3cqZAo" node="MFuM6R0U3f" resolve="options" />
+                          </node>
+                          <node concept="10Nm6u" id="MFuM6RjKHb" role="3uHU7w" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbH" id="1G9Y_Qv8wB_" role="3cqZAp" />
+                    <node concept="3clFbH" id="7zbZjJ1MRal" role="3cqZAp" />
+                    <node concept="3clFbH" id="7zbZjJ1MRb0" role="3cqZAp" />
                     <node concept="3clFbF" id="1G9Y_Qv8wBA" role="3cqZAp">
                       <node concept="1Ls8ON" id="1G9Y_Qv8wBB" role="3clFbG">
                         <node concept="1LFfDK" id="1G9Y_Qv8wBC" role="1Lso8e">
@@ -4374,33 +4471,8 @@
                             <ref role="3cqZAo" node="1G9Y_Qv8wBa" resolve="inEff_trace" />
                           </node>
                         </node>
-                        <node concept="1eOMI4" id="1G9Y_Qv9cWS" role="1Lso8e">
-                          <node concept="10QFUN" id="1G9Y_Qv9cWT" role="1eOMHV">
-                            <node concept="2ShNRf" id="1G9Y_Qv9cWK" role="10QFUP">
-                              <node concept="1pGfFk" id="1G9Y_Qv9cWL" role="2ShVmc">
-                                <ref role="37wK5l" to="1yqb:7nPD14NbIzp" resolve="MultiTrace" />
-                                <node concept="2OqwBi" id="1G9Y_Qv9cWM" role="37wK5m">
-                                  <node concept="37vLTw" id="1G9Y_Qv9cWN" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1G9Y_Qv8cvj" resolve="traceEventsCollector" />
-                                  </node>
-                                  <node concept="liA8E" id="1G9Y_Qv9cWO" role="2OqNvi">
-                                    <ref role="37wK5l" to="31yc:YGS68MEx_L" resolve="trace" />
-                                  </node>
-                                </node>
-                                <node concept="1LFfDK" id="1G9Y_Qv9cWP" role="37wK5m">
-                                  <node concept="3cmrfG" id="1G9Y_Qv9cWQ" role="1LF_Uc">
-                                    <property role="3cmrfH" value="1" />
-                                  </node>
-                                  <node concept="37vLTw" id="1G9Y_Qv9cWR" role="1LFl5Q">
-                                    <ref role="3cqZAo" node="1G9Y_Qv8wBa" resolve="inEff_trace" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3uibUv" id="1G9Y_Qv9enY" role="10QFUM">
-                              <ref role="3uigEE" to="hano:qubcdtxBiR" resolve="EvaluationTraceExt" />
-                            </node>
-                          </node>
+                        <node concept="37vLTw" id="7zbZjJ1MPjW" role="1Lso8e">
+                          <ref role="3cqZAo" node="7zbZjJ1MPjK" resolve="evtrace" />
                         </node>
                       </node>
                     </node>
@@ -4418,6 +4490,9 @@
               <node concept="37vLTw" id="1G9Y_Qv8CWa" role="37wK5m">
                 <ref role="3cqZAo" node="1G9Y_Qv8wB5" resolve="input_trace_collector" />
               </node>
+              <node concept="37vLTw" id="MFuM6R1hcM" role="37wK5m">
+                <ref role="3cqZAo" node="MFuM6R0U3f" resolve="options" />
+              </node>
               <node concept="37vLTw" id="78H58of4Mnl" role="37wK5m">
                 <ref role="3cqZAo" node="78H58of4zU6" resolve="subscribeScheduler" />
               </node>
@@ -5482,6 +5557,38 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5KrJ7UHMNU3" role="jymVt" />
+    <node concept="3clFb_" id="MFuM6Rlhvn" role="jymVt">
+      <property role="TrG5h" value="withOptions" />
+      <node concept="37vLTG" id="MFuM6Rlhvo" role="3clF46">
+        <property role="TrG5h" value="options" />
+        <node concept="3uibUv" id="MFuM6Rlx4t" role="1tU5fm">
+          <ref role="3uigEE" to="1yqb:MFuM6QJLE2" resolve="Step.Options" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="MFuM6Rlhvq" role="3clF45">
+        <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+      </node>
+      <node concept="3Tm1VV" id="MFuM6Rlhvr" role="1B3o_S" />
+      <node concept="3clFbS" id="MFuM6Rlhvs" role="3clF47">
+        <node concept="3clFbF" id="MFuM6Rlhvt" role="3cqZAp">
+          <node concept="37vLTI" id="MFuM6Rlhvu" role="3clFbG">
+            <node concept="2OqwBi" id="MFuM6Rlhvv" role="37vLTJ">
+              <node concept="Xjq3P" id="MFuM6Rlhvw" role="2Oq$k0" />
+              <node concept="2OwXpG" id="MFuM6RlzP3" role="2OqNvi">
+                <ref role="2Oxat5" node="MFuM6Rl4e0" resolve="options" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="MFuM6Rlhvy" role="37vLTx">
+              <ref role="3cqZAo" node="MFuM6Rlhvo" resolve="options" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="MFuM6Rlhvz" role="3cqZAp">
+          <node concept="Xjq3P" id="MFuM6Rlhv$" role="3clFbG" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="MFuM6RlbY$" role="jymVt" />
     <node concept="3clFb_" id="1FOQehxdXIx" role="jymVt">
       <property role="TrG5h" value="checkTypes" />
       <node concept="37vLTG" id="1FOQehxdZUm" role="3clF46">
@@ -5905,7 +6012,7 @@
                         <ref role="3cqZAo" node="3KN3A4vLuiz" resolve="helper" />
                       </node>
                       <node concept="liA8E" id="2daneBPBKoF" role="2OqNvi">
-                        <ref role="37wK5l" to="1yqb:2daneBP$ovk" resolve="executeAndWait" />
+                        <ref role="37wK5l" to="1yqb:2daneBP$ovk" resolve="executeBlocking" />
                       </node>
                     </node>
                   </node>
@@ -6188,7 +6295,7 @@
                         <ref role="3cqZAo" node="3KN3A4vMmtk" resolve="helper" />
                       </node>
                       <node concept="liA8E" id="2daneBPBRVM" role="2OqNvi">
-                        <ref role="37wK5l" to="1yqb:2daneBP$ovk" resolve="executeAndWait" />
+                        <ref role="37wK5l" to="1yqb:2daneBP$ovk" resolve="executeBlocking" />
                       </node>
                     </node>
                   </node>
@@ -6522,7 +6629,7 @@
                         <ref role="3cqZAo" node="3KN3A4vIAwo" resolve="helper" />
                       </node>
                       <node concept="liA8E" id="2daneBP_A$M" role="2OqNvi">
-                        <ref role="37wK5l" to="1yqb:2daneBP$ovk" resolve="executeAndWait" />
+                        <ref role="37wK5l" to="1yqb:2daneBP$ovk" resolve="executeBlocking" />
                       </node>
                     </node>
                   </node>
@@ -6755,7 +6862,7 @@
                         <ref role="3cqZAo" node="3KN3A4vJU0y" resolve="helper" />
                       </node>
                       <node concept="liA8E" id="2daneBPBGIv" role="2OqNvi">
-                        <ref role="37wK5l" to="1yqb:2daneBP$ovk" resolve="executeAndWait" />
+                        <ref role="37wK5l" to="1yqb:2daneBP$ovk" resolve="executeBlocking" />
                       </node>
                     </node>
                   </node>
@@ -6912,8 +7019,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="1FOQehxonMc" role="jymVt" />
-    <node concept="2tJIrI" id="6QH_LDtaCb7" role="jymVt" />
-    <node concept="2tJIrI" id="7Bx7XgEiqaH" role="jymVt" />
     <node concept="3clFb_" id="1FOQehxnBew" role="jymVt">
       <property role="TrG5h" value="helpers" />
       <node concept="3Tm6S6" id="1FOQehxnBex" role="1B3o_S" />
@@ -7073,14 +7178,22 @@
                   <ref role="3cqZAo" node="3KN3A4vHOSn" resolve="result" />
                 </node>
                 <node concept="TSZUe" id="3KN3A4vHVKa" role="2OqNvi">
-                  <node concept="2ShNRf" id="3KN3A4vI8Sp" role="25WWJ7">
-                    <node concept="1pGfFk" id="3KN3A4vI8Sq" role="2ShVmc">
-                      <ref role="37wK5l" to="1yqb:443LGHBiDEV" resolve="CoderulesHelper" />
-                      <node concept="37vLTw" id="3KN3A4vI8Sr" role="37wK5m">
-                        <ref role="3cqZAo" node="1FOQehxnBdX" resolve="applyTemplatesStep" />
+                  <node concept="2OqwBi" id="MFuM6Rl$Yq" role="25WWJ7">
+                    <node concept="2ShNRf" id="3KN3A4vI8Sp" role="2Oq$k0">
+                      <node concept="1pGfFk" id="3KN3A4vI8Sq" role="2ShVmc">
+                        <ref role="37wK5l" to="1yqb:443LGHBiDEV" resolve="CoderulesHelper" />
+                        <node concept="37vLTw" id="3KN3A4vI8Sr" role="37wK5m">
+                          <ref role="3cqZAo" node="1FOQehxnBdX" resolve="applyTemplatesStep" />
+                        </node>
+                        <node concept="37vLTw" id="3KN3A4vI8Ss" role="37wK5m">
+                          <ref role="3cqZAo" node="1FOQehxnBe6" resolve="evaluateRulesStep" />
+                        </node>
                       </node>
-                      <node concept="37vLTw" id="3KN3A4vI8Ss" role="37wK5m">
-                        <ref role="3cqZAo" node="1FOQehxnBe6" resolve="evaluateRulesStep" />
+                    </node>
+                    <node concept="liA8E" id="MFuM6Rl_yp" role="2OqNvi">
+                      <ref role="37wK5l" to="1yqb:MFuM6R00U6" resolve="withOptions" />
+                      <node concept="37vLTw" id="MFuM6Rl_NM" role="37wK5m">
+                        <ref role="3cqZAo" node="MFuM6Rl4e0" resolve="options" />
                       </node>
                     </node>
                   </node>
@@ -7250,14 +7363,22 @@
                   <ref role="3cqZAo" node="3KN3A4vHCGd" resolve="result" />
                 </node>
                 <node concept="TSZUe" id="3KN3A4vHMdk" role="2OqNvi">
-                  <node concept="2ShNRf" id="3KN3A4vHMfs" role="25WWJ7">
-                    <node concept="1pGfFk" id="3KN3A4vHMft" role="2ShVmc">
-                      <ref role="37wK5l" to="1yqb:443LGHBiDEV" resolve="CoderulesHelper" />
-                      <node concept="37vLTw" id="3KN3A4vHMfu" role="37wK5m">
-                        <ref role="3cqZAo" node="3KN3A4vEXnG" resolve="applyTemplatesStep" />
+                  <node concept="2OqwBi" id="MFuM6RlBmW" role="25WWJ7">
+                    <node concept="2ShNRf" id="3KN3A4vHMfs" role="2Oq$k0">
+                      <node concept="1pGfFk" id="3KN3A4vHMft" role="2ShVmc">
+                        <ref role="37wK5l" to="1yqb:443LGHBiDEV" resolve="CoderulesHelper" />
+                        <node concept="37vLTw" id="3KN3A4vHMfu" role="37wK5m">
+                          <ref role="3cqZAo" node="3KN3A4vEXnG" resolve="applyTemplatesStep" />
+                        </node>
+                        <node concept="37vLTw" id="3KN3A4vHMfv" role="37wK5m">
+                          <ref role="3cqZAo" node="3KN3A4vEXnQ" resolve="evaluateRulesStep" />
+                        </node>
                       </node>
-                      <node concept="37vLTw" id="3KN3A4vHMfv" role="37wK5m">
-                        <ref role="3cqZAo" node="3KN3A4vEXnQ" resolve="evaluateRulesStep" />
+                    </node>
+                    <node concept="liA8E" id="MFuM6RlBL_" role="2OqNvi">
+                      <ref role="37wK5l" to="1yqb:MFuM6R00U6" resolve="withOptions" />
+                      <node concept="37vLTw" id="MFuM6RlC1i" role="37wK5m">
+                        <ref role="3cqZAo" node="MFuM6Rl4e0" resolve="options" />
                       </node>
                     </node>
                   </node>
@@ -7537,6 +7658,13 @@
         <ref role="3uigEE" to="1yqb:1G9Y_Qvb1CP" resolve="TraceObject" />
       </node>
     </node>
+    <node concept="312cEg" id="MFuM6Rl4e0" role="jymVt">
+      <property role="TrG5h" value="options" />
+      <node concept="3Tm6S6" id="MFuM6Rl4e1" role="1B3o_S" />
+      <node concept="3uibUv" id="MFuM6Rl9J4" role="1tU5fm">
+        <ref role="3uigEE" to="1yqb:MFuM6QJLE2" resolve="Step.Options" />
+      </node>
+    </node>
     <node concept="3UR2Jj" id="6$gg4kBQMAn" role="lGtFl">
       <node concept="TZ5HA" id="6$gg4kBQMAo" role="TZ5H$">
         <node concept="1dT_AC" id="6$gg4kBQMAp" role="1dT_Ay">
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index e237c8e4..05d7522c 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -377,14 +377,22 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
+      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
+        <child id="540871147943773366" name="argument" index="25WWJ7" />
+      </concept>
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
+      <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
+        <child id="1237721435807" name="elementType" index="HW$YZ" />
+        <child id="1237731803878" name="copyFrom" index="I$8f6" />
+      </concept>
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
+      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -851,6 +859,12 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="MFuM6QKk6o" role="3clF46">
+        <property role="TrG5h" value="options" />
+        <node concept="3uibUv" id="MFuM6QKm2C" role="1tU5fm">
+          <ref role="3uigEE" node="MFuM6QJLE2" resolve="Step.Options" />
+        </node>
+      </node>
       <node concept="37vLTG" id="6kREIVkNb76" role="3clF46">
         <property role="TrG5h" value="subscribeScheduler" />
         <node concept="3uibUv" id="6kREIVkNb77" role="1tU5fm">
@@ -1313,40 +1327,27 @@
     <property role="1sVAO0" value="true" />
     <property role="3GE5qa" value="launch.step" />
     <node concept="2tJIrI" id="NKt6yndqxK" role="jymVt" />
-    <node concept="3clFb_" id="Hg6Enc2x8M" role="jymVt">
-      <property role="TrG5h" value="schedule" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="37vLTG" id="Hg6Enc3Jbw" role="3clF46">
-        <property role="TrG5h" value="input" />
-        <node concept="3uibUv" id="Hg6Enc3Olc" role="1tU5fm">
-          <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="3uibUv" id="2daneBPPk8N" role="11_B2D">
-            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
-            <node concept="16syzq" id="2daneBPPkKm" role="11_B2D">
-              <ref role="16sUi3" node="1pPth$lD_uI" resolve="Pred" />
-            </node>
-          </node>
+    <node concept="312cEu" id="MFuM6QJLE2" role="jymVt">
+      <property role="TrG5h" value="Options" />
+      <property role="1sVAO0" value="true" />
+      <node concept="2tJIrI" id="MFuM6QJPgF" role="jymVt" />
+      <node concept="3clFb_" id="MFuM6QK9xq" role="jymVt">
+        <property role="TrG5h" value="getOption" />
+        <property role="1EzhhJ" value="true" />
+        <node concept="37vLTG" id="MFuM6QKaWm" role="3clF46">
+          <property role="TrG5h" value="key" />
+          <node concept="17QB3L" id="MFuM6QKb7k" role="1tU5fm" />
         </node>
-      </node>
-      <node concept="37vLTG" id="6kREIVkMCSD" role="3clF46">
-        <property role="TrG5h" value="subscribeScheduler" />
-        <node concept="3uibUv" id="6kREIVkMJcG" role="1tU5fm">
-          <ref role="3uigEE" to="unkn:~Scheduler" resolve="Scheduler" />
+        <node concept="3uibUv" id="MFuM6QK9Jt" role="3clF45">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>
+        <node concept="3Tm1VV" id="MFuM6QK9xt" role="1B3o_S" />
+        <node concept="3clFbS" id="MFuM6QK9xu" role="3clF47" />
       </node>
-      <node concept="3uibUv" id="Hg6Enc6cUH" role="3clF45">
-        <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-        <node concept="3qUE_q" id="Hg6Enc6olk" role="11_B2D">
-          <node concept="3uibUv" id="Hg6Enc6oUe" role="3qUE_r">
-            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
-            <node concept="3qTvmN" id="Hg6Encs16z" role="11_B2D" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tmbuc" id="Hg6EncFur4" role="1B3o_S" />
-      <node concept="3clFbS" id="Hg6Enc2x8Q" role="3clF47" />
+      <node concept="2tJIrI" id="MFuM6QK4rq" role="jymVt" />
+      <node concept="3Tm1VV" id="MFuM6QJLE3" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="Hg6Enc2rPV" role="jymVt" />
+    <node concept="2tJIrI" id="MFuM6QK3US" role="jymVt" />
     <node concept="3clFb_" id="Hg6EnccFiY" role="jymVt">
       <property role="DiZV1" value="true" />
       <property role="TrG5h" value="doSchedule" />
@@ -1365,6 +1366,12 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="MFuM6QXHtn" role="3clF46">
+        <property role="TrG5h" value="options" />
+        <node concept="3uibUv" id="MFuM6QXIs6" role="1tU5fm">
+          <ref role="3uigEE" node="MFuM6QJLE2" resolve="Step.Options" />
+        </node>
+      </node>
       <node concept="37vLTG" id="6kREIVkMPWo" role="3clF46">
         <property role="TrG5h" value="subscribeScheduler" />
         <node concept="3uibUv" id="6kREIVkMWsj" role="1tU5fm">
@@ -1469,6 +1476,9 @@
                   </node>
                 </node>
               </node>
+              <node concept="37vLTw" id="MFuM6RvurJ" role="37wK5m">
+                <ref role="3cqZAo" node="MFuM6QXHtn" resolve="options" />
+              </node>
               <node concept="37vLTw" id="4BHjwwGpzZv" role="37wK5m">
                 <ref role="3cqZAo" node="6kREIVkMPWo" resolve="subscribeScheduler" />
               </node>
@@ -1491,7 +1501,46 @@
     </node>
     <node concept="2tJIrI" id="6kREIVkgSQq" role="jymVt" />
     <node concept="3Tm1VV" id="1pPth$lAzAy" role="1B3o_S" />
-    <node concept="2tJIrI" id="2daneBPWVeo" role="jymVt" />
+    <node concept="3clFb_" id="Hg6Enc2x8M" role="jymVt">
+      <property role="TrG5h" value="schedule" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="37vLTG" id="Hg6Enc3Jbw" role="3clF46">
+        <property role="TrG5h" value="input" />
+        <node concept="3uibUv" id="Hg6Enc3Olc" role="1tU5fm">
+          <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
+          <node concept="3uibUv" id="2daneBPPk8N" role="11_B2D">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="16syzq" id="2daneBPPkKm" role="11_B2D">
+              <ref role="16sUi3" node="1pPth$lD_uI" resolve="Pred" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="MFuM6QL1aE" role="3clF46">
+        <property role="TrG5h" value="options" />
+        <node concept="3uibUv" id="MFuM6QL2ct" role="1tU5fm">
+          <ref role="3uigEE" node="MFuM6QJLE2" resolve="Step.Options" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="6kREIVkMCSD" role="3clF46">
+        <property role="TrG5h" value="subscribeScheduler" />
+        <node concept="3uibUv" id="6kREIVkMJcG" role="1tU5fm">
+          <ref role="3uigEE" to="unkn:~Scheduler" resolve="Scheduler" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="Hg6Enc6cUH" role="3clF45">
+        <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
+        <node concept="3qUE_q" id="Hg6Enc6olk" role="11_B2D">
+          <node concept="3uibUv" id="Hg6Enc6oUe" role="3qUE_r">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="3qTvmN" id="Hg6Encs16z" role="11_B2D" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tmbuc" id="Hg6EncFur4" role="1B3o_S" />
+      <node concept="3clFbS" id="Hg6Enc2x8Q" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="MFuM6QK3lQ" role="jymVt" />
     <node concept="16euLQ" id="1pPth$lD_uI" role="16eVyc">
       <property role="TrG5h" value="Pred" />
       <node concept="3uibUv" id="1pPth$lDDZf" role="3ztrMU">
@@ -1521,6 +1570,12 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="MFuM6QKOGx" role="3clF46">
+        <property role="TrG5h" value="options" />
+        <node concept="3uibUv" id="MFuM6QKOQX" role="1tU5fm">
+          <ref role="3uigEE" node="MFuM6QJLE2" resolve="Step.Options" />
+        </node>
+      </node>
       <node concept="37vLTG" id="6kREIVkO568" role="3clF46">
         <property role="TrG5h" value="subscribeScheduler" />
         <node concept="3uibUv" id="6kREIVkO8ik" role="1tU5fm">
@@ -1710,6 +1765,12 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="MFuM6QKC1J" role="3clF46">
+        <property role="TrG5h" value="options" />
+        <node concept="3uibUv" id="MFuM6QKF8q" role="1tU5fm">
+          <ref role="3uigEE" node="MFuM6QJLE2" resolve="Step.Options" />
+        </node>
+      </node>
       <node concept="37vLTG" id="55Q$YFtJK$D" role="3clF46">
         <property role="TrG5h" value="subscribeScheduler" />
         <node concept="3uibUv" id="55Q$YFtJK$E" role="1tU5fm">
@@ -1774,6 +1835,9 @@
                 </node>
               </node>
             </node>
+            <node concept="37vLTw" id="MFuM6R1fk2" role="37wK5m">
+              <ref role="3cqZAo" node="MFuM6QKC1J" resolve="options" />
+            </node>
             <node concept="37vLTw" id="55Q$YFtJNKc" role="37wK5m">
               <ref role="3cqZAo" node="55Q$YFtJK$D" resolve="subscribeScheduler" />
             </node>
@@ -1810,6 +1874,12 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="MFuM6R15pK" role="3clF46">
+        <property role="TrG5h" value="options" />
+        <node concept="3uibUv" id="MFuM6R19K3" role="1tU5fm">
+          <ref role="3uigEE" node="MFuM6QJLE2" resolve="Step.Options" />
+        </node>
+      </node>
       <node concept="37vLTG" id="55Q$YFtIho8" role="3clF46">
         <property role="TrG5h" value="subscribeScheduler" />
         <node concept="3uibUv" id="55Q$YFtIjHl" role="1tU5fm">
@@ -3858,7 +3928,7 @@
       </node>
       <node concept="3Tm1VV" id="3F6vMxqaxpn" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="3F6vMxqas_j" role="jymVt" />
+    <node concept="2tJIrI" id="MFuM6QJHmB" role="jymVt" />
     <node concept="3clFbW" id="1pPth$lK1ZL" role="jymVt">
       <node concept="3cqZAl" id="1pPth$lK1ZN" role="3clF45" />
       <node concept="3Tm1VV" id="1pPth$lKoEj" role="1B3o_S" />
@@ -3876,22 +3946,27 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="6kREIVkDz_3" role="3cqZAp">
-          <node concept="37vLTI" id="6kREIVkD$L$" role="3clFbG">
-            <node concept="2OqwBi" id="6kREIVkDzO6" role="37vLTJ">
-              <node concept="Xjq3P" id="6kREIVkDz_1" role="2Oq$k0" />
-              <node concept="2OwXpG" id="6kREIVkDzVd" role="2OqNvi">
+        <node concept="3clFbF" id="MFuM6QZHjC" role="3cqZAp">
+          <node concept="37vLTI" id="MFuM6QZHjD" role="3clFbG">
+            <node concept="2OqwBi" id="MFuM6QZHjE" role="37vLTJ">
+              <node concept="Xjq3P" id="MFuM6QZHjF" role="2Oq$k0" />
+              <node concept="2OwXpG" id="MFuM6QZHjG" role="2OqNvi">
                 <ref role="2Oxat5" node="6kREIVkBoz0" resolve="steps" />
               </node>
             </node>
-            <node concept="2OqwBi" id="6kREIVkDCE1" role="37vLTx">
-              <node concept="2OqwBi" id="6kREIVkDAD_" role="2Oq$k0">
-                <node concept="37vLTw" id="6kREIVkWJEL" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6kREIVkWIC4" resolve="steps" />
+            <node concept="2ShNRf" id="MFuM6QZHjH" role="37vLTx">
+              <node concept="Tc6Ow" id="MFuM6QZHjI" role="2ShVmc">
+                <node concept="3uibUv" id="MFuM6QZHjJ" role="HW$YZ">
+                  <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+                  <node concept="3qTvmN" id="MFuM6QZHjK" role="11_B2D" />
+                </node>
+                <node concept="2OqwBi" id="MFuM6QZJdd" role="I$8f6">
+                  <node concept="37vLTw" id="MFuM6QZHjL" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6kREIVkWIC4" resolve="steps" />
+                  </node>
+                  <node concept="39bAoz" id="MFuM6QZJLs" role="2OqNvi" />
                 </node>
-                <node concept="39bAoz" id="6kREIVkDBvV" role="2OqNvi" />
               </node>
-              <node concept="ANE8D" id="6kREIVkDDg6" role="2OqNvi" />
             </node>
           </node>
         </node>
@@ -3979,14 +4054,19 @@
                 <ref role="2Oxat5" node="6kREIVkBoz0" resolve="steps" />
               </node>
             </node>
-            <node concept="2OqwBi" id="443LGHBiDFa" role="37vLTx">
-              <node concept="2OqwBi" id="443LGHBiDFb" role="2Oq$k0">
-                <node concept="37vLTw" id="443LGHBiDFc" role="2Oq$k0">
-                  <ref role="3cqZAo" node="443LGHBiDFh" resolve="steps" />
+            <node concept="2ShNRf" id="MFuM6QZAEt" role="37vLTx">
+              <node concept="Tc6Ow" id="MFuM6QZD9M" role="2ShVmc">
+                <node concept="3uibUv" id="MFuM6QZDIJ" role="HW$YZ">
+                  <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+                  <node concept="3qTvmN" id="MFuM6QZDK1" role="11_B2D" />
+                </node>
+                <node concept="2OqwBi" id="MFuM6QZK4q" role="I$8f6">
+                  <node concept="37vLTw" id="443LGHBiDFc" role="2Oq$k0">
+                    <ref role="3cqZAo" node="443LGHBiDFh" resolve="steps" />
+                  </node>
+                  <node concept="39bAoz" id="MFuM6QZKoN" role="2OqNvi" />
                 </node>
-                <node concept="39bAoz" id="443LGHBiDFd" role="2OqNvi" />
               </node>
-              <node concept="ANE8D" id="443LGHBiDFe" role="2OqNvi" />
             </node>
           </node>
         </node>
@@ -4001,6 +4081,105 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="MFuM6QYkrL" role="jymVt" />
+    <node concept="3clFb_" id="MFuM6QZiyv" role="jymVt">
+      <property role="TrG5h" value="addStep" />
+      <node concept="37vLTG" id="MFuM6QZSUo" role="3clF46">
+        <property role="TrG5h" value="step" />
+        <node concept="3uibUv" id="MFuM6QZWrC" role="1tU5fm">
+          <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+          <node concept="3qTvmN" id="MFuM6QZWtL" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="MFuM6QZnSB" role="3clF45">
+        <ref role="3uigEE" node="1pPth$l_TFV" resolve="CoderulesHelper" />
+      </node>
+      <node concept="3Tm1VV" id="MFuM6QZiyy" role="1B3o_S" />
+      <node concept="3clFbS" id="MFuM6QZiyz" role="3clF47">
+        <node concept="3clFbF" id="MFuM6QZYbf" role="3cqZAp">
+          <node concept="2OqwBi" id="MFuM6QZZnZ" role="3clFbG">
+            <node concept="2OqwBi" id="MFuM6QZYkA" role="2Oq$k0">
+              <node concept="Xjq3P" id="MFuM6QZYbe" role="2Oq$k0" />
+              <node concept="2OwXpG" id="MFuM6QZYsx" role="2OqNvi">
+                <ref role="2Oxat5" node="6kREIVkBoz0" resolve="steps" />
+              </node>
+            </node>
+            <node concept="TSZUe" id="MFuM6R00ej" role="2OqNvi">
+              <node concept="37vLTw" id="MFuM6R00oV" role="25WWJ7">
+                <ref role="3cqZAo" node="MFuM6QZSUo" resolve="step" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="MFuM6R00GL" role="3cqZAp">
+          <node concept="Xjq3P" id="MFuM6R00GJ" role="3clFbG" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="MFuM6QZcPL" role="jymVt" />
+    <node concept="3clFb_" id="MFuM6QYrJ_" role="jymVt">
+      <property role="TrG5h" value="withCallback" />
+      <node concept="37vLTG" id="MFuM6QYZJ7" role="3clF46">
+        <property role="TrG5h" value="callback" />
+        <node concept="3uibUv" id="MFuM6QYZJ8" role="1tU5fm">
+          <ref role="3uigEE" node="3F6vMxqaxpm" resolve="CoderulesHelper.ProgressCallback" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="MFuM6QYJBO" role="3clF45">
+        <ref role="3uigEE" node="1pPth$l_TFV" resolve="CoderulesHelper" />
+      </node>
+      <node concept="3Tm1VV" id="MFuM6QYrJC" role="1B3o_S" />
+      <node concept="3clFbS" id="MFuM6QYrJD" role="3clF47">
+        <node concept="3clFbF" id="MFuM6QZ7A4" role="3cqZAp">
+          <node concept="37vLTI" id="MFuM6QZ800" role="3clFbG">
+            <node concept="37vLTw" id="MFuM6QZ8bq" role="37vLTx">
+              <ref role="3cqZAo" node="MFuM6QYZJ7" resolve="callback" />
+            </node>
+            <node concept="2OqwBi" id="MFuM6QZ7Jr" role="37vLTJ">
+              <node concept="Xjq3P" id="MFuM6QZ7A2" role="2Oq$k0" />
+              <node concept="2OwXpG" id="MFuM6QZ7PU" role="2OqNvi">
+                <ref role="2Oxat5" node="3F6vMxqaA$x" resolve="callback" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="MFuM6QZ8i5" role="3cqZAp">
+          <node concept="Xjq3P" id="MFuM6QZ8i3" role="3clFbG" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="MFuM6R00Uk" role="jymVt" />
+    <node concept="3clFb_" id="MFuM6R00U6" role="jymVt">
+      <property role="TrG5h" value="withOptions" />
+      <node concept="37vLTG" id="MFuM6R00U7" role="3clF46">
+        <property role="TrG5h" value="options" />
+        <node concept="3uibUv" id="MFuM6R0g$I" role="1tU5fm">
+          <ref role="3uigEE" node="MFuM6QJLE2" resolve="Step.Options" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="MFuM6R00U9" role="3clF45">
+        <ref role="3uigEE" node="1pPth$l_TFV" resolve="CoderulesHelper" />
+      </node>
+      <node concept="3Tm1VV" id="MFuM6R00Ua" role="1B3o_S" />
+      <node concept="3clFbS" id="MFuM6R00Ub" role="3clF47">
+        <node concept="3clFbF" id="MFuM6R0sLE" role="3cqZAp">
+          <node concept="37vLTI" id="MFuM6R0tda" role="3clFbG">
+            <node concept="37vLTw" id="MFuM6R0uja" role="37vLTx">
+              <ref role="3cqZAo" node="MFuM6R00U7" resolve="options" />
+            </node>
+            <node concept="2OqwBi" id="MFuM6R0sWa" role="37vLTJ">
+              <node concept="Xjq3P" id="MFuM6R0sLC" role="2Oq$k0" />
+              <node concept="2OwXpG" id="MFuM6R0t29" role="2OqNvi">
+                <ref role="2Oxat5" node="MFuM6R0ncG" resolve="options" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="MFuM6R00Ui" role="3cqZAp">
+          <node concept="Xjq3P" id="MFuM6R00Uj" role="3clFbG" />
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="6kREIVkVDd1" role="jymVt" />
     <node concept="3clFb_" id="1pPth$lNVW2" role="jymVt">
       <property role="TrG5h" value="executeAsync" />
@@ -4103,7 +4282,7 @@
     </node>
     <node concept="2tJIrI" id="2daneBP$fzE" role="jymVt" />
     <node concept="3clFb_" id="2daneBP$ovk" role="jymVt">
-      <property role="TrG5h" value="executeAndWait" />
+      <property role="TrG5h" value="executeBlocking" />
       <node concept="3uibUv" id="2daneBP$xt5" role="3clF45">
         <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
         <node concept="3qUE_q" id="2daneBQ3ses" role="11_B2D">
@@ -4300,6 +4479,9 @@
                               <node concept="37vLTw" id="4BHjwwGi7Iz" role="37wK5m">
                                 <ref role="3cqZAo" node="4BHjwwGi7I_" resolve="s" />
                               </node>
+                              <node concept="37vLTw" id="MFuM6R0z0E" role="37wK5m">
+                                <ref role="3cqZAo" node="MFuM6R0ncG" resolve="options" />
+                              </node>
                               <node concept="37vLTw" id="4BHjwwGi7I$" role="37wK5m">
                                 <ref role="3cqZAo" node="2mbQB8J5_aK" resolve="subscribeScheduler" />
                               </node>
@@ -5160,6 +5342,13 @@
         <ref role="3uigEE" node="3F6vMxqaxpm" resolve="CoderulesHelper.ProgressCallback" />
       </node>
     </node>
+    <node concept="312cEg" id="MFuM6R0ncG" role="jymVt">
+      <property role="TrG5h" value="options" />
+      <node concept="3Tm6S6" id="MFuM6R0ncH" role="1B3o_S" />
+      <node concept="3uibUv" id="MFuM6R0s$x" role="1tU5fm">
+        <ref role="3uigEE" node="MFuM6QJLE2" resolve="Step.Options" />
+      </node>
+    </node>
     <node concept="312cEg" id="6kREIVko7mk" role="jymVt">
       <property role="34CwA1" value="false" />
       <property role="eg7rD" value="false" />
diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
index f31074d9..5ab46ee7 100644
--- a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
@@ -1214,6 +1214,12 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="MFuM6QKHH$" role="3clF46">
+        <property role="TrG5h" value="options" />
+        <node concept="3uibUv" id="MFuM6QKISg" role="1tU5fm">
+          <ref role="3uigEE" to="1yqb:MFuM6QJLE2" resolve="Step.Options" />
+        </node>
+      </node>
       <node concept="37vLTG" id="6kREIVkNB3d" role="3clF46">
         <property role="TrG5h" value="subscribeScheduler" />
         <node concept="3uibUv" id="6kREIVkNB3e" role="1tU5fm">
@@ -1473,6 +1479,12 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="MFuM6QKxD0" role="3clF46">
+        <property role="TrG5h" value="options" />
+        <node concept="3uibUv" id="MFuM6QKzsp" role="1tU5fm">
+          <ref role="3uigEE" to="1yqb:MFuM6QJLE2" resolve="Step.Options" />
+        </node>
+      </node>
       <node concept="37vLTG" id="6Yb9hAqUr3x" role="3clF46">
         <property role="TrG5h" value="subscribeScheduler" />
         <node concept="3uibUv" id="6Yb9hAqUr3y" role="1tU5fm">
@@ -1652,6 +1664,9 @@
                 <node concept="37vLTw" id="6Yb9hAqUOf4" role="37wK5m">
                   <ref role="3cqZAo" node="6Yb9hAqUIG3" resolve="input_trace" />
                 </node>
+                <node concept="37vLTw" id="MFuM6R5CIm" role="37wK5m">
+                  <ref role="3cqZAo" node="MFuM6QKxD0" resolve="options" />
+                </node>
                 <node concept="37vLTw" id="55Q$YFtIvC0" role="37wK5m">
                   <ref role="3cqZAo" node="6Yb9hAqUr3x" resolve="subscribeScheduler" />
                 </node>
diff --git a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
index 938b8399..ec6994f7 100644
--- a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
@@ -552,6 +552,12 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="MFuM6R0R$M" role="3clF46">
+        <property role="TrG5h" value="options" />
+        <node concept="3uibUv" id="MFuM6R0SBg" role="1tU5fm">
+          <ref role="3uigEE" to="1yqb:MFuM6QJLE2" resolve="Step.Options" />
+        </node>
+      </node>
       <node concept="37vLTG" id="6Yb9hAqJSaS" role="3clF46">
         <property role="TrG5h" value="subscribeScheduler" />
         <node concept="3uibUv" id="6Yb9hAqJSaT" role="1tU5fm">
@@ -579,6 +585,9 @@
               <node concept="37vLTw" id="6Yb9hAqJSfa" role="37wK5m">
                 <ref role="3cqZAo" node="6Yb9hAqJSaN" resolve="input_trace" />
               </node>
+              <node concept="37vLTw" id="MFuM6R1kxl" role="37wK5m">
+                <ref role="3cqZAo" node="MFuM6R0R$M" resolve="options" />
+              </node>
               <node concept="37vLTw" id="6Yb9hAqJSfb" role="37wK5m">
                 <ref role="3cqZAo" node="6Yb9hAqJSaS" resolve="subscribeScheduler" />
               </node>