diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 67c91bbe..18ec831c 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -13096,6 +13096,37 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="xaaVXv6ItX" role="jymVt" />
+    <node concept="3clFb_" id="xaaVXv6Iqg" role="jymVt">
+      <property role="TrG5h" value="isPrincipal" />
+      <property role="1EzhhJ" value="false" />
+      <node concept="10P_77" id="xaaVXv6Iqh" role="3clF45" />
+      <node concept="3Tm1VV" id="xaaVXv6Iqi" role="1B3o_S" />
+      <node concept="3clFbS" id="xaaVXv6Iqj" role="3clF47">
+        <node concept="3clFbF" id="xaaVXv6LGY" role="3cqZAp">
+          <node concept="3clFbT" id="xaaVXv6LGX" role="3clFbG">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="xaaVXv6Iqx" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+      <node concept="1W57fq" id="xaaVXv6Iqy" role="lGtFl">
+        <node concept="3IZrLx" id="xaaVXv6Iqz" role="3IZSJc">
+          <node concept="3clFbS" id="xaaVXv6Iq$" role="2VODD2">
+            <node concept="3clFbF" id="xaaVXv6Iq_" role="3cqZAp">
+              <node concept="2OqwBi" id="xaaVXv6IqB" role="3clFbG">
+                <node concept="30H73N" id="xaaVXv6IqC" role="2Oq$k0" />
+                <node concept="3TrcHB" id="xaaVXv6LFt" role="2OqNvi">
+                  <ref role="3TsBF5" to="wq2x:xaaVXv4NiS" resolve="principal" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="36tQV5AoEZr" role="jymVt" />
     <node concept="3clFb_" id="36tQV5AoEZs" role="jymVt">
       <property role="TrG5h" value="createToken" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index 2cfc01b0..962b570e 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -27,6 +27,7 @@
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
+      <concept id="1402906326896143883" name="jetbrains.mps.lang.editor.structure.CellKeyMap_FunctionParm_selectedNode" flags="nn" index="0GJ7k" />
       <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
@@ -106,6 +107,16 @@
       <concept id="1164824717996" name="jetbrains.mps.lang.editor.structure.CellMenuDescriptor" flags="ng" index="OXEIz">
         <child id="1164824815888" name="cellMenuPart" index="OY2wv" />
       </concept>
+      <concept id="1136916919141" name="jetbrains.mps.lang.editor.structure.CellKeyMapItem" flags="lg" index="2PxR9H">
+        <child id="1136916998332" name="keystroke" index="2PyaAO" />
+        <child id="1136917325338" name="isApplicableFunction" index="2Pzqsi" />
+        <child id="1136920925604" name="executeFunction" index="2PL9iG" />
+      </concept>
+      <concept id="1136916976737" name="jetbrains.mps.lang.editor.structure.CellKeyMapKeystroke" flags="ng" index="2Py5lD">
+        <property id="1136923970224" name="keycode" index="2PWKIS" />
+      </concept>
+      <concept id="1136917249679" name="jetbrains.mps.lang.editor.structure.CellKeyMap_IsApplicableFunction" flags="in" index="2Pz7Y7" />
+      <concept id="1136917288805" name="jetbrains.mps.lang.editor.structure.CellKeyMap_ExecuteFunction" flags="in" index="2PzhpH" />
       <concept id="1078938745671" name="jetbrains.mps.lang.editor.structure.EditorComponentDeclaration" flags="ig" index="PKFIW" />
       <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
         <reference id="1078939183255" name="editorComponent" index="PMmxG" />
@@ -148,6 +159,10 @@
       <concept id="1214406454886" name="jetbrains.mps.lang.editor.structure.TextBackgroundColorStyleClassItem" flags="ln" index="30gYXW" />
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
       <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
+      <concept id="1081293058843" name="jetbrains.mps.lang.editor.structure.CellKeyMapDeclaration" flags="ig" index="325Ffw">
+        <reference id="1139445935125" name="applicableConcept" index="1chiOs" />
+        <child id="1136930944870" name="item" index="2QnnpI" />
+      </concept>
       <concept id="3383245079137382180" name="jetbrains.mps.lang.editor.structure.StyleClass" flags="ig" index="14StLt" />
       <concept id="8998492695583125082" name="jetbrains.mps.lang.editor.structure.SubstituteFeature_MatchingText" flags="ng" index="16NfWO">
         <child id="8998492695583129244" name="query" index="16NeZM" />
