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 e53fb753..b94dc3d4 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
@@ -10,6 +10,7 @@
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
+    <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
   </languages>
   <imports>
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
@@ -34,6 +35,7 @@
     <import index="lehm" ref="r:464fcc95-fddb-47d1-b620-592cbf6b8bf2(jetbrains.mps.coderules.runtime.memoizer)" />
     <import index="psoy" ref="r:78313117-90ee-47a5-a91e-b5213df7f611(jetbrains.mps.coderules.runtime.result)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
+    <import index="bid0" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.util(jetbrains.mps.logic.reactor/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
@@ -276,12 +278,14 @@
       <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
         <reference id="1116615189566" name="classifier" index="3VsUkX" />
       </concept>
-      <concept id="1178893518978" name="jetbrains.mps.baseLanguage.structure.ThisConstructorInvocation" flags="nn" index="1VxSAg" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
       <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
       </concept>
     </language>
+    <language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots">
+      <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
+    </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
         <child id="1235746996653" name="function" index="2SgG2M" />
@@ -450,7 +454,6 @@
       <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="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
-      <concept id="1240216724530" name="jetbrains.mps.baseLanguage.collections.structure.LinkedHashMapCreator" flags="nn" index="32Fmki" />
       <concept id="1240217271293" name="jetbrains.mps.baseLanguage.collections.structure.LinkedHashSetCreator" flags="nn" index="32HrFt" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1167380149909" name="jetbrains.mps.baseLanguage.collections.structure.RemoveElementOperation" flags="nn" index="3dhRuq" />
@@ -500,23 +503,12 @@
     <property role="TrG5h" value="ProgramEvaluator" />
     <property role="3GE5qa" value="" />
     <node concept="2tJIrI" id="5mr7UHcbkql" role="jymVt" />
-    <node concept="3clFbW" id="HV6urVFjOl" role="jymVt">
-      <node concept="3cqZAl" id="HV6urVFjOn" role="3clF45" />
-      <node concept="3Tm1VV" id="HV6urVFjOo" role="1B3o_S" />
-      <node concept="3clFbS" id="HV6urVFjOp" role="3clF47">
-        <node concept="1VxSAg" id="4F3SXIF5Y1f" role="3cqZAp">
-          <ref role="37wK5l" node="4F3SXIF5Xa$" resolve="ProgramEvaluator" />
-          <node concept="3clFbT" id="4F3SXIF5Y37" role="37wK5m">
-            <property role="3clFbU" value="false" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4F3SXIF5Xmc" role="jymVt" />
     <node concept="3clFbW" id="4F3SXIF5Xa$" role="jymVt">
       <node concept="37vLTG" id="4F3SXIF5Xx_" role="3clF46">
-        <property role="TrG5h" value="profiling" />
-        <node concept="10P_77" id="4F3SXIF5XyU" role="1tU5fm" />
+        <property role="TrG5h" value="profiler" />
+        <node concept="3uibUv" id="23Habm3A8tw" role="1tU5fm">
+          <ref role="3uigEE" to="bid0:~Profiler" resolve="Profiler" />
+        </node>
       </node>
       <node concept="3cqZAl" id="4F3SXIF5XaB" role="3clF45" />
       <node concept="3Tm1VV" id="4F3SXIF5XaC" role="1B3o_S" />
@@ -702,54 +694,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="4F3SXIF61$$" role="3cqZAp">
-          <node concept="3clFbS" id="4F3SXIF61$A" role="3clFbx">
-            <node concept="3clFbF" id="4F3SXIF6570" role="3cqZAp">
-              <node concept="37vLTI" id="4F3SXIF6572" role="3clFbG">
-                <node concept="2ShNRf" id="3GlpCDSBZo1" role="37vLTx">
-                  <node concept="32Fmki" id="3GlpCDSBZo2" role="2ShVmc">
-                    <node concept="17QB3L" id="3GlpCDSBZo3" role="3rHrn6" />
-                    <node concept="17QB3L" id="3GlpCDSBZo4" role="3rHtpV" />
-                  </node>
-                </node>
-                <node concept="37vLTw" id="4F3SXIF6576" role="37vLTJ">
-                  <ref role="3cqZAo" node="3GlpCDSBZo0" resolve="profilingData" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="3GlpCDSC8ug" role="3cqZAp">
-              <node concept="37vLTI" id="3GlpCDSC8uh" role="3clFbG">
-                <node concept="2OqwBi" id="3GlpCDSC8ui" role="37vLTx">
-                  <node concept="37vLTw" id="3GlpCDSC8uj" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
-                  </node>
-                  <node concept="liA8E" id="3F6vMxqqwSs" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withParameter(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$ParameterKey,java.lang.Object)" resolve="withParameter" />
-                    <node concept="2YIFZM" id="4OmcgRwkj$x" role="37wK5m">
-                      <ref role="37wK5l" to="w7la:~EvaluationSession$ParameterKey.of(java.lang.String,java.lang.Class)" resolve="of" />
-                      <ref role="1Pybhc" to="w7la:~EvaluationSession$ParameterKey" resolve="EvaluationSession.ParameterKey" />
-                      <node concept="Xl_RD" id="3F6vMxqqzhz" role="37wK5m">
-                        <property role="Xl_RC" value="profiling.data" />
-                      </node>
-                      <node concept="3VsKOn" id="4OmcgRwktYn" role="37wK5m">
-                        <ref role="3VsUkX" to="33ny:~Map" resolve="Map" />
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="3F6vMxqqAtS" role="37wK5m">
-                      <ref role="3cqZAo" node="3GlpCDSBZo0" resolve="profilingData" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTw" id="3GlpCDSC8uu" role="37vLTJ">
-                  <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="4F3SXIF62JV" role="3clFbw">
-            <ref role="3cqZAo" node="4F3SXIF5XzK" resolve="profiling" />
-          </node>
-        </node>
         <node concept="3clFbF" id="3GlpCDSD2Ms" role="3cqZAp">
           <node concept="37vLTI" id="3GlpCDSD39k" role="3clFbG">
             <node concept="37vLTw" id="3GlpCDSD2Mq" role="37vLTJ">
@@ -760,8 +704,26 @@
                 <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
               </node>
               <node concept="liA8E" id="3GlpCDSD3d3" role="2OqNvi">
-                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withTrace(jetbrains.mps.logic.reactor.evaluation.EvaluationTrace)" resolve="withTrace" />
+                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withProfiler(jetbrains.mps.logic.reactor.util.Profiler)" resolve="withProfiler" />
                 <node concept="37vLTw" id="3GlpCDSD3d4" role="37wK5m">
+                  <ref role="3cqZAo" node="4F3SXIF5XzK" resolve="profiler" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="23Habm3AyC4" role="3cqZAp">
+          <node concept="37vLTI" id="23Habm3AyC5" role="3clFbG">
+            <node concept="37vLTw" id="23Habm3AyC6" role="37vLTJ">
+              <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
+            </node>
+            <node concept="2OqwBi" id="23Habm3AyC7" role="37vLTx">
+              <node concept="37vLTw" id="23Habm3AyC8" role="2Oq$k0">
+                <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
+              </node>
+              <node concept="liA8E" id="23Habm3AyC9" role="2OqNvi">
+                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withTrace(jetbrains.mps.logic.reactor.evaluation.EvaluationTrace)" resolve="withTrace" />
+                <node concept="37vLTw" id="23Habm3AyCa" role="37wK5m">
                   <ref role="3cqZAo" node="24Vro6cQKgF" resolve="tracer" />
                 </node>
               </node>
@@ -1026,133 +988,6 @@
           </node>
           <node concept="1wplmZ" id="7SIGUfCxz0q" role="1zxBo6">
             <node concept="3clFbS" id="1Ry9kf2vh7I" role="1wplMD">
-              <node concept="3SKdUt" id="4F3SXIF5S$a" role="3cqZAp">
-                <node concept="1PaTwC" id="589APehYxNO" role="1aUNEU">
-                  <node concept="3oM_SD" id="589APehYxNP" role="1PaTwD">
-                    <property role="3oM_SC" value="report" />
-                  </node>
-                  <node concept="3oM_SD" id="589APehYxNQ" role="1PaTwD">
-                    <property role="3oM_SC" value="profiling" />
-                  </node>
-                  <node concept="3oM_SD" id="589APehYxNR" role="1PaTwD">
-                    <property role="3oM_SC" value="data" />
-                  </node>
-                  <node concept="3oM_SD" id="589APehYxNS" role="1PaTwD">
-                    <property role="3oM_SC" value="before" />
-                  </node>
-                  <node concept="3oM_SD" id="589APehYxNT" role="1PaTwD">
-                    <property role="3oM_SC" value="exiting" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbJ" id="4F3SXIF68VK" role="3cqZAp">
-                <node concept="3clFbS" id="4F3SXIF68VM" role="3clFbx">
-                  <node concept="1DcWWT" id="4F3SXIF5J_9" role="3cqZAp">
-                    <node concept="3clFbS" id="4F3SXIF5J_b" role="2LFqv$">
-                      <node concept="3cpWs8" id="4ZcizIatOSD" role="3cqZAp">
-                        <node concept="3cpWsn" id="4ZcizIatOSE" role="3cpWs9">
-                          <property role="TrG5h" value="value" />
-                          <node concept="3uibUv" id="4ZcizIatOSB" role="1tU5fm">
-                            <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                          </node>
-                          <node concept="2OqwBi" id="4ZcizIatOSF" role="33vP2m">
-                            <node concept="37vLTw" id="4ZcizIatOSG" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4F3SXIF5J_f" resolve="e" />
-                            </node>
-                            <node concept="liA8E" id="4ZcizIatOSH" role="2OqNvi">
-                              <ref role="37wK5l" to="33ny:~Map$Entry.getValue()" resolve="getValue" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="1DcWWT" id="4ZcizIatPiG" role="3cqZAp">
-                        <node concept="3clFbS" id="4ZcizIatPiI" role="2LFqv$">
-                          <node concept="3clFbF" id="4F3SXIF5J_d" role="3cqZAp">
-                            <node concept="2OqwBi" id="4F3SXIF5J_7" role="3clFbG">
-                              <node concept="37vLTw" id="4F3SXIF5J__" role="2Oq$k0">
-                                <ref role="3cqZAo" node="24Vro6cQKgF" resolve="tracer" />
-                              </node>
-                              <node concept="liA8E" id="4F3SXIF5J_x" role="2OqNvi">
-                                <ref role="37wK5l" node="18cJbc1jRnT" resolve="info" />
-                                <node concept="3cpWs3" id="4F3SXIF5J_D" role="37wK5m">
-                                  <node concept="37vLTw" id="4ZcizIatSHV" role="3uHU7w">
-                                    <ref role="3cqZAo" node="4ZcizIatPiJ" resolve="s" />
-                                  </node>
-                                  <node concept="3cpWs3" id="4F3SXIF5J_v" role="3uHU7B">
-                                    <node concept="2OqwBi" id="4F3SXIF5J_z" role="3uHU7B">
-                                      <node concept="37vLTw" id="4F3SXIF5J_p" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4F3SXIF5J_f" resolve="e" />
-                                      </node>
-                                      <node concept="liA8E" id="4F3SXIF5J$V" role="2OqNvi">
-                                        <ref role="37wK5l" to="33ny:~Map$Entry.getKey()" resolve="getKey" />
-                                      </node>
-                                    </node>
-                                    <node concept="Xl_RD" id="4F3SXIF5J_B" role="3uHU7w">
-                                      <property role="Xl_RC" value=": " />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3cpWsn" id="4ZcizIatPiJ" role="1Duv9x">
-                          <property role="TrG5h" value="s" />
-                          <node concept="17QB3L" id="4ZcizIatPB5" role="1tU5fm" />
-                        </node>
-                        <node concept="2OqwBi" id="4ZcizIatQgQ" role="1DdaDG">
-                          <node concept="37vLTw" id="4ZcizIatPUV" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4ZcizIatOSE" resolve="value" />
-                          </node>
-                          <node concept="liA8E" id="4ZcizIatRax" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~String.split(java.lang.String)" resolve="split" />
-                            <node concept="Xl_RD" id="4ZcizIatRvw" role="37wK5m">
-                              <property role="Xl_RC" value="\n" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3cpWsn" id="4F3SXIF5J_f" role="1Duv9x">
-                      <property role="TrG5h" value="e" />
-                      <node concept="3uibUv" id="4F3SXIF5J_j" role="1tU5fm">
-                        <ref role="3uigEE" to="33ny:~Map$Entry" resolve="Map.Entry" />
-                        <node concept="3uibUv" id="4F3SXIF5J_5" role="11_B2D">
-                          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                        </node>
-                        <node concept="3uibUv" id="4F3SXIF5J_F" role="11_B2D">
-                          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="4F3SXIF5J$T" role="1DdaDG">
-                      <node concept="1eOMI4" id="4F3SXIF5J$X" role="2Oq$k0">
-                        <node concept="10QFUN" id="4F3SXIF5J$Z" role="1eOMHV">
-                          <node concept="3uibUv" id="4F3SXIF5J_n" role="10QFUM">
-                            <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-                            <node concept="3uibUv" id="4F3SXIF5J_r" role="11_B2D">
-                              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                            </node>
-                            <node concept="3uibUv" id="4F3SXIF5J_t" role="11_B2D">
-                              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                            </node>
-                          </node>
-                          <node concept="37vLTw" id="4F3SXIF5J_3" role="10QFUP">
-                            <ref role="3cqZAo" node="3GlpCDSBZo0" resolve="profilingData" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="4F3SXIF5J_H" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~Map.entrySet()" resolve="entrySet" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTw" id="4F3SXIF69NZ" role="3clFbw">
-                  <ref role="3cqZAo" node="4F3SXIF5XzK" resolve="profiling" />
-                </node>
-              </node>
-              <node concept="3clFbH" id="4F3SXIF4mJi" role="3cqZAp" />
               <node concept="3clFbF" id="1Ry9kf2vk7J" role="3cqZAp">
                 <node concept="2YIFZM" id="5wYq9r5EDbI" role="3clFbG">
                   <ref role="37wK5l" to="lehm:2tjs8VC1f3O" resolve="pop" />
@@ -1199,9 +1034,11 @@
     <node concept="2tJIrI" id="4J__M6NDtw" role="jymVt" />
     <node concept="3Tm1VV" id="41ox5Vnk76b" role="1B3o_S" />
     <node concept="312cEg" id="4F3SXIF5XzK" role="jymVt">
-      <property role="TrG5h" value="profiling" />
+      <property role="TrG5h" value="profiler" />
       <node concept="3Tm6S6" id="4F3SXIF5XzL" role="1B3o_S" />
-      <node concept="10P_77" id="4F3SXIF5XzN" role="1tU5fm" />
+      <node concept="3uibUv" id="23Habm3A8OQ" role="1tU5fm">
+        <ref role="3uigEE" to="bid0:~Profiler" resolve="Profiler" />
+      </node>
     </node>
     <node concept="312cEg" id="4J__M6Mful" role="jymVt">
       <property role="TrG5h" value="evaluationResult" />
@@ -3646,31 +3483,6 @@
     <property role="3GE5qa" value="producer" />
     <node concept="2tJIrI" id="7WKNeR9b5Ef" role="jymVt" />
     <node concept="3clFbW" id="2gPa6JI$Zi_" role="jymVt">
-      <node concept="37vLTG" id="2gPa6JI$ZiA" role="3clF46">
-        <property role="TrG5h" value="name" />
-        <node concept="17QB3L" id="2gPa6JI$ZiB" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="2gPa6JI$ZiC" role="3clF46">
-        <property role="TrG5h" value="applicationSession" />
-        <node concept="3uibUv" id="2gPa6JI$ZiD" role="1tU5fm">
-          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2gPa6JI$ZiE" role="3clF46">
-        <property role="TrG5h" value="ruleProcessingSession" />
-        <node concept="3uibUv" id="2gPa6JI$ZiF" role="1tU5fm">
-          <ref role="3uigEE" node="CGeqIk8WWU" resolve="RuleProcessingSession" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2gPa6JI$ZiG" role="3clF46">
-        <property role="TrG5h" value="queryTemplate" />
-        <node concept="_YKpA" id="9UUIHJAUiz" role="1tU5fm">
-          <node concept="3uibUv" id="9UUIHJAUi$" role="_ZDj9">
-            <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
-            <node concept="3qTvmN" id="9UUIHJBkzR" role="11_B2D" />
-          </node>
-        </node>
-      </node>
       <node concept="3cqZAl" id="2gPa6JI$ZiI" role="3clF45" />
       <node concept="3Tm1VV" id="2gPa6JI$ZiJ" role="1B3o_S" />
       <node concept="3clFbS" id="2gPa6JI$ZiK" role="3clF47">
@@ -3726,6 +3538,50 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="23Habm3pz2T" role="3cqZAp">
+          <node concept="37vLTI" id="23Habm3pz2V" role="3clFbG">
+            <node concept="2OqwBi" id="23Habm3p$gu" role="37vLTJ">
+              <node concept="Xjq3P" id="23Habm3p$mg" role="2Oq$k0" />
+              <node concept="2OwXpG" id="23Habm3p$gx" role="2OqNvi">
+                <ref role="2Oxat5" node="23Habm3pz2P" resolve="myExtractValue" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="23Habm3pz2Z" role="37vLTx">
+              <ref role="3cqZAo" node="23Habm3pxBy" resolve="extractValue" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="2gPa6JI$ZiA" role="3clF46">
+        <property role="TrG5h" value="name" />
+        <node concept="17QB3L" id="2gPa6JI$ZiB" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="2gPa6JI$ZiC" role="3clF46">
+        <property role="TrG5h" value="applicationSession" />
+        <node concept="3uibUv" id="2gPa6JI$ZiD" role="1tU5fm">
+          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2gPa6JI$ZiE" role="3clF46">
+        <property role="TrG5h" value="ruleProcessingSession" />
+        <node concept="3uibUv" id="2gPa6JI$ZiF" role="1tU5fm">
+          <ref role="3uigEE" node="CGeqIk8WWU" resolve="RuleProcessingSession" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2gPa6JI$ZiG" role="3clF46">
+        <property role="TrG5h" value="queryTemplate" />
+        <node concept="_YKpA" id="9UUIHJAUiz" role="1tU5fm">
+          <node concept="3uibUv" id="9UUIHJAUi$" role="_ZDj9">
+            <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+            <node concept="3qTvmN" id="9UUIHJBkzR" role="11_B2D" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="23Habm3pxBy" role="3clF46">
+        <property role="TrG5h" value="profiler" />
+        <node concept="3uibUv" id="23Habm3pxBz" role="1tU5fm">
+          <ref role="3uigEE" to="bid0:~Profiler" resolve="Profiler" />
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2gPa6JI$Zi$" role="jymVt" />
@@ -3857,6 +3713,26 @@
                 </node>
               </node>
               <node concept="3clFbS" id="7kTeLbPojCO" role="1bW5cS">
+                <node concept="3cpWs8" id="23Habm3qczA" role="3cqZAp">
+                  <node concept="3cpWsn" id="23Habm3qczB" role="3cpWs9">
+                    <property role="TrG5h" value="token" />
+                    <node concept="3uibUv" id="23Habm3qccK" role="1tU5fm">
+                      <ref role="3uigEE" to="bid0:~Token" resolve="Token" />
+                    </node>
+                    <node concept="2EnYce" id="23Habm3qczC" role="33vP2m">
+                      <node concept="37vLTw" id="23Habm3qczD" role="2Oq$k0">
+                        <ref role="3cqZAo" node="23Habm3pz2P" resolve="profiler" />
+                      </node>
+                      <node concept="liA8E" id="23Habm3qczE" role="2OqNvi">
+                        <ref role="37wK5l" to="bid0:~Profiler.start(java.lang.String)" resolve="start" />
+                        <node concept="Xl_RD" id="23Habm3qczF" role="37wK5m">
+                          <property role="Xl_RC" value="produce program" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="23Habm3qhHN" role="3cqZAp" />
                 <node concept="3cpWs8" id="6OXbTDxOoZc" role="3cqZAp">
                   <node concept="3cpWsn" id="6OXbTDxOoZd" role="3cpWs9">
                     <property role="TrG5h" value="result" />
@@ -4019,6 +3895,18 @@
                   </node>
                 </node>
                 <node concept="3clFbH" id="6OXbTDzSpO_" role="3cqZAp" />
+                <node concept="3clFbF" id="23Habm3q4mb" role="3cqZAp">
+                  <node concept="2EnYce" id="23Habm3q4mc" role="3clFbG">
+                    <node concept="37vLTw" id="23Habm3q4md" role="2Oq$k0">
+                      <ref role="3cqZAo" node="23Habm3pz2P" resolve="profiler" />
+                    </node>
+                    <node concept="liA8E" id="23Habm3q4me" role="2OqNvi">
+                      <ref role="37wK5l" to="bid0:~Profiler.end(jetbrains.mps.logic.reactor.util.Token)" resolve="end" />
+                      <node concept="10Nm6u" id="23Habm3q7zy" role="37wK5m" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="23Habm3qbv0" role="3cqZAp" />
                 <node concept="3clFbF" id="6OXbTDzR49N" role="3cqZAp">
                   <node concept="37vLTw" id="6OXbTDzR49L" role="3clFbG">
                     <ref role="3cqZAo" node="6OXbTDxOoZd" resolve="result" />
@@ -4309,6 +4197,9 @@
                 <node concept="37vLTw" id="6nFpYlukSZ2" role="37wK5m">
                   <ref role="3cqZAo" node="6nFpYlu8ju5" resolve="updatesRecorder" />
                 </node>
+                <node concept="37vLTw" id="23Habm3sm$k" role="37wK5m">
+                  <ref role="3cqZAo" node="23Habm3pz2P" resolve="profiler" />
+                </node>
               </node>
             </node>
           </node>
@@ -4685,6 +4576,14 @@
         <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
       </node>
     </node>
+    <node concept="312cEg" id="23Habm3pz2P" role="jymVt">
+      <property role="TrG5h" value="profiler" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm6S6" id="23Habm3pz2Q" role="1B3o_S" />
+      <node concept="3uibUv" id="23Habm3pz2S" role="1tU5fm">
+        <ref role="3uigEE" to="bid0:~Profiler" resolve="Profiler" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="6OXbTD$xs00" role="jymVt" />
   </node>
   <node concept="312cEu" id="3pMFS1zdqns">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index 183e16fb..dd16a01e 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -36,6 +36,7 @@
     <import index="lehm" ref="r:464fcc95-fddb-47d1-b620-592cbf6b8bf2(jetbrains.mps.coderules.runtime.memoizer)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
+    <import index="bid0" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.util(jetbrains.mps.logic.reactor/)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -6155,6 +6156,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="23Habm3ss6v" role="3cqZAp">
+          <node concept="37vLTI" id="23Habm3ss6x" role="3clFbG">
+            <node concept="2OqwBi" id="23Habm3sDnR" role="37vLTJ">
+              <node concept="Xjq3P" id="23Habm3sDCt" role="2Oq$k0" />
+              <node concept="2OwXpG" id="23Habm3sDnU" role="2OqNvi">
+                <ref role="2Oxat5" node="23Habm3ss6r" resolve="myProfiler" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="23Habm3ss6_" role="37vLTx">
+              <ref role="3cqZAo" node="23Habm3snHP" resolve="profiler" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="37vLTG" id="cmlg9OLhb5" role="3clF46">
         <property role="TrG5h" value="planHandler" />
@@ -6186,6 +6200,12 @@
           <ref role="3uigEE" node="6nFpYlu02jD" resolve="UpdatesRecorder" />
         </node>
       </node>
+      <node concept="37vLTG" id="23Habm3snHP" role="3clF46">
+        <property role="TrG5h" value="profiler" />
+        <node concept="3uibUv" id="23Habm3snHQ" role="1tU5fm">
+          <ref role="3uigEE" to="bid0:~Profiler" resolve="Profiler" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="6i42QSspmaL" role="jymVt" />
     <node concept="3clFb_" id="7nkyKX7ncaN" role="jymVt">
@@ -6421,6 +6441,7 @@
                 </node>
               </node>
             </node>
+            <node concept="3clFbH" id="23Habm3tYwn" role="3cqZAp" />
             <node concept="3SKdUt" id="6OXbTDxA$Dn" role="3cqZAp">
               <node concept="1PaTwC" id="589APehYxQo" role="1aUNEU">
                 <node concept="3oM_SD" id="589APehYxQp" role="1PaTwD">
@@ -6443,6 +6464,26 @@
                 </node>
               </node>
             </node>
+            <node concept="3cpWs8" id="23Habm3w7T_" role="3cqZAp">
+              <node concept="3cpWsn" id="23Habm3w7TA" role="3cpWs9">
+                <property role="TrG5h" value="token1" />
+                <node concept="3uibUv" id="23Habm3w5t7" role="1tU5fm">
+                  <ref role="3uigEE" to="bid0:~Token" resolve="Token" />
+                </node>
+                <node concept="2EnYce" id="23Habm3w7TB" role="33vP2m">
+                  <node concept="37vLTw" id="23Habm3w7TC" role="2Oq$k0">
+                    <ref role="3cqZAo" node="23Habm3ss6r" resolve="profiler" />
+                  </node>
+                  <node concept="liA8E" id="23Habm3w7TD" role="2OqNvi">
+                    <ref role="37wK5l" to="bid0:~Profiler.start(java.lang.String)" resolve="start" />
+                    <node concept="Xl_RD" id="23Habm3w7TE" role="37wK5m">
+                      <property role="Xl_RC" value="process rule templates (no input)" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="23Habm3wxY1" role="3cqZAp" />
             <node concept="3cpWs8" id="2hQbw6Hwurj" role="3cqZAp">
               <node concept="3cpWsn" id="2hQbw6Hwurk" role="3cpWs9">
                 <property role="TrG5h" value="allRuleTemplatesWithNoInput" />
@@ -6553,7 +6594,21 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="6nFpYltL7jq" role="3cqZAp" />
+            <node concept="3clFbH" id="23Habm3xyA9" role="3cqZAp" />
+            <node concept="3clFbF" id="23Habm3$Kbr" role="3cqZAp">
+              <node concept="2EnYce" id="23Habm3$Kbs" role="3clFbG">
+                <node concept="37vLTw" id="23Habm3$Kbt" role="2Oq$k0">
+                  <ref role="3cqZAo" node="23Habm3ss6r" resolve="profiler" />
+                </node>
+                <node concept="liA8E" id="23Habm3$Kbu" role="2OqNvi">
+                  <ref role="37wK5l" to="bid0:~Profiler.end(jetbrains.mps.logic.reactor.util.Token)" resolve="end" />
+                  <node concept="37vLTw" id="23Habm3$Kbv" role="37wK5m">
+                    <ref role="3cqZAo" node="23Habm3w7TA" resolve="token1" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="23Habm3_dz7" role="3cqZAp" />
             <node concept="3SKdUt" id="6OXbTDxAA$7" role="3cqZAp">
               <node concept="1PaTwC" id="589APehYxQv" role="1aUNEU">
                 <node concept="3oM_SD" id="589APehYxQw" role="1PaTwD">
@@ -6573,6 +6628,26 @@
                 </node>
               </node>
             </node>
+            <node concept="3cpWs8" id="23Habm3$kb1" role="3cqZAp">
+              <node concept="3cpWsn" id="23Habm3$kb2" role="3cpWs9">
+                <property role="TrG5h" value="token2" />
+                <node concept="3uibUv" id="23Habm3$kb3" role="1tU5fm">
+                  <ref role="3uigEE" to="bid0:~Token" resolve="Token" />
+                </node>
+                <node concept="2EnYce" id="23Habm3$kb4" role="33vP2m">
+                  <node concept="37vLTw" id="23Habm3$kb5" role="2Oq$k0">
+                    <ref role="3cqZAo" node="23Habm3ss6r" resolve="profiler" />
+                  </node>
+                  <node concept="liA8E" id="23Habm3$kb6" role="2OqNvi">
+                    <ref role="37wK5l" to="bid0:~Profiler.start(java.lang.String)" resolve="start" />
+                    <node concept="Xl_RD" id="23Habm3$kb7" role="37wK5m">
+                      <property role="Xl_RC" value="process required (no input)" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="23Habm3xacg" role="3cqZAp" />
             <node concept="3cpWs8" id="5HxDM7D5Ykm" role="3cqZAp">
               <node concept="3cpWsn" id="5HxDM7D5Ykn" role="3cpWs9">
                 <property role="TrG5h" value="visited" />
@@ -6613,6 +6688,20 @@
                 </node>
               </node>
             </node>
+            <node concept="3clFbH" id="23Habm3xqoY" role="3cqZAp" />
+            <node concept="3clFbF" id="23Habm3uETv" role="3cqZAp">
+              <node concept="2EnYce" id="23Habm3uXBJ" role="3clFbG">
+                <node concept="37vLTw" id="23Habm3uETt" role="2Oq$k0">
+                  <ref role="3cqZAo" node="23Habm3ss6r" resolve="profiler" />
+                </node>
+                <node concept="liA8E" id="23Habm3v6pd" role="2OqNvi">
+                  <ref role="37wK5l" to="bid0:~Profiler.end(jetbrains.mps.logic.reactor.util.Token)" resolve="end" />
+                  <node concept="37vLTw" id="23Habm3wEI$" role="37wK5m">
+                    <ref role="3cqZAo" node="23Habm3$kb2" resolve="token2" />
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
           <node concept="3clFbC" id="2hQbw6HYQOY" role="3clFbw">
             <node concept="2OqwBi" id="2hQbw6HU0SZ" role="3uHU7B">
@@ -6655,6 +6744,26 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="23Habm3wOOl" role="3cqZAp">
+          <node concept="3cpWsn" id="23Habm3wOOm" role="3cpWs9">
+            <property role="TrG5h" value="token3" />
+            <node concept="3uibUv" id="23Habm3wLej" role="1tU5fm">
+              <ref role="3uigEE" to="bid0:~Token" resolve="Token" />
+            </node>
+            <node concept="2EnYce" id="23Habm3wOOn" role="33vP2m">
+              <node concept="37vLTw" id="23Habm3wOOo" role="2Oq$k0">
+                <ref role="3cqZAo" node="23Habm3ss6r" resolve="profiler" />
+              </node>
+              <node concept="liA8E" id="23Habm3wOOp" role="2OqNvi">
+                <ref role="37wK5l" to="bid0:~Profiler.start(java.lang.String)" resolve="start" />
+                <node concept="Xl_RD" id="23Habm3wOOq" role="37wK5m">
+                  <property role="Xl_RC" value="process rules (specified input)" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="23Habm3zs$T" role="3cqZAp" />
         <node concept="3cpWs8" id="17DrR$SPIhm" role="3cqZAp">
           <node concept="3cpWsn" id="17DrR$SPIhn" role="3cpWs9">
             <property role="TrG5h" value="skip" />
@@ -6731,6 +6840,20 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="23Habm3zjUM" role="3cqZAp" />
+        <node concept="3clFbF" id="23Habm3vvRu" role="3cqZAp">
+          <node concept="2EnYce" id="23Habm3vJP4" role="3clFbG">
+            <node concept="37vLTw" id="23Habm3vvRs" role="2Oq$k0">
+              <ref role="3cqZAo" node="23Habm3ss6r" resolve="profiler" />
+            </node>
+            <node concept="liA8E" id="23Habm3vRsX" role="2OqNvi">
+              <ref role="37wK5l" to="bid0:~Profiler.end(jetbrains.mps.logic.reactor.util.Token)" resolve="end" />
+              <node concept="37vLTw" id="23Habm3ximU" role="37wK5m">
+                <ref role="3cqZAo" node="23Habm3wOOm" resolve="token2" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbH" id="4vBwiiVccw1" role="3cqZAp" />
         <node concept="3clFbF" id="4QPCta1bMCK" role="3cqZAp">
           <node concept="37vLTw" id="4QPCta1bMCL" role="3clFbG">
@@ -6964,7 +7087,7 @@
         </node>
         <node concept="3cpWs8" id="4QPCta1aZLE" role="3cqZAp">
           <node concept="3cpWsn" id="4QPCta1aZLF" role="3cpWs9">
-            <property role="TrG5h" value="result" />
+            <property role="TrG5h" value="applyResult" />
             <node concept="3uibUv" id="4QPCta1aZLG" role="1tU5fm">
               <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
             </node>
@@ -7012,31 +7135,77 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="2fobfNk6_p1" role="3cqZAp">
-          <node concept="2OqwBi" id="2fobfNk6_p2" role="3cqZAk">
-            <node concept="37vLTw" id="2fobfNk6_p3" role="2Oq$k0">
-              <ref role="3cqZAo" node="4QPCta1aZLF" resolve="result" />
+        <node concept="3cpWs8" id="23Habm5QwsP" role="3cqZAp">
+          <node concept="3cpWsn" id="23Habm5QwsQ" role="3cpWs9">
+            <property role="TrG5h" value="token" />
+            <node concept="3uibUv" id="23Habm5QwsR" role="1tU5fm">
+              <ref role="3uigEE" to="bid0:~Token" resolve="Token" />
             </node>
-            <node concept="liA8E" id="2fobfNk6_p4" role="2OqNvi">
-              <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
-              <node concept="1rXfSq" id="2fobfNk6_p5" role="37wK5m">
-                <ref role="37wK5l" node="tIwzd1MM22" resolve="processRequired" />
-                <node concept="2OqwBi" id="5NUR$Or$9b" role="37wK5m">
-                  <node concept="37vLTw" id="5NUR$Or$9c" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4QPCta1aZL_" resolve="applyingResult" />
-                  </node>
-                  <node concept="2OwXpG" id="5NUR$Or$9d" role="2OqNvi">
-                    <ref role="2Oxat5" node="4MqhgXU_1ti" resolve="required" />
-                  </node>
+            <node concept="2EnYce" id="23Habm5QwsS" role="33vP2m">
+              <node concept="37vLTw" id="23Habm5QwsT" role="2Oq$k0">
+                <ref role="3cqZAo" node="23Habm3ss6r" resolve="profiler" />
+              </node>
+              <node concept="liA8E" id="23Habm5QwsU" role="2OqNvi">
+                <ref role="37wK5l" to="bid0:~Profiler.start(java.lang.String)" resolve="start" />
+                <node concept="Xl_RD" id="23Habm5QwsV" role="37wK5m">
+                  <property role="Xl_RC" value="process required (specified input)" />
                 </node>
-                <node concept="37vLTw" id="5HxDM7D9sDa" role="37wK5m">
-                  <ref role="3cqZAo" node="5HxDM7D6$xL" resolve="collectedVisited" />
-                </node>
-                <node concept="3clFbT" id="5HxDM7Da4fa" role="37wK5m" />
               </node>
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="23Habm5Qr5A" role="3cqZAp" />
+        <node concept="3cpWs8" id="23Habm5RYmf" role="3cqZAp">
+          <node concept="3cpWsn" id="23Habm5RYmg" role="3cpWs9">
+            <property role="TrG5h" value="result" />
+            <node concept="3uibUv" id="23Habm5RVOA" role="1tU5fm">
+              <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+            </node>
+            <node concept="2OqwBi" id="23Habm5RYmh" role="33vP2m">
+              <node concept="37vLTw" id="23Habm5RYmi" role="2Oq$k0">
+                <ref role="3cqZAo" node="4QPCta1aZLF" resolve="result" />
+              </node>
+              <node concept="liA8E" id="23Habm5RYmj" role="2OqNvi">
+                <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                <node concept="1rXfSq" id="23Habm5RYmk" role="37wK5m">
+                  <ref role="37wK5l" node="tIwzd1MM22" resolve="processRequired" />
+                  <node concept="2OqwBi" id="23Habm5RYml" role="37wK5m">
+                    <node concept="37vLTw" id="23Habm5RYmm" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4QPCta1aZL_" resolve="applyingResult" />
+                    </node>
+                    <node concept="2OwXpG" id="23Habm5RYmn" role="2OqNvi">
+                      <ref role="2Oxat5" node="4MqhgXU_1ti" resolve="required" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="23Habm5RYmo" role="37wK5m">
+                    <ref role="3cqZAo" node="5HxDM7D6$xL" resolve="collectedVisited" />
+                  </node>
+                  <node concept="3clFbT" id="23Habm5RYmp" role="37wK5m" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="23Habm5QZxM" role="3cqZAp" />
+        <node concept="3clFbF" id="23Habm5RdQ2" role="3cqZAp">
+          <node concept="2EnYce" id="23Habm5RrGu" role="3clFbG">
+            <node concept="37vLTw" id="23Habm5RdQ0" role="2Oq$k0">
+              <ref role="3cqZAo" node="23Habm3ss6r" resolve="profiler" />
+            </node>
+            <node concept="liA8E" id="23Habm5R$7x" role="2OqNvi">
+              <ref role="37wK5l" to="bid0:~Profiler.end(jetbrains.mps.logic.reactor.util.Token)" resolve="end" />
+              <node concept="37vLTw" id="23Habm5ROEK" role="37wK5m">
+                <ref role="3cqZAo" node="23Habm5QwsQ" resolve="token" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="23Habm5SqJJ" role="3cqZAp" />
+        <node concept="3cpWs6" id="2fobfNk6_p1" role="3cqZAp">
+          <node concept="37vLTw" id="23Habm5RYmq" role="3cqZAk">
+            <ref role="3cqZAo" node="23Habm5RYmg" resolve="result" />
+          </node>
+        </node>
       </node>
       <node concept="37vLTG" id="5HxDM7D6$xL" role="3clF46">
         <property role="TrG5h" value="collectedVisited" />
@@ -11363,6 +11532,13 @@
         <ref role="1PxDUh" to="hano:39eNUjlSJ9Q" resolve="TemplateTrace" />
       </node>
     </node>
+    <node concept="312cEg" id="23Habm3ss6r" role="jymVt">
+      <property role="TrG5h" value="profiler" />
+      <node concept="3Tm6S6" id="23Habm3ss6s" role="1B3o_S" />
+      <node concept="3uibUv" id="23Habm3ss6u" role="1tU5fm">
+        <ref role="3uigEE" to="bid0:~Profiler" resolve="Profiler" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="7DvO2M9IiKB">
     <property role="TrG5h" value="MacroProcessing" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
index 78a9ade5..0092ad10 100644
--- a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
@@ -1089,6 +1089,7 @@
                 <node concept="37vLTw" id="6OXbTD_ouEx" role="37wK5m">
                   <ref role="3cqZAo" node="6OXbTD_oqui" resolve="queryTemplate" />
                 </node>
+                <node concept="10Nm6u" id="23Habm3pHBH" role="37wK5m" />
               </node>
             </node>
           </node>
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 2c826440..2374d268 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
@@ -3564,6 +3564,7 @@
                       <node concept="37vLTw" id="6OXbTD_ouEx" role="37wK5m">
                         <ref role="3cqZAo" node="6OXbTD_oqui" resolve="queryTemplate" />
                       </node>
+                      <node concept="10Nm6u" id="23Habm3pLMS" role="37wK5m" />
                     </node>
                   </node>
                 </node>
@@ -3669,7 +3670,8 @@
                   </node>
                   <node concept="2ShNRf" id="6QH_LDtbV5S" role="33vP2m">
                     <node concept="1pGfFk" id="6QH_LDtbV5T" role="2ShVmc">
-                      <ref role="37wK5l" to="hano:HV6urVFjOl" resolve="ProgramEvaluator" />
+                      <ref role="37wK5l" to="hano:4F3SXIF5Xa$" resolve="ProgramEvaluator" />
+                      <node concept="10Nm6u" id="23Habm3AeEK" role="37wK5m" />
                     </node>
                   </node>
                 </node>
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 363c99b3..bff91b78 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
@@ -7819,6 +7819,7 @@
                                               <ref role="37wK5l" to="1yqb:4tC1JBnbhKw" resolve="getTemplateTrace" />
                                             </node>
                                           </node>
+                                          <node concept="10Nm6u" id="23Habm5cI0h" role="37wK5m" />
                                         </node>
                                       </node>
                                     </node>
@@ -7951,6 +7952,7 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbH" id="23Habm2cMWf" role="3cqZAp" />
           <node concept="3clFbH" id="7WKNeR8SQzp" role="3cqZAp" />
         </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 30bdc764..32e7618a 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
@@ -63,6 +63,7 @@
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
     <import index="m7o5" ref="r:835f8ea3-a800-4588-a80b-1de6d47c2098(jetbrains.mps.coderules.ideaplugin)" />
+    <import index="bid0" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.util(jetbrains.mps.logic.reactor/)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
   </imports>
   <registry>
@@ -13257,6 +13258,70 @@
               </node>
             </node>
           </node>
+          <node concept="3cpWs8" id="23Habm592xi" role="3cqZAp">
+            <node concept="3cpWsn" id="23Habm592xj" role="3cpWs9">
+              <property role="TrG5h" value="profilingData" />
+              <node concept="3uibUv" id="23Habm590WA" role="1tU5fm">
+                <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+                <node concept="3uibUv" id="23Habm590WF" role="11_B2D">
+                  <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+                </node>
+                <node concept="3uibUv" id="23Habm590WG" role="11_B2D">
+                  <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+                </node>
+              </node>
+              <node concept="10Nm6u" id="23Habm5a1RQ" role="33vP2m" />
+            </node>
+          </node>
+          <node concept="3clFbF" id="23Habm57Jjd" role="3cqZAp">
+            <node concept="2OqwBi" id="23Habm57PTF" role="3clFbG">
+              <node concept="37vLTw" id="23Habm57Jjb" role="2Oq$k0">
+                <ref role="3cqZAo" node="5Qx6_65qv$R" resolve="effect" />
+              </node>
+              <node concept="liA8E" id="23Habm57URE" role="2OqNvi">
+                <ref role="37wK5l" to="1yqb:5iJsa3_8EKs" resolve="applyIfHasValue" />
+                <node concept="10M0yZ" id="23Habm586BG" role="37wK5m">
+                  <ref role="3cqZAo" to="1yqb:23Habm2dyBS" resolve="PROFILER" />
+                  <ref role="1PxDUh" to="1yqb:1pPth$lAzAx" resolve="Step" />
+                </node>
+                <node concept="1bVj0M" id="23Habm58gvA" role="37wK5m">
+                  <node concept="3clFbS" id="23Habm58gvC" role="1bW5cS">
+                    <node concept="3clFbF" id="23Habm59S1S" role="3cqZAp">
+                      <node concept="37vLTI" id="23Habm59S1U" role="3clFbG">
+                        <node concept="37vLTw" id="23Habm59S1Y" role="37vLTJ">
+                          <ref role="3cqZAo" node="23Habm592xj" resolve="profilingData" />
+                        </node>
+                        <node concept="3K4zz7" id="23Habm5L9s8" role="37vLTx">
+                          <node concept="10Nm6u" id="23Habm5Li1J" role="3K4GZi" />
+                          <node concept="3y3z36" id="23Habm5L0NJ" role="3K4Cdx">
+                            <node concept="10Nm6u" id="23Habm5L4f9" role="3uHU7w" />
+                            <node concept="37vLTw" id="23Habm5KU4q" role="3uHU7B">
+                              <ref role="3cqZAo" node="23Habm58qi1" resolve="profiler" />
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="23Habm592xk" role="3K4E3e">
+                            <node concept="37vLTw" id="23Habm592xl" role="2Oq$k0">
+                              <ref role="3cqZAo" node="23Habm58qi1" resolve="profiler" />
+                            </node>
+                            <node concept="liA8E" id="23Habm592xm" role="2OqNvi">
+                              <ref role="37wK5l" to="bid0:~Profiler.formattedData()" resolve="formattedData" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="23Habm5alhs" role="3cqZAp" />
+                  </node>
+                  <node concept="37vLTG" id="23Habm58qi1" role="1bW2Oz">
+                    <property role="TrG5h" value="profiler" />
+                    <node concept="3uibUv" id="23Habm58wI1" role="1tU5fm">
+                      <ref role="3uigEE" to="bid0:~Profiler" resolve="Profiler" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="3clFbF" id="5iJsa3_j6h1" role="3cqZAp">
             <node concept="2OqwBi" id="5iJsa3_j6h2" role="3clFbG">
               <node concept="37vLTw" id="5iJsa3_j6h3" role="2Oq$k0">
@@ -13294,9 +13359,6 @@
                         </node>
                         <node concept="3clFbF" id="5Qx6_65qARC" role="3cqZAp">
                           <node concept="2OqwBi" id="61G6TdCoUlf" role="3clFbG">
-                            <node concept="37vLTw" id="61G6TdCoWZA" role="2Oq$k0">
-                              <ref role="3cqZAo" node="61G6TdCj0F7" resolve="request" />
-                            </node>
                             <node concept="liA8E" id="61G6TdCoUli" role="2OqNvi">
                               <ref role="37wK5l" node="1z4$59iuh0T" resolve="addTrace" />
                               <node concept="2ShNRf" id="4tC1JBnbT90" role="37wK5m">
@@ -13311,9 +13373,15 @@
                                   <node concept="37vLTw" id="4tC1JBnc8XG" role="37wK5m">
                                     <ref role="3cqZAo" node="q1hCiycetb" resolve="allReportItems" />
                                   </node>
+                                  <node concept="37vLTw" id="23Habm5aynQ" role="37wK5m">
+                                    <ref role="3cqZAo" node="23Habm592xj" resolve="profilingData" />
+                                  </node>
                                 </node>
                               </node>
                             </node>
+                            <node concept="37vLTw" id="61G6TdCoWZA" role="2Oq$k0">
+                              <ref role="3cqZAo" node="61G6TdCj0F7" resolve="request" />
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -16110,34 +16178,6 @@
       <property role="TrG5h" value="showFeedback" />
       <node concept="3Tm6S6" id="1PN9XOG$_mf" role="1B3o_S" />
       <node concept="3cqZAl" id="1PN9XOG$_mg" role="3clF45" />
-      <node concept="37vLTG" id="1PN9XOG$_lU" role="3clF46">
-        <property role="TrG5h" value="reportError" />
-        <node concept="10P_77" id="1PN9XOG$_lV" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1PN9XOG$_lW" role="3clF46">
-        <property role="TrG5h" value="reportWarn" />
-        <node concept="10P_77" id="1PN9XOG$_lX" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1PN9XOG$_lY" role="3clF46">
-        <property role="TrG5h" value="title" />
-        <node concept="17QB3L" id="1PN9XOG$_lZ" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1PN9XOG$_m0" role="3clF46">
-        <property role="TrG5h" value="txt" />
-        <node concept="17QB3L" id="1PN9XOG_07b" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1PN9XOG$_m2" role="3clF46">
-        <property role="TrG5h" value="firstCause" />
-        <node concept="3uibUv" id="1PN9XOG$_m3" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="1PN9XOG$_m4" role="3clF46">
-        <property role="TrG5h" value="traceOpt" />
-        <node concept="3uibUv" id="1PN9XOG$_m5" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-        </node>
-      </node>
       <node concept="3clFbS" id="1PN9XOG$_kL" role="3clF47">
         <node concept="3clFbJ" id="1PN9XOG$_kM" role="3cqZAp">
           <node concept="3clFbS" id="1PN9XOG$_kN" role="3clFbx">
@@ -16298,6 +16338,34 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="1PN9XOG$_lU" role="3clF46">
+        <property role="TrG5h" value="reportError" />
+        <node concept="10P_77" id="1PN9XOG$_lV" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="1PN9XOG$_lW" role="3clF46">
+        <property role="TrG5h" value="reportWarn" />
+        <node concept="10P_77" id="1PN9XOG$_lX" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="1PN9XOG$_lY" role="3clF46">
+        <property role="TrG5h" value="title" />
+        <node concept="17QB3L" id="1PN9XOG$_lZ" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="1PN9XOG$_m0" role="3clF46">
+        <property role="TrG5h" value="txt" />
+        <node concept="17QB3L" id="1PN9XOG_07b" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="1PN9XOG$_m2" role="3clF46">
+        <property role="TrG5h" value="firstCause" />
+        <node concept="3uibUv" id="1PN9XOG$_m3" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1PN9XOG$_m4" role="3clF46">
+        <property role="TrG5h" value="traceOpt" />
+        <node concept="3uibUv" id="1PN9XOG$_m5" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="9dktABI2UV" role="jymVt" />
     <node concept="312cEg" id="6nFpYluGTJA" role="jymVt">
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index dbcc1b1d..4e0864ca 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -42,6 +42,7 @@
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="m7o5" ref="r:835f8ea3-a800-4588-a80b-1de6d47c2098(jetbrains.mps.coderules.ideaplugin)" />
+    <import index="bid0" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.util(jetbrains.mps.logic.reactor/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -140,6 +141,9 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
       <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ">
         <child id="1214996921760" name="bound" index="3ztrMU" />
       </concept>
@@ -293,6 +297,9 @@
       </concept>
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
     </language>
+    <language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots">
+      <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
+    </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -794,6 +801,40 @@
                         </node>
                       </node>
                       <node concept="3clFbH" id="cmlg9OHFn3" role="3cqZAp" />
+                      <node concept="3cpWs8" id="23Habm5A_G1" role="3cqZAp">
+                        <node concept="3cpWsn" id="23Habm5A_G2" role="3cpWs9">
+                          <property role="TrG5h" value="profiler" />
+                          <node concept="3uibUv" id="23Habm5_TZ9" role="1tU5fm">
+                            <ref role="3uigEE" to="bid0:~Profiler" resolve="Profiler" />
+                          </node>
+                          <node concept="3K4zz7" id="23Habm5AEVD" role="33vP2m">
+                            <node concept="10Nm6u" id="23Habm5AIr8" role="3K4GZi" />
+                            <node concept="2OqwBi" id="23Habm5A_G3" role="3K4Cdx">
+                              <node concept="37vLTw" id="23Habm5A_G4" role="2Oq$k0">
+                                <ref role="3cqZAo" node="39eNUjm1cag" resolve="inEff" />
+                              </node>
+                              <node concept="liA8E" id="23Habm5A_G5" role="2OqNvi">
+                                <ref role="37wK5l" node="2daneBOX9Mp" resolve="hasValue" />
+                                <node concept="10M0yZ" id="23Habm5A_G6" role="37wK5m">
+                                  <ref role="3cqZAo" node="23Habm2dyBS" resolve="PROFILER" />
+                                  <ref role="1PxDUh" node="1pPth$lAzAx" resolve="Step" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="2OqwBi" id="23Habm5AGw8" role="3K4E3e">
+                              <node concept="37vLTw" id="23Habm5AGw9" role="2Oq$k0">
+                                <ref role="3cqZAo" node="39eNUjm1cag" resolve="inEff" />
+                              </node>
+                              <node concept="liA8E" id="23Habm5AGwa" role="2OqNvi">
+                                <ref role="37wK5l" node="2daneBOX8cN" resolve="getValue" />
+                                <node concept="37vLTw" id="23Habm5AGwC" role="37wK5m">
+                                  <ref role="3cqZAo" node="23Habm2dyBS" resolve="PROFILER" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                       <node concept="3clFbF" id="3bpBM3Qd92Y" role="3cqZAp">
                         <node concept="37vLTI" id="3bpBM3Qd930" role="3clFbG">
                           <node concept="2ShNRf" id="3bpBM3Qd2l1" role="37vLTx">
@@ -811,6 +852,9 @@
                               <node concept="1rXfSq" id="6nFpYluVY5_" role="37wK5m">
                                 <ref role="37wK5l" node="6nFpYluVUvm" resolve="queryTemplates" />
                               </node>
+                              <node concept="37vLTw" id="23Habm5A_G7" role="37wK5m">
+                                <ref role="3cqZAo" node="23Habm5A_G2" resolve="value" />
+                              </node>
                             </node>
                           </node>
                           <node concept="37vLTw" id="3bpBM3Qd934" role="37vLTJ">
@@ -1222,6 +1266,27 @@
         </node>
       </node>
     </node>
+    <node concept="Wx3nA" id="23Habm2dyBS" role="jymVt">
+      <property role="TrG5h" value="PROFILER" />
+      <node concept="3Tm1VV" id="23Habm2dyBT" role="1B3o_S" />
+      <node concept="3uibUv" id="23Habm2dyBU" role="1tU5fm">
+        <ref role="3uigEE" node="2daneBOX7Tv" resolve="ValueKey" />
+        <node concept="3uibUv" id="23Habm2dyBV" role="11_B2D">
+          <ref role="3uigEE" to="bid0:~Profiler" resolve="Profiler" />
+        </node>
+      </node>
+      <node concept="2YIFZM" id="23Habm2dyBW" role="33vP2m">
+        <ref role="1Pybhc" node="2daneBOWXQd" resolve="Effect" />
+        <ref role="37wK5l" node="2j1FRbwXsxX" resolve="valueKey" />
+        <node concept="Xl_RD" id="23Habm2dyBX" role="37wK5m">
+          <property role="Xl_RC" value="profiler" />
+        </node>
+        <node concept="3uibUv" id="23Habm2dyBY" role="3PaCim">
+          <ref role="3uigEE" to="bid0:~Profiler" resolve="Profiler" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="23Habm2dx3H" role="jymVt" />
     <node concept="2tJIrI" id="MFuM6QK3US" role="jymVt" />
     <node concept="3clFb_" id="Hg6EnccFiY" role="jymVt">
       <property role="DiZV1" value="true" />
@@ -1747,51 +1812,34 @@
                   </node>
                 </node>
                 <node concept="3clFbH" id="RZQG98WqPW" role="3cqZAp" />
-                <node concept="3SKdUt" id="1s7XnIW5_5z" role="3cqZAp">
-                  <node concept="1PaTwC" id="1s7XnIW5_5$" role="1aUNEU">
-                    <node concept="3oM_SD" id="1s7XnIW5_5A" role="1PaTwD">
-                      <property role="3oM_SC" value="todo:" />
+                <node concept="3cpWs8" id="23Habm3ATE1" role="3cqZAp">
+                  <node concept="3cpWsn" id="23Habm3ATE2" role="3cpWs9">
+                    <property role="TrG5h" value="profiler" />
+                    <node concept="3uibUv" id="23Habm3ARIQ" role="1tU5fm">
+                      <ref role="3uigEE" to="bid0:~Profiler" resolve="Profiler" />
                     </node>
-                    <node concept="3oM_SD" id="1s7XnIW5Bam" role="1PaTwD">
-                      <property role="3oM_SC" value="get" />
-                    </node>
-                    <node concept="3oM_SD" id="1s7XnIW5N2E" role="1PaTwD">
-                      <property role="3oM_SC" value="these" />
-                    </node>
-                    <node concept="3oM_SD" id="1s7XnIW5N2K" role="1PaTwD">
-                      <property role="3oM_SC" value="from" />
-                    </node>
-                    <node concept="3oM_SD" id="1s7XnIW5Qrf" role="1PaTwD">
-                      <property role="3oM_SC" value="Step.Options" />
-                    </node>
-                    <node concept="3oM_SD" id="1s7XnIW5S3g" role="1PaTwD">
-                      <property role="3oM_SC" value="instead" />
-                    </node>
-                    <node concept="3oM_SD" id="1s7XnIW5S3n" role="1PaTwD">
-                      <property role="3oM_SC" value="of" />
-                    </node>
-                    <node concept="3oM_SD" id="1s7XnIW5S3v" role="1PaTwD">
-                      <property role="3oM_SC" value="System" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="23c4kVtm7Ik" role="3cqZAp">
-                  <node concept="3cpWsn" id="23c4kVtm7Il" role="3cpWs9">
-                    <property role="TrG5h" value="profile" />
-                    <node concept="3uibUv" id="23c4kVtm7Ig" role="1tU5fm">
-                      <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                    </node>
-                    <node concept="2YIFZM" id="23c4kVtm7Im" role="33vP2m">
-                      <ref role="1Pybhc" to="wyt6:~Boolean" resolve="Boolean" />
-                      <ref role="37wK5l" to="wyt6:~Boolean.valueOf(java.lang.String)" resolve="valueOf" />
-                      <node concept="2YIFZM" id="23c4kVtm7In" role="37wK5m">
-                        <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
-                        <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String,java.lang.String)" resolve="getProperty" />
-                        <node concept="Xl_RD" id="23c4kVtm7Io" role="37wK5m">
-                          <property role="Xl_RC" value="logic.profile" />
+                    <node concept="3K4zz7" id="23Habm5Arau" role="33vP2m">
+                      <node concept="10Nm6u" id="23Habm5Autc" role="3K4GZi" />
+                      <node concept="2OqwBi" id="23Habm5AnKj" role="3K4Cdx">
+                        <node concept="37vLTw" id="23Habm5AnKk" role="2Oq$k0">
+                          <ref role="3cqZAo" node="51ek2rQHHIn" resolve="inEff" />
                         </node>
-                        <node concept="Xl_RD" id="23c4kVtm7Ip" role="37wK5m">
-                          <property role="Xl_RC" value="false" />
+                        <node concept="liA8E" id="23Habm5AnKl" role="2OqNvi">
+                          <ref role="37wK5l" node="2daneBOX9Mp" resolve="hasValue" />
+                          <node concept="37vLTw" id="23Habm5AnKW" role="37wK5m">
+                            <ref role="3cqZAo" node="23Habm2dyBS" resolve="PROFILER" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="23Habm5AsAY" role="3K4E3e">
+                        <node concept="37vLTw" id="23Habm5AsAZ" role="2Oq$k0">
+                          <ref role="3cqZAo" node="51ek2rQHHIn" resolve="inEff" />
+                        </node>
+                        <node concept="liA8E" id="23Habm5AsB0" role="2OqNvi">
+                          <ref role="37wK5l" node="2daneBOX8cN" resolve="getValue" />
+                          <node concept="37vLTw" id="23Habm5AsBB" role="37wK5m">
+                            <ref role="3cqZAo" node="23Habm2dyBS" resolve="PROFILER" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -1810,8 +1858,8 @@
                           <ref role="37wK5l" to="hano:4F3SXIF5Xa$" resolve="ProgramEvaluator" />
                           <ref role="1Y3XeK" to="hano:41ox5Vnk76a" resolve="ProgramEvaluator" />
                           <node concept="3Tm1VV" id="7WKNeR9ynVB" role="1B3o_S" />
-                          <node concept="37vLTw" id="23c4kVtm7Iq" role="37wK5m">
-                            <ref role="3cqZAo" node="23c4kVtm7Il" resolve="profile" />
+                          <node concept="37vLTw" id="23Habm3ATE7" role="37wK5m">
+                            <ref role="3cqZAo" node="23Habm3ATE2" resolve="value" />
                           </node>
                           <node concept="3clFb_" id="7WKNeR9yo$l" role="jymVt">
                             <property role="TrG5h" value="configure" />
@@ -2084,6 +2132,26 @@
                   </node>
                   <node concept="9aQIb" id="55xYlrmkPTE" role="9aQIa">
                     <node concept="3clFbS" id="55xYlrmkPTF" role="9aQI4">
+                      <node concept="3cpWs8" id="23Habm3B4kj" role="3cqZAp">
+                        <node concept="3cpWsn" id="23Habm3B4kk" role="3cpWs9">
+                          <property role="TrG5h" value="token" />
+                          <node concept="3uibUv" id="23Habm3B3N8" role="1tU5fm">
+                            <ref role="3uigEE" to="bid0:~Token" resolve="Token" />
+                          </node>
+                          <node concept="2EnYce" id="23Habm3B4kl" role="33vP2m">
+                            <node concept="37vLTw" id="23Habm3B4km" role="2Oq$k0">
+                              <ref role="3cqZAo" node="23Habm3ATE2" resolve="profiler" />
+                            </node>
+                            <node concept="liA8E" id="23Habm3B4kn" role="2OqNvi">
+                              <ref role="37wK5l" to="bid0:~Profiler.start(java.lang.String)" resolve="start" />
+                              <node concept="Xl_RD" id="23Habm3B4ko" role="37wK5m">
+                                <property role="Xl_RC" value="evaluate rules" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="23Habm3B77O" role="3cqZAp" />
                       <node concept="3clFbF" id="Hg6Enc7CQd" role="3cqZAp">
                         <node concept="37vLTI" id="Hg6Enc7CQe" role="3clFbG">
                           <node concept="37vLTw" id="Hg6Enc7CQf" role="37vLTJ">
@@ -2136,6 +2204,20 @@
                         </node>
                       </node>
                       <node concept="3clFbH" id="3VwM5b5Fw3$" role="3cqZAp" />
+                      <node concept="3clFbF" id="23Habm3BbC7" role="3cqZAp">
+                        <node concept="2EnYce" id="23Habm3Bdaa" role="3clFbG">
+                          <node concept="37vLTw" id="23Habm3BbC5" role="2Oq$k0">
+                            <ref role="3cqZAo" node="23Habm3ATE2" resolve="profiler" />
+                          </node>
+                          <node concept="liA8E" id="23Habm3Be5l" role="2OqNvi">
+                            <ref role="37wK5l" to="bid0:~Profiler.end(jetbrains.mps.logic.reactor.util.Token)" resolve="end" />
+                            <node concept="37vLTw" id="23Habm3BfM4" role="37wK5m">
+                              <ref role="3cqZAo" node="23Habm3B4kk" resolve="token" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="23Habm3B92_" role="3cqZAp" />
                       <node concept="3clFbJ" id="Hg6Enc7CQp" role="3cqZAp">
                         <node concept="2OqwBi" id="Hg6Enc7CQr" role="3clFbw">
                           <node concept="37vLTw" id="Hg6Enc7CQs" role="2Oq$k0">
@@ -4624,6 +4706,36 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="23Habm5FSDB" role="3cqZAp">
+          <node concept="3cpWsn" id="23Habm5FSDC" role="3cpWs9">
+            <property role="TrG5h" value="profiler" />
+            <node concept="3uibUv" id="23Habm5FQ4S" role="1tU5fm">
+              <ref role="3uigEE" to="bid0:~Profiler" resolve="Profiler" />
+            </node>
+            <node concept="3K4zz7" id="23Habm5FSDD" role="33vP2m">
+              <node concept="2OqwBi" id="23Habm5FSDH" role="3K4Cdx">
+                <node concept="10M0yZ" id="23Habm5FSDI" role="2Oq$k0">
+                  <ref role="3cqZAo" to="m7o5:23Habm5BnXh" resolve="PROFILING_ENABLED" />
+                  <ref role="1PxDUh" to="m7o5:39eNUjm3TK$" resolve="CoderulesOptions" />
+                </node>
+                <node concept="liA8E" id="23Habm5FSDJ" role="2OqNvi">
+                  <ref role="37wK5l" to="m7o5:7iCybvT$ANq" resolve="get" />
+                  <node concept="37vLTw" id="23Habm5FSDK" role="37wK5m">
+                    <ref role="3cqZAo" node="MFuM6R0ncG" resolve="config" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2ShNRf" id="23Habm5M18O" role="3K4E3e">
+                <node concept="1pGfFk" id="23Habm5Mgkv" role="2ShVmc">
+                  <property role="373rjd" value="true" />
+                  <ref role="37wK5l" to="bid0:~Profiler.&lt;init&gt;()" resolve="Profiler" />
+                </node>
+              </node>
+              <node concept="10Nm6u" id="23Habm5MkfJ" role="3K4GZi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="23Habm5G45Y" role="3cqZAp" />
         <node concept="3cpWs8" id="6kREIVkCl_J" role="3cqZAp">
           <node concept="3cpWsn" id="6kREIVkCl_K" role="3cpWs9">
             <property role="TrG5h" value="first" />
@@ -4654,6 +4766,18 @@
                     </node>
                   </node>
                 </node>
+                <node concept="2OqwBi" id="23Habm2dPPc" role="37wK5m">
+                  <node concept="10M0yZ" id="23Habm2dM4x" role="2Oq$k0">
+                    <ref role="3cqZAo" node="23Habm2dyBS" resolve="PROFILER" />
+                    <ref role="1PxDUh" node="1pPth$lAzAx" resolve="Step" />
+                  </node>
+                  <node concept="liA8E" id="23Habm2dVwR" role="2OqNvi">
+                    <ref role="37wK5l" node="6BMBBPCRIcz" resolve="is" />
+                    <node concept="37vLTw" id="23Habm2dZaM" role="37wK5m">
+                      <ref role="3cqZAo" node="23Habm5FSDC" resolve="profiler" />
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
           </node>
@@ -4674,7 +4798,7 @@
               <node concept="1MD8d$" id="4BHjwwGi7Iq" role="2OqNvi">
                 <node concept="1bVj0M" id="4BHjwwGi7Ir" role="23t8la">
                   <node concept="3clFbS" id="4BHjwwGi7Is" role="1bW5cS">
-                    <node concept="3clFbF" id="4BHjwwGi7It" role="3cqZAp">
+                    <node concept="3clFbF" id="23Habm3p6Ao" role="3cqZAp">
                       <node concept="1rXfSq" id="4BHjwwGi7Iu" role="3clFbG">
                         <ref role="37wK5l" node="6kREIVkdKgX" resolve="handleFailure" />
                         <node concept="2OqwBi" id="4BHjwwGi7Iw" role="37wK5m">
@@ -4733,6 +4857,7 @@
       <node concept="3Tm6S6" id="3bpBM3Q8Rgb" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="6kREIVkdEbN" role="jymVt" />
+    <node concept="2tJIrI" id="23Habm2qHUd" role="jymVt" />
     <node concept="3clFb_" id="6kREIVkdKgX" role="jymVt">
       <property role="TrG5h" value="handleFailure" />
       <node concept="37vLTG" id="6kREIVke7Pf" role="3clF46">
@@ -4755,18 +4880,9 @@
         <node concept="3clFbF" id="6kREIVkeeK1" role="3cqZAp">
           <node concept="2OqwBi" id="6kREIVkefh4" role="3clFbG">
             <node concept="2OqwBi" id="19OC8ZTgNM" role="2Oq$k0">
-              <node concept="37vLTw" id="6kREIVkeeK0" role="2Oq$k0">
-                <ref role="3cqZAo" node="6kREIVke7Pf" resolve="input" />
-              </node>
               <node concept="liA8E" id="19OC8ZTifG" role="2OqNvi">
                 <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
                 <node concept="1bVj0M" id="19OC8ZTkv0" role="37wK5m">
-                  <node concept="37vLTG" id="19OC8ZTlMV" role="1bW2Oz">
-                    <property role="TrG5h" value="inEff" />
-                    <node concept="3uibUv" id="19OC8ZTmZD" role="1tU5fm">
-                      <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
-                    </node>
-                  </node>
                   <node concept="3clFbS" id="19OC8ZTkv1" role="1bW5cS">
                     <node concept="3clFbH" id="19OC8ZTrDI" role="3cqZAp" />
                     <node concept="3cpWs8" id="3MwxBzGdXli" role="3cqZAp">
@@ -4785,7 +4901,7 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="1X3_iC" id="q1hCixRCeq" role="lGtFl">
+                    <node concept="1X3_iC" id="23Habm2Cj5R" role="lGtFl">
                       <property role="3V$3am" value="statement" />
                       <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
                       <node concept="3clFbJ" id="Q_4x90jLSb" role="8Wnug">
@@ -4881,8 +4997,17 @@
                     </node>
                     <node concept="3clFbH" id="19OC8ZTrDR" role="3cqZAp" />
                   </node>
+                  <node concept="37vLTG" id="19OC8ZTlMV" role="1bW2Oz">
+                    <property role="TrG5h" value="inEff" />
+                    <node concept="3uibUv" id="19OC8ZTmZD" role="1tU5fm">
+                      <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+                    </node>
+                  </node>
                 </node>
               </node>
+              <node concept="37vLTw" id="6kREIVkeeK0" role="2Oq$k0">
+                <ref role="3cqZAo" node="6kREIVke7Pf" resolve="input" />
+              </node>
             </node>
             <node concept="liA8E" id="6kREIVkeglV" role="2OqNvi">
               <ref role="37wK5l" to="unkn:~Single.doOnError(io.reactivex.functions.Consumer)" resolve="doOnError" />
@@ -7964,6 +8089,19 @@
         </node>
       </node>
     </node>
+    <node concept="312cEg" id="23Habm5btmE" role="jymVt">
+      <property role="TrG5h" value="profilingData" />
+      <node concept="3Tm6S6" id="23Habm5btmF" role="1B3o_S" />
+      <node concept="3uibUv" id="23Habm5btmH" role="1tU5fm">
+        <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+        <node concept="3uibUv" id="23Habm5btmI" role="11_B2D">
+          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+        </node>
+        <node concept="3uibUv" id="23Habm5btmJ" role="11_B2D">
+          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="4tC1JBnbdSI" role="jymVt" />
     <node concept="3clFbW" id="4tC1JBnbbB$" role="jymVt">
       <node concept="37vLTG" id="4tC1JBnbcJ1" role="3clF46">
@@ -7986,6 +8124,18 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="23Habm5aBkD" role="3clF46">
+        <property role="TrG5h" value="profilingData" />
+        <node concept="3uibUv" id="23Habm590WA" role="1tU5fm">
+          <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+          <node concept="3uibUv" id="23Habm590WF" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+          </node>
+          <node concept="3uibUv" id="23Habm590WG" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+          </node>
+        </node>
+      </node>
       <node concept="3cqZAl" id="4tC1JBnbbB_" role="3clF45" />
       <node concept="3clFbS" id="4tC1JBnbbBB" role="3clF47">
         <node concept="3clFbF" id="4tC1JBnbeMo" role="3cqZAp">
@@ -8027,6 +8177,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="23Habm5btmK" role="3cqZAp">
+          <node concept="37vLTI" id="23Habm5btmM" role="3clFbG">
+            <node concept="2OqwBi" id="23Habm5bzBd" role="37vLTJ">
+              <node concept="Xjq3P" id="23Habm5bzYg" role="2Oq$k0" />
+              <node concept="2OwXpG" id="23Habm5bzBg" role="2OqNvi">
+                <ref role="2Oxat5" node="23Habm5btmE" resolve="myProfilingData" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="23Habm5btmQ" role="37vLTx">
+              <ref role="3cqZAo" node="23Habm5aBkD" resolve="profilingData" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="3Tm1VV" id="4tC1JBnbaKg" role="1B3o_S" />
     </node>
@@ -8222,6 +8385,26 @@
         </node>
       </node>
     </node>
+    <node concept="3clFb_" id="23Habm5bH7u" role="jymVt">
+      <property role="TrG5h" value="getProfilingData" />
+      <node concept="3Tm1VV" id="23Habm5bH7x" role="1B3o_S" />
+      <node concept="3clFbS" id="23Habm5bH7y" role="3clF47">
+        <node concept="3clFbF" id="23Habm5bQu7" role="3cqZAp">
+          <node concept="37vLTw" id="23Habm5bQu6" role="3clFbG">
+            <ref role="3cqZAo" node="23Habm5btmE" resolve="profilingData" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="23Habm5bNtQ" role="3clF45">
+        <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+        <node concept="3uibUv" id="23Habm5bNtR" role="11_B2D">
+          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+        </node>
+        <node concept="3uibUv" id="23Habm5bNtS" role="11_B2D">
+          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="19fWAfxedQa">
     <property role="TrG5h" value="DefaultPrintable" />
diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
index f17353fb..2e5bbfb6 100644
--- a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
@@ -1503,6 +1503,7 @@
                                               <ref role="37wK5l" to="1yqb:4tC1JBnbhKw" resolve="getTemplateTrace" />
                                             </node>
                                           </node>
+                                          <node concept="10Nm6u" id="23Habm5cV3B" role="37wK5m" />
                                         </node>
                                       </node>
                                     </node>