@@ -395,6 +410,9 @@
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="1138661924179" name="jetbrains.mps.lang.smodel.structure.Property_SetOperation" flags="nn" index="tyxLq">
+        <child id="1138662048170" name="value" index="tz02z" />
+      </concept>
       <concept id="7835263205327057228" name="jetbrains.mps.lang.smodel.structure.Node_GetChildrenAndChildAttributesOperation" flags="ng" index="Bykcj" />
       <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
@@ -4004,6 +4022,35 @@
     <node concept="3EZMnI" id="36tQV5AmNNV" role="2wV5jI">
       <node concept="3F0A7n" id="36tQV5AmNOb" role="3EZMnx">
         <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+        <node concept="A1WHr" id="xaaVXv5_Jg" role="3vIgyS">
+          <ref role="2ZyFGn" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+        </node>
+      </node>
+      <node concept="3EZMnI" id="xaaVXv4QaO" role="3EZMnx">
+        <node concept="VPM3Z" id="xaaVXv4QaQ" role="3F10Kt" />
+        <node concept="3F0ifn" id="xaaVXv4Rek" role="3EZMnx">
+          <property role="3F0ifm" value="principal" />
+          <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+          <node concept="VPM3Z" id="xaaVXv4ReE" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="VPxyj" id="xaaVXv4ReJ" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+        </node>
+        <node concept="l2Vlx" id="xaaVXv4QaT" role="2iSdaV" />
+        <node concept="pkWqt" id="xaaVXv4Qbq" role="pqm2j">
+          <node concept="3clFbS" id="xaaVXv4Qbr" role="2VODD2">
+            <node concept="3clFbF" id="xaaVXv4QbA" role="3cqZAp">
+              <node concept="2OqwBi" id="xaaVXv4Qst" role="3clFbG">
+                <node concept="pncrf" id="xaaVXv4Qb_" role="2Oq$k0" />
+                <node concept="3TrcHB" id="xaaVXv4R6T" role="2OqNvi">
+                  <ref role="3TsBF5" to="wq2x:xaaVXv4NiS" resolve="principal" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="3F1sOY" id="36tQV5AmNOj" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:36tQV5AmIsx" resolve="input" />
@@ -4780,5 +4827,101 @@
   <node concept="3p36aQ" id="4hPXq9JmeBj">
     <ref role="aqKnT" to="wq2x:2E5lcNn5Ub2" resolve="LocalDeclarationStatement" />
   </node>
+  <node concept="IW6AY" id="xaaVXv4Ni3">
+    <property role="3GE5qa" value="rule" />
+    <ref role="aqKnT" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+    <node concept="1Qtc8_" id="xaaVXv4Ni4" role="IW6Ez">
+      <node concept="IWgqT" id="xaaVXv4Nig" role="1Qtc8A">
+        <node concept="1hCUdq" id="xaaVXv4Nii" role="1hCUd6">
+          <node concept="3clFbS" id="xaaVXv4Nik" role="2VODD2">
+            <node concept="3clFbF" id="xaaVXv4NiB" role="3cqZAp">
+              <node concept="Xl_RD" id="xaaVXv4NiA" role="3clFbG">
+                <property role="Xl_RC" value="principal" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="IWg2L" id="xaaVXv4Nim" role="IWgqQ">
+          <node concept="3clFbS" id="xaaVXv4Nio" role="2VODD2">
+            <node concept="3clFbF" id="xaaVXv4OmQ" role="3cqZAp">
+              <node concept="2OqwBi" id="xaaVXv4PEE" role="3clFbG">
+                <node concept="2OqwBi" id="xaaVXv4O_a" role="2Oq$k0">
+                  <node concept="7Obwk" id="xaaVXv4OmP" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="xaaVXv4P7T" role="2OqNvi">
+                    <ref role="3TsBF5" to="wq2x:xaaVXv4NiS" resolve="principal" />
+                  </node>
+                </node>
+                <node concept="tyxLq" id="xaaVXv4Q80" role="2OqNvi">
+                  <node concept="3clFbT" id="xaaVXv4Q9F" role="tz02z">
+                    <property role="3clFbU" value="true" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="27VH4U" id="xaaVXv4NiI" role="2jiSrf">
+          <node concept="3clFbS" id="xaaVXv4NiJ" role="2VODD2">
+            <node concept="3clFbF" id="xaaVXv4NjP" role="3cqZAp">
+              <node concept="3fqX7Q" id="xaaVXv4Om_" role="3clFbG">
+                <node concept="2OqwBi" id="xaaVXv4OmB" role="3fr31v">
+                  <node concept="7Obwk" id="xaaVXv4OmC" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="xaaVXv4OmD" role="2OqNvi">
+                    <ref role="3TsBF5" to="wq2x:xaaVXv4NiS" resolve="principal" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cWJ9i" id="xaaVXv4Ni8" role="1Qtc8$">
+        <node concept="CtIbL" id="xaaVXv4Nia" role="CtIbM">
+          <property role="CtIbK" value="RIGHT" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="325Ffw" id="xaaVXv4Rfc">
+    <property role="3GE5qa" value="rule" />
+    <property role="TrG5h" value="RuleTemplate_DELETE" />
+    <ref role="1chiOs" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+    <node concept="2PxR9H" id="xaaVXv4Rfd" role="2QnnpI">
+      <node concept="2Py5lD" id="xaaVXv4Rfe" role="2PyaAO">
+        <property role="2PWKIS" value="VK_DELETE" />
+      </node>
+      <node concept="2PzhpH" id="xaaVXv4Rff" role="2PL9iG">
+        <node concept="3clFbS" id="xaaVXv4Rfg" role="2VODD2">
+          <node concept="3clFbF" id="xaaVXv4S8M" role="3cqZAp">
+            <node concept="2OqwBi" id="xaaVXv4Tsy" role="3clFbG">
+              <node concept="2OqwBi" id="xaaVXv4Sn0" role="2Oq$k0">
+                <node concept="0GJ7k" id="xaaVXv4S8L" role="2Oq$k0" />
+                <node concept="3TrcHB" id="xaaVXv4STL" role="2OqNvi">
+                  <ref role="3TsBF5" to="wq2x:xaaVXv4NiS" resolve="principal" />
+                </node>
+              </node>
+              <node concept="tyxLq" id="xaaVXv4TFt" role="2OqNvi">
+                <node concept="3clFbT" id="xaaVXv4TFN" role="tz02z">
+                  <property role="3clFbU" value="false" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2Pz7Y7" id="xaaVXv4Rfl" role="2Pzqsi">
+        <node concept="3clFbS" id="xaaVXv4Rfm" role="2VODD2">
+          <node concept="3clFbF" id="xaaVXv4Rfx" role="3cqZAp">
+            <node concept="2OqwBi" id="xaaVXv4Ryf" role="3clFbG">
+              <node concept="0GJ7k" id="xaaVXv4Rfw" role="2Oq$k0" />
+              <node concept="3TrcHB" id="xaaVXv4S8B" role="2OqNvi">
+                <ref role="3TsBF5" to="wq2x:xaaVXv4NiS" resolve="principal" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index cc569fd4..bcea62eb 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -965,6 +965,11 @@
     <property role="TrG5h" value="RuleTemplate" />
     <property role="34LRSv" value="template" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyi" id="xaaVXv4NiS" role="1TKVEl">
+      <property role="IQ2nx" value="597338001513854136" />
+      <property role="TrG5h" value="principal" />
+      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
+    </node>
     <node concept="1TJgyj" id="36tQV5AmIsx" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="input" />
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 eeba9c44..eeaed715 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
@@ -5698,6 +5698,9 @@
                   </node>
                 </node>
                 <node concept="10Nm6u" id="2Qe6u2cltUB" role="37wK5m" />
+                <node concept="3clFbT" id="xaaVXviDd8" role="37wK5m">
+                  <property role="3clFbU" value="false" />
+                </node>
               </node>
             </node>
           </node>
@@ -6126,7 +6129,7 @@
             <node concept="3cpWsn" id="4QPCta1aZL_" role="3cpWs9">
               <property role="TrG5h" value="applyingResult" />
               <node concept="1rXfSq" id="4QPCta1aZLA" role="33vP2m">
-                <ref role="37wK5l" node="3IIf9O_gMkQ" resolve="applyEachDeep" />
+                <ref role="37wK5l" node="3IIf9O_gMkQ" resolve="applyEachPrincipal" />
                 <node concept="37vLTw" id="4QPCta1aZLB" role="37wK5m">
                   <ref role="3cqZAo" node="4QPCta1aZLt" resolve="input" />
                 </node>
@@ -6317,7 +6320,7 @@
                 <node concept="3cpWsn" id="6i42QSsvfVd" role="3cpWs9">
                   <property role="TrG5h" value="applyingResult" />
                   <node concept="1rXfSq" id="6i42QSsvfVe" role="33vP2m">
-                    <ref role="37wK5l" node="tIwzd1LKZY" resolve="applyEachSingle" />
+                    <ref role="37wK5l" node="tIwzd1LKZY" resolve="applyEachRequired" />
                     <node concept="37vLTw" id="6i42QSsvfVg" role="37wK5m">
                       <ref role="3cqZAo" node="tIwzd1MM10" resolve="allRequired" />
                     </node>
@@ -6413,7 +6416,7 @@
       </node>
       <node concept="2tJIrI" id="7Oc59RS_GdO" role="jymVt" />
       <node concept="3clFb_" id="3IIf9O_gMkQ" role="jymVt">
-        <property role="TrG5h" value="applyEachDeep" />
+        <property role="TrG5h" value="applyEachPrincipal" />
         <node concept="3Tm6S6" id="3IIf9O_gMkR" role="1B3o_S" />
         <node concept="3uibUv" id="3IIf9O_gMkS" role="3clF45">
           <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramProducer.ProgramFactory.ResultTriple" />
@@ -6440,8 +6443,11 @@
                         <ref role="3cqZAo" node="3IIf9O_gMkT" resolve="startFrom" />
                       </node>
                       <node concept="2ShNRf" id="3IIf9O_gMl5" role="37wK5m">
-                        <node concept="HV5vD" id="3IIf9O_gMl6" role="2ShVmc">
-                          <ref role="HV5vE" node="5ntLU8Glzc7" resolve="ProgramProducer.ProgramFactory.TemplateApplicator" />
+                        <node concept="1pGfFk" id="xaaVXviCec" role="2ShVmc">
+                          <ref role="37wK5l" node="xaaVXvi$I3" resolve="ProgramProducer.ProgramFactory.TemplateApplicator" />
+                          <node concept="3clFbT" id="xaaVXviCkr" role="37wK5m">
+                            <property role="3clFbU" value="false" />
+                          </node>
                         </node>
                       </node>
                       <node concept="3uibUv" id="3IIf9O_gMl7" role="1pMfVU">
@@ -6470,8 +6476,11 @@
                           <ref role="3cqZAo" node="3IIf9O_gMkT" resolve="startFrom" />
                         </node>
                         <node concept="2ShNRf" id="3IIf9O_gMli" role="37wK5m">
-                          <node concept="HV5vD" id="3IIf9O_gMlj" role="2ShVmc">
-                            <ref role="HV5vE" node="5ntLU8Glzc7" resolve="ProgramProducer.ProgramFactory.TemplateApplicator" />
+                          <node concept="1pGfFk" id="xaaVXviCy0" role="2ShVmc">
+                            <ref role="37wK5l" node="xaaVXvi$I3" resolve="ProgramProducer.ProgramFactory.TemplateApplicator" />
+                            <node concept="3clFbT" id="xaaVXviCCf" role="37wK5m">
+                              <property role="3clFbU" value="false" />
+                            </node>
                           </node>
                         </node>
                         <node concept="3uibUv" id="3IIf9O_gMlk" role="1pMfVU">
@@ -6491,7 +6500,7 @@
       </node>
       <node concept="2tJIrI" id="5NuEpF1pMvG" role="jymVt" />
       <node concept="3clFb_" id="tIwzd1LKZY" role="jymVt">
-        <property role="TrG5h" value="applyEachSingle" />
+        <property role="TrG5h" value="applyEachRequired" />
         <node concept="3Tm6S6" id="tIwzd1LKZZ" role="1B3o_S" />
         <node concept="3uibUv" id="4MqhgXU_Ik5" role="3clF45">
           <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramProducer.ProgramFactory.ResultTriple" />
@@ -6512,8 +6521,11 @@
                     <ref role="3cqZAo" node="tIwzd1LL0a" resolve="nodes" />
                   </node>
                   <node concept="2ShNRf" id="4UTrqZZPyYW" role="37wK5m">
-                    <node concept="HV5vD" id="4UTrqZZPyYX" role="2ShVmc">
-                      <ref role="HV5vE" node="5ntLU8Glzc7" resolve="ProgramProducer.ProgramFactory.TemplateApplicator" />
+                    <node concept="1pGfFk" id="xaaVXviCPO" role="2ShVmc">
+                      <ref role="37wK5l" node="xaaVXvi$I3" resolve="ProgramProducer.ProgramFactory.TemplateApplicator" />
+                      <node concept="3clFbT" id="xaaVXviCW3" role="37wK5m">
+                        <property role="3clFbU" value="true" />
+                      </node>
                     </node>
                   </node>
                   <node concept="3uibUv" id="4UTrqZZPyYY" role="1pMfVU">
@@ -7254,6 +7266,10 @@
           <property role="TrG5h" value="node" />
           <node concept="3Tqbb2" id="tIwzd1I3Xq" role="1tU5fm" />
         </node>
+        <node concept="37vLTG" id="xaaVXvi$r8" role="3clF46">
+          <property role="TrG5h" value="skipPrincipal" />
+          <node concept="10P_77" id="xaaVXvi$Eh" role="1tU5fm" />
+        </node>
         <node concept="3clFbS" id="tIwzd1I3Wv" role="3clF47">
           <node concept="3cpWs8" id="6i42QSsrVMN" role="3cqZAp">
             <node concept="3cpWsn" id="6i42QSsrVMO" role="3cpWs9">
@@ -7343,6 +7359,25 @@
           <node concept="3clFbH" id="4vBwiiV8924" role="3cqZAp" />
           <node concept="1DcWWT" id="tIwzd1I3Ww" role="3cqZAp">
             <node concept="3clFbS" id="tIwzd1I3Wx" role="2LFqv$">
+              <node concept="3clFbJ" id="xaaVXvp4el" role="3cqZAp">
+                <node concept="3clFbS" id="xaaVXvp4en" role="3clFbx">
+                  <node concept="3N13vt" id="xaaVXvp7Cl" role="3cqZAp" />
+                </node>
+                <node concept="1Wc70l" id="xaaVXvp7fb" role="3clFbw">
+                  <node concept="37vLTw" id="xaaVXvp7rI" role="3uHU7B">
+                    <ref role="3cqZAo" node="xaaVXvi$r8" resolve="skipPrincipal" />
+                  </node>
+                  <node concept="2OqwBi" id="xaaVXvp6wJ" role="3uHU7w">
+                    <node concept="37vLTw" id="xaaVXvp4ng" role="2Oq$k0">
+                      <ref role="3cqZAo" node="tIwzd1I3Xj" resolve="tpl" />
+                    </node>
+                    <node concept="liA8E" id="xaaVXvp77z" role="2OqNvi">
+                      <ref role="37wK5l" to="i348:xaaVXv6GTE" resolve="isPrincipal" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="xaaVXvp7Co" role="3cqZAp" />
               <node concept="3clFbF" id="4vBwiiV8A41" role="3cqZAp">
                 <node concept="2OqwBi" id="4vBwiiV8C0C" role="3clFbG">
                   <node concept="37vLTw" id="4vBwiiV8A3Z" role="2Oq$k0">
@@ -7351,7 +7386,6 @@
                   <node concept="2Kehj3" id="4vBwiiV8DII" role="2OqNvi" />
                 </node>
               </node>
-              <node concept="3clFbH" id="7DvO2MafiMe" role="3cqZAp" />
               <node concept="3clFbF" id="4vBwiiV7uJ1" role="3cqZAp">
                 <node concept="2OqwBi" id="4vBwiiV7w5X" role="3clFbG">
                   <node concept="liA8E" id="4vBwiiV7x2n" role="2OqNvi">
@@ -7384,6 +7418,7 @@
                     </node>
                   </node>
                   <node concept="3clFbH" id="4MqhgXUB$qu" role="3cqZAp" />
+                  <node concept="3clFbH" id="xaaVXvp45H" role="3cqZAp" />
                   <node concept="3cpWs8" id="6i42QSsrrpL" role="3cqZAp">
                     <node concept="3cpWsn" id="6i42QSsrrpM" role="3cpWs9">
                       <property role="TrG5h" value="result_builder" />
@@ -8131,6 +8166,30 @@
         <property role="2bfB8j" value="true" />
         <property role="TrG5h" value="TemplateApplicator" />
         <node concept="2tJIrI" id="4vBwiiVcARn" role="jymVt" />
+        <node concept="3clFbW" id="xaaVXvi$I3" role="jymVt">
+          <node concept="37vLTG" id="xaaVXvi$JH" role="3clF46">
+            <property role="TrG5h" value="skipPrincipal" />
+            <node concept="10P_77" id="xaaVXvi$JX" role="1tU5fm" />
+          </node>
+          <node concept="3cqZAl" id="xaaVXvi$I5" role="3clF45" />
+          <node concept="3Tm6S6" id="xaaVXvi$I6" role="1B3o_S" />
+          <node concept="3clFbS" id="xaaVXvi$I7" role="3clF47">
+            <node concept="3clFbF" id="xaaVXvi$LM" role="3cqZAp">
+              <node concept="37vLTI" id="xaaVXvi$LO" role="3clFbG">
+                <node concept="2OqwBi" id="xaaVXviAwn" role="37vLTJ">
+                  <node concept="Xjq3P" id="xaaVXviA_C" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="xaaVXviAwq" role="2OqNvi">
+                    <ref role="2Oxat5" node="xaaVXvi$LI" resolve="skipPrincipal" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="xaaVXvi$LS" role="37vLTx">
+                  <ref role="3cqZAo" node="xaaVXvi$JH" resolve="skipPrincipal" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2tJIrI" id="xaaVXvi$K0" role="jymVt" />
         <node concept="3clFb_" id="5ntLU8GlzgF" role="jymVt">
           <property role="1EzhhJ" value="false" />
           <property role="TrG5h" value="doAction" />
@@ -8201,6 +8260,9 @@
                   <node concept="37vLTw" id="6i42QSssRY0" role="37wK5m">
                     <ref role="3cqZAo" node="5ntLU8GlzgG" resolve="node" />
                   </node>
+                  <node concept="37vLTw" id="xaaVXviAJD" role="37wK5m">
+                    <ref role="3cqZAo" node="xaaVXvi$LI" resolve="skipPrincipal" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -8367,6 +8429,11 @@
           </node>
         </node>
         <node concept="2tJIrI" id="1CcQBrPgAwx" role="jymVt" />
+        <node concept="312cEg" id="xaaVXvi$LI" role="jymVt">
+          <property role="TrG5h" value="skipPrincipal" />
+          <node concept="3Tm6S6" id="xaaVXvi$LJ" role="1B3o_S" />
+          <node concept="10P_77" id="xaaVXvi$LL" role="1tU5fm" />
+        </node>
       </node>
       <node concept="2tJIrI" id="5ntLU8GlzbG" role="jymVt" />
       <node concept="312cEu" id="4MqhgXU$YdP" role="jymVt">
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index 18c049b3..d18e68dc 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -393,6 +393,23 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="xaaVXvjccD" role="jymVt" />
+    <node concept="3clFb_" id="xaaVXv6GTE" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="isPrincipal" />
+      <node concept="10P_77" id="xaaVXv6LWZ" role="3clF45" />
+      <node concept="3Tm1VV" id="xaaVXv6GTG" role="1B3o_S" />
+      <node concept="3clFbS" id="xaaVXv6GTI" role="3clF47">
+        <node concept="3clFbF" id="xaaVXv6GUX" role="3cqZAp">
+          <node concept="3clFbT" id="xaaVXv6GUW" role="3clFbG">
+            <property role="3clFbU" value="false" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="xaaVXv6GTJ" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="7XdbJdyi9b4" role="jymVt" />
     <node concept="3clFb_" id="7XdbJdyi9Ld" role="jymVt">
       <property role="1EzhhJ" value="false" />
@@ -717,6 +734,14 @@
       <node concept="3Tm1VV" id="1ffsG7bWyMY" role="1B3o_S" />
       <node concept="3clFbS" id="1ffsG7bWyMZ" role="3clF47" />
     </node>
+    <node concept="2tJIrI" id="xaaVXvjc6l" role="jymVt" />
+    <node concept="3clFb_" id="xaaVXv6GSk" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="isPrincipal" />
+      <node concept="10P_77" id="xaaVXv6LX8" role="3clF45" />
+      <node concept="3Tm1VV" id="xaaVXv6GSo" role="1B3o_S" />
+      <node concept="3clFbS" id="xaaVXv6GSp" role="3clF47" />
+    </node>
     <node concept="2tJIrI" id="67SsWaEmb4N" role="jymVt" />
     <node concept="3clFb_" id="4MqhgXUndvp" role="jymVt">
       <property role="1EzhhJ" value="true" />