From a425d4f64f9f9fc5e87a93b929cddf70c94b00fb Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Tue, 7 Oct 2025 13:30:02 +0200
Subject: [PATCH 01/22] Add new method (#1474)

---
 ...s3.variability.artifacts.base.behavior.mps | 333 +++++++++++++-----
 1 file changed, 245 insertions(+), 88 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index 2817a160bb..0312c55637 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -74,6 +74,23 @@
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
+      <concept id="1239360506533" name="jetbrains.mps.baseLanguage.tuples.structure.NamedTupleDeclaration" flags="ng" index="2fD8I5">
+        <child id="1239529553065" name="component" index="2pHZQ9" />
+      </concept>
+      <concept id="1239462176079" name="jetbrains.mps.baseLanguage.tuples.structure.NamedTupleComponentDeclaration" flags="ng" index="2lGYhJ">
+        <child id="1239462974287" name="type" index="2lK19J" />
+      </concept>
+      <concept id="1239559992092" name="jetbrains.mps.baseLanguage.tuples.structure.NamedTupleLiteral" flags="nn" index="2ry78W">
+        <reference id="1239560008022" name="tupleDeclaration" index="2ryb1Q" />
+        <child id="1239560910577" name="componentRef" index="2r_Bvh" />
+      </concept>
+      <concept id="1239560581441" name="jetbrains.mps.baseLanguage.tuples.structure.NamedTupleComponentReference" flags="ng" index="2r$n1x">
+        <reference id="1239560595302" name="componentDeclaration" index="2r$qp6" />
+        <child id="1239560837729" name="value" index="2r_lH1" />
+      </concept>
+      <concept id="1239576519914" name="jetbrains.mps.baseLanguage.tuples.structure.NamedTupleComponentAccessOperation" flags="nn" index="2sxana">
+        <reference id="1239576542472" name="component" index="2sxfKC" />
+      </concept>
       <concept id="1238852151516" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleType" flags="in" index="1LlUBW">
         <child id="1238852204892" name="componentType" index="1Lm7xW" />
       </concept>
@@ -4884,6 +4901,76 @@
         <node concept="3Tqbb2" id="5LihCoMjq2r" role="1tU5fm" />
       </node>
     </node>
+    <node concept="13i0hz" id="2VCmq77U2fp" role="13h7CS">
+      <property role="13i0it" value="true" />
+      <property role="TrG5h" value="getInstantiatedSubtree2" />
+      <node concept="37vLTG" id="2VCmq77U4Tb" role="3clF46">
+        <property role="TrG5h" value="n" />
+        <node concept="3Tqbb2" id="2VCmq77U4T_" role="1tU5fm" />
+      </node>
+      <node concept="3Tm1VV" id="2VCmq77U2fq" role="1B3o_S" />
+      <node concept="3vKaQO" id="2VCmq77U4UT" role="3clF45">
+        <node concept="3uibUv" id="2VCmq77U4UU" role="3O5elw">
+          <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotDuple" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="2VCmq77U2fs" role="3clF47">
+        <node concept="3cpWs8" id="2VCmq77U8XN" role="3cqZAp">
+          <node concept="3cpWsn" id="2VCmq77U8XO" role="3cpWs9">
+            <property role="TrG5h" value="pivot" />
+            <node concept="3uibUv" id="2VCmq77U8Rv" role="1tU5fm">
+              <ref role="3uigEE" node="IzpDYSOg6$" resolve="Pivot" />
+            </node>
+            <node concept="2OqwBi" id="2VCmq77U8XP" role="33vP2m">
+              <node concept="13iPFW" id="2VCmq77U8XQ" role="2Oq$k0" />
+              <node concept="2qgKlT" id="2VCmq77U8XR" role="2OqNvi">
+                <ref role="37wK5l" node="5LihCoMjncG" resolve="getInstantiatedSubtree" />
+                <node concept="37vLTw" id="2VCmq77U8XS" role="37wK5m">
+                  <ref role="3cqZAo" node="2VCmq77U4Tb" resolve="n" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="2VCmq77U9ie" role="3cqZAp">
+          <node concept="3clFbS" id="2VCmq77U9ig" role="3clFbx">
+            <node concept="3cpWs6" id="2VCmq77UH1D" role="3cqZAp">
+              <node concept="2YIFZM" id="2VCmq77UHhz" role="3cqZAk">
+                <ref role="37wK5l" to="33ny:~Collections.singleton(java.lang.Object)" resolve="singleton" />
+                <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+                <node concept="2ry78W" id="2VCmq77UIdZ" role="37wK5m">
+                  <ref role="2ryb1Q" node="2VCmq77Sge8" resolve="PivotDuple" />
+                  <node concept="2r$n1x" id="2VCmq77UIe0" role="2r_Bvh">
+                    <ref role="2r$qp6" node="2VCmq77SgeU" resolve="pivot" />
+                    <node concept="37vLTw" id="2VCmq77UIe1" role="2r_lH1">
+                      <ref role="3cqZAo" node="2VCmq77U8XO" resolve="pivot" />
+                    </node>
+                  </node>
+                  <node concept="2r$n1x" id="2VCmq77UIe2" role="2r_Bvh">
+                    <ref role="2r$qp6" node="2VCmq77SrOB" resolve="dependentOn" />
+                    <node concept="37vLTw" id="2VCmq77UIe3" role="2r_lH1">
+                      <ref role="3cqZAo" node="2VCmq77U4Tb" resolve="n" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="2VCmq77U9xO" role="3clFbw">
+            <node concept="10Nm6u" id="2VCmq77U9G5" role="3uHU7w" />
+            <node concept="37vLTw" id="2VCmq77U9j$" role="3uHU7B">
+              <ref role="3cqZAo" node="2VCmq77U8XO" resolve="pivot" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2VCmq783LYF" role="3cqZAp">
+          <node concept="2YIFZM" id="2VCmq783Mlx" role="3clFbG">
+            <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
+            <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="13i0hz" id="5zD5ovlRp39" role="13h7CS">
       <property role="13i0it" value="true" />
       <property role="TrG5h" value="referencesOf" />
@@ -19188,24 +19275,24 @@
               </node>
               <node concept="2z74zc" id="6EGd7WxOfZ" role="2OqNvi" />
             </node>
-            <node concept="3$u5V9" id="6EGd7WxR8i" role="2OqNvi">
-              <node concept="1bVj0M" id="6EGd7WxR8k" role="23t8la">
-                <node concept="3clFbS" id="6EGd7WxR8l" role="1bW5cS">
-                  <node concept="3clFbF" id="6EGd7WxSGF" role="3cqZAp">
-                    <node concept="1rXfSq" id="6EGd7WxSGE" role="3clFbG">
+            <node concept="3goQfb" id="2VCmq784cI9" role="2OqNvi">
+              <node concept="1bVj0M" id="2VCmq784cIb" role="23t8la">
+                <node concept="3clFbS" id="2VCmq784cIc" role="1bW5cS">
+                  <node concept="3clFbF" id="2VCmq784cId" role="3cqZAp">
+                    <node concept="1rXfSq" id="2VCmq784cIe" role="3clFbG">
                       <ref role="37wK5l" node="6EGd7Wxwd9" resolve="forReference" />
-                      <node concept="37vLTw" id="6EGd7WxT1v" role="37wK5m">
+                      <node concept="37vLTw" id="2VCmq784cIf" role="37wK5m">
                         <ref role="3cqZAo" node="6EGd7WxMkA" resolve="contextIVAA" />
                       </node>
-                      <node concept="37vLTw" id="6EGd7WxTj7" role="37wK5m">
-                        <ref role="3cqZAo" node="6EGd7WxR8m" resolve="ref" />
+                      <node concept="37vLTw" id="2VCmq784cIg" role="37wK5m">
+                        <ref role="3cqZAo" node="2VCmq784cIh" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="gl6BB" id="6EGd7WxR8m" role="1bW2Oz">
-                  <property role="TrG5h" value="ref" />
-                  <node concept="2jxLKc" id="6EGd7WxR8n" role="1tU5fm" />
+                <node concept="gl6BB" id="2VCmq784cIh" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="2VCmq784cIi" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -19270,21 +19357,23 @@
         </node>
         <node concept="3cpWs8" id="5zD5ovlZFHR" role="3cqZAp">
           <node concept="3cpWsn" id="5zD5ovlZFHS" role="3cpWs9">
-            <property role="TrG5h" value="pivot" />
-            <node concept="3uibUv" id="5zD5ovlZFy2" role="1tU5fm">
-              <ref role="3uigEE" node="IzpDYSOg6$" resolve="Pivot" />
-            </node>
+            <property role="TrG5h" value="pivots" />
             <node concept="2OqwBi" id="5zD5ovlZFHT" role="33vP2m">
               <node concept="37vLTw" id="6EGd7WxFQD" role="2Oq$k0">
                 <ref role="3cqZAo" node="6EGd7Wxypg" resolve="contextIVAA" />
               </node>
               <node concept="2qgKlT" id="5zD5ovlZFHV" role="2OqNvi">
-                <ref role="37wK5l" node="5LihCoMjncG" resolve="getInstantiatedSubtree" />
+                <ref role="37wK5l" node="2VCmq77U2fp" resolve="getInstantiatedSubtree2" />
                 <node concept="37vLTw" id="5zD5ovlZFHW" role="37wK5m">
                   <ref role="3cqZAo" node="5zD5ovlZCzt" resolve="refTarget" />
                 </node>
               </node>
             </node>
+            <node concept="3vKaQO" id="2VCmq783EjJ" role="1tU5fm">
+              <node concept="3uibUv" id="2VCmq783EjK" role="3O5elw">
+                <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotDuple" />
+              </node>
+            </node>
           </node>
         </node>
         <node concept="3clFbJ" id="5zD5ovlZGWg" role="3cqZAp">
@@ -19306,97 +19395,138 @@
               </node>
             </node>
             <node concept="3cpWs6" id="5zD5ovlZJam" role="3cqZAp">
-              <node concept="2ShNRf" id="5zD5ovlZJr_" role="3cqZAk">
-                <node concept="1pGfFk" id="5zD5ovlZJrA" role="2ShVmc">
-                  <property role="373rjd" value="true" />
-                  <ref role="37wK5l" node="5zD5ovlOfUg" resolve="ReferenceResolved" />
-                  <node concept="37vLTw" id="5zD5ovlZJrB" role="37wK5m">
-                    <ref role="3cqZAo" node="6EGd7Wxz2j" resolve="ref" />
+              <node concept="2YIFZM" id="2VCmq784ev1" role="3cqZAk">
+                <ref role="37wK5l" to="33ny:~Collections.singleton(java.lang.Object)" resolve="singleton" />
+                <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+                <node concept="2ShNRf" id="5zD5ovlZJr_" role="37wK5m">
+                  <node concept="1pGfFk" id="5zD5ovlZJrA" role="2ShVmc">
+                    <property role="373rjd" value="true" />
+                    <ref role="37wK5l" node="5zD5ovlOfUg" />
+                    <node concept="37vLTw" id="5zD5ovlZJrB" role="37wK5m">
+                      <ref role="3cqZAo" node="6EGd7Wxz2j" resolve="ref" />
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3clFbC" id="5zD5ovlZHKK" role="3clFbw">
-            <node concept="10Nm6u" id="5zD5ovlZI0w" role="3uHU7w" />
-            <node concept="37vLTw" id="5zD5ovlZHtd" role="3uHU7B">
-              <ref role="3cqZAo" node="5zD5ovlZFHS" resolve="pivot" />
+          <node concept="2OqwBi" id="2VCmq783OxA" role="3clFbw">
+            <node concept="37vLTw" id="5zD5ovlZHtd" role="2Oq$k0">
+              <ref role="3cqZAo" node="5zD5ovlZFHS" resolve="pivots" />
             </node>
+            <node concept="1v1jN8" id="2VCmq783R80" role="2OqNvi" />
           </node>
           <node concept="9aQIb" id="1ZWkc2up$iB" role="9aQIa">
             <node concept="3clFbS" id="1ZWkc2up$iC" role="9aQI4">
-              <node concept="3SKdUt" id="1ZWkc2urNHZ" role="3cqZAp">
-                <node concept="1PaTwC" id="1ZWkc2urNI0" role="1aUNEU">
-                  <node concept="3oM_SD" id="1ZWkc2urNWw" role="1PaTwD">
-                    <property role="3oM_SC" value="reference" />
-                  </node>
-                  <node concept="3oM_SD" id="1ZWkc2urOBj" role="1PaTwD">
-                    <property role="3oM_SC" value="to" />
-                  </node>
-                  <node concept="3oM_SD" id="1ZWkc2urPwk" role="1PaTwD">
-                    <property role="3oM_SC" value="a" />
-                  </node>
-                  <node concept="3oM_SD" id="1ZWkc2urPwo" role="1PaTwD">
-                    <property role="3oM_SC" value="pivot" />
-                  </node>
-                  <node concept="3oM_SD" id="1ZWkc2urPwt" role="1PaTwD">
-                    <property role="3oM_SC" value="node," />
-                  </node>
-                  <node concept="3oM_SD" id="1ZWkc2urQqh" role="1PaTwD">
-                    <property role="3oM_SC" value="add" />
-                  </node>
-                  <node concept="3oM_SD" id="1ZWkc2urQCz" role="1PaTwD">
-                    <property role="3oM_SC" value="relative" />
-                  </node>
-                  <node concept="3oM_SD" id="1ZWkc2urQQQ" role="1PaTwD">
-                    <property role="3oM_SC" value="path" />
-                  </node>
-                  <node concept="3oM_SD" id="1ZWkc2urRcO" role="1PaTwD">
-                    <property role="3oM_SC" value="(only" />
-                  </node>
-                  <node concept="3oM_SD" id="1ZWkc2urRcY" role="1PaTwD">
-                    <property role="3oM_SC" value="one" />
-                  </node>
-                  <node concept="3oM_SD" id="1ZWkc2urRrk" role="1PaTwD">
-                    <property role="3oM_SC" value="segment)" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs6" id="1ZWkc2up$QI" role="3cqZAp">
-                <node concept="2ShNRf" id="1ZWkc2up$QK" role="3cqZAk">
-                  <node concept="1pGfFk" id="1ZWkc2up$QL" role="2ShVmc">
-                    <property role="373rjd" value="true" />
-                    <ref role="37wK5l" node="1ZWkc2uwbkl" resolve="ReferenceResolved" />
-                    <node concept="37vLTw" id="1ZWkc2up$QM" role="37wK5m">
-                      <ref role="3cqZAo" node="6EGd7Wxz2j" resolve="ref" />
-                    </node>
-                    <node concept="2OqwBi" id="1ZWkc2up$QN" role="37wK5m">
-                      <node concept="37vLTw" id="1ZWkc2up$QO" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5zD5ovlZFHS" resolve="pivot" />
-                      </node>
-                      <node concept="liA8E" id="1ZWkc2up$QP" role="2OqNvi">
-                        <ref role="37wK5l" node="IzpDYSRzQ5" resolve="getTargetNode" />
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="1ZWkc2uudf6" role="37wK5m">
-                      <node concept="37vLTw" id="1ZWkc2uucJp" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5zD5ovlZFHS" resolve="pivot" />
-                      </node>
-                      <node concept="liA8E" id="1ZWkc2uuelm" role="2OqNvi">
-                        <ref role="37wK5l" node="1ZWkc2utFaB" resolve="asSegment" />
+              <node concept="3cpWs8" id="2VCmq7849hK" role="3cqZAp">
+                <node concept="3cpWsn" id="2VCmq7849hL" role="3cpWs9">
+                  <property role="TrG5h" value="seq" />
+                  <node concept="A3Dl8" id="2VCmq78496K" role="1tU5fm">
+                    <node concept="3uibUv" id="2VCmq78496N" role="A3Ik2">
+                      <ref role="3uigEE" node="5zD5ovlKksz" resolve="ReferenceResolved" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="2VCmq7849hM" role="33vP2m">
+                    <node concept="37vLTw" id="2VCmq7849hN" role="2Oq$k0">
+                      <ref role="3cqZAo" node="5zD5ovlZFHS" resolve="pivots" />
+                    </node>
+                    <node concept="3$u5V9" id="2VCmq7849hO" role="2OqNvi">
+                      <node concept="1bVj0M" id="2VCmq7849hP" role="23t8la">
+                        <node concept="3clFbS" id="2VCmq7849hQ" role="1bW5cS">
+                          <node concept="3SKdUt" id="2VCmq7849hR" role="3cqZAp">
+                            <node concept="1PaTwC" id="2VCmq7849hS" role="1aUNEU">
+                              <node concept="3oM_SD" id="2VCmq7849hT" role="1PaTwD">
+                                <property role="3oM_SC" value="reference" />
+                              </node>
+                              <node concept="3oM_SD" id="2VCmq7849hU" role="1PaTwD">
+                                <property role="3oM_SC" value="to" />
+                              </node>
+                              <node concept="3oM_SD" id="2VCmq7849hV" role="1PaTwD">
+                                <property role="3oM_SC" value="a" />
+                              </node>
+                              <node concept="3oM_SD" id="2VCmq7849hW" role="1PaTwD">
+                                <property role="3oM_SC" value="pivot" />
+                              </node>
+                              <node concept="3oM_SD" id="2VCmq7849hX" role="1PaTwD">
+                                <property role="3oM_SC" value="node," />
+                              </node>
+                              <node concept="3oM_SD" id="2VCmq7849hY" role="1PaTwD">
+                                <property role="3oM_SC" value="add" />
+                              </node>
+                              <node concept="3oM_SD" id="2VCmq7849hZ" role="1PaTwD">
+                                <property role="3oM_SC" value="relative" />
+                              </node>
+                              <node concept="3oM_SD" id="2VCmq7849i0" role="1PaTwD">
+                                <property role="3oM_SC" value="path" />
+                              </node>
+                              <node concept="3oM_SD" id="2VCmq7849i1" role="1PaTwD">
+                                <property role="3oM_SC" value="(only" />
+                              </node>
+                              <node concept="3oM_SD" id="2VCmq7849i2" role="1PaTwD">
+                                <property role="3oM_SC" value="one" />
+                              </node>
+                              <node concept="3oM_SD" id="2VCmq7849i3" role="1PaTwD">
+                                <property role="3oM_SC" value="segment)" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbF" id="2VCmq7849i4" role="3cqZAp">
+                            <node concept="2ShNRf" id="2VCmq7849i5" role="3clFbG">
+                              <node concept="1pGfFk" id="2VCmq7849i6" role="2ShVmc">
+                                <property role="373rjd" value="true" />
+                                <ref role="37wK5l" node="1ZWkc2uwbkl" resolve="ReferenceResolved" />
+                                <node concept="37vLTw" id="2VCmq7849i7" role="37wK5m">
+                                  <ref role="3cqZAo" node="6EGd7Wxz2j" resolve="ref" />
+                                </node>
+                                <node concept="2OqwBi" id="2VCmq7849i8" role="37wK5m">
+                                  <node concept="2OqwBi" id="2VCmq7849i9" role="2Oq$k0">
+                                    <node concept="37vLTw" id="2VCmq7849ia" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="2VCmq7849ii" resolve="pd" />
+                                    </node>
+                                    <node concept="2sxana" id="2VCmq7849ib" role="2OqNvi">
+                                      <ref role="2sxfKC" node="2VCmq77SgeU" resolve="pivot" />
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="2VCmq7849ic" role="2OqNvi">
+                                    <ref role="37wK5l" node="IzpDYSRzQ5" resolve="getTargetNode" />
+                                  </node>
+                                </node>
+                                <node concept="2OqwBi" id="2VCmq7849id" role="37wK5m">
+                                  <node concept="2OqwBi" id="2VCmq7849ie" role="2Oq$k0">
+                                    <node concept="37vLTw" id="2VCmq7849if" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="2VCmq7849ii" resolve="pd" />
+                                    </node>
+                                    <node concept="2sxana" id="2VCmq7849ig" role="2OqNvi">
+                                      <ref role="2sxfKC" node="2VCmq77SgeU" resolve="pivot" />
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="2VCmq7849ih" role="2OqNvi">
+                                    <ref role="37wK5l" node="1ZWkc2utFaB" resolve="asSegment" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="gl6BB" id="2VCmq7849ii" role="1bW2Oz">
+                          <property role="TrG5h" value="pd" />
+                          <node concept="2jxLKc" id="2VCmq7849ij" role="1tU5fm" />
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="3cpWs6" id="2VCmq7849E3" role="3cqZAp">
+                <node concept="37vLTw" id="2VCmq7849E5" role="3cqZAk">
+                  <ref role="3cqZAo" node="2VCmq7849hL" resolve="seq" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
       </node>
       <node concept="3Tm1VV" id="6EGd7WxuOY" role="1B3o_S" />
-      <node concept="3uibUv" id="6EGd7Wxwbf" role="3clF45">
-        <ref role="3uigEE" node="5zD5ovlKksz" resolve="ReferenceResolved" />
-      </node>
       <node concept="37vLTG" id="6EGd7Wxypg" role="3clF46">
         <property role="TrG5h" value="contextIVAA" />
         <node concept="3Tqbb2" id="6EGd7Wxypf" role="1tU5fm">
@@ -19407,6 +19537,11 @@
         <property role="TrG5h" value="ref" />
         <node concept="2z4iKi" id="6EGd7Wx$8L" role="1tU5fm" />
       </node>
+      <node concept="A3Dl8" id="2VCmq784akq" role="3clF45">
+        <node concept="3uibUv" id="2VCmq784akr" role="A3Ik2">
+          <ref role="3uigEE" node="5zD5ovlKksz" resolve="ReferenceResolved" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="6EGd7Wxxq_" role="jymVt" />
     <node concept="312cEg" id="5zD5ovlKIS0" role="jymVt">
@@ -21651,6 +21786,14 @@
           <ref role="3uigEE" node="5LihCoMh$14" resolve="ArtifactPath" />
         </node>
       </node>
+      <node concept="P$JXv" id="2VCmq785I2_" role="lGtFl">
+        <node concept="TZ5HI" id="2VCmq785I2A" role="3nqlJM">
+          <node concept="TZ5HA" id="2VCmq785I2B" role="3HnX3l" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="2VCmq785I2C" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+      </node>
     </node>
     <node concept="13hLZK" id="2BZZUn12rpM" role="13h7CW">
       <node concept="3clFbS" id="2BZZUn12rpN" role="2VODD2" />
@@ -25999,5 +26142,19 @@
       </node>
     </node>
   </node>
+  <node concept="2fD8I5" id="2VCmq77Sge8">
+    <property role="TrG5h" value="PivotDuple" />
+    <node concept="3Tm1VV" id="2VCmq77Sge9" role="1B3o_S" />
+    <node concept="2lGYhJ" id="2VCmq77SgeU" role="2pHZQ9">
+      <property role="TrG5h" value="pivot" />
+      <node concept="3uibUv" id="2VCmq77SrO_" role="2lK19J">
+        <ref role="3uigEE" node="IzpDYSOg6$" resolve="Pivot" />
+      </node>
+    </node>
+    <node concept="2lGYhJ" id="2VCmq77SrOB" role="2pHZQ9">
+      <property role="TrG5h" value="dependentOn" />
+      <node concept="3Tqbb2" id="2VCmq77SrPK" role="2lK19J" />
+    </node>
+  </node>
 </model>
 

From 9af1c750e60b1ec6508a0930a7383a888ca13334 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Tue, 7 Oct 2025 16:41:23 +0200
Subject: [PATCH 02/22] migrate (#1474)

---
 .../models/org.iets3.variability.artifacts.base.behavior.mps  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index 0312c55637..32b0c8d309 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -19401,7 +19401,7 @@
                 <node concept="2ShNRf" id="5zD5ovlZJr_" role="37wK5m">
                   <node concept="1pGfFk" id="5zD5ovlZJrA" role="2ShVmc">
                     <property role="373rjd" value="true" />
-                    <ref role="37wK5l" node="5zD5ovlOfUg" />
+                    <ref role="37wK5l" node="5zD5ovlOfUg" resolve="ReferenceResolved" />
                     <node concept="37vLTw" id="5zD5ovlZJrB" role="37wK5m">
                       <ref role="3cqZAo" node="6EGd7Wxz2j" resolve="ref" />
                     </node>
@@ -21792,7 +21792,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="2VCmq785I2C" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="13hLZK" id="2BZZUn12rpM" role="13h7CW">

From 3eead2a47c3ecce50d23a4b64158abac7e48d5fb Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Wed, 8 Oct 2025 12:05:21 +0200
Subject: [PATCH 03/22] expose referenced node (#1474)

---
 .../org.iets3.variability.artifacts.base.behavior.mps     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index 32b0c8d309..5ce0b40446 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -21629,6 +21629,14 @@
         </node>
       </node>
     </node>
+    <node concept="13i0hz" id="1dm_BztreE_" role="13h7CS">
+      <property role="13i0iv" value="true" />
+      <property role="13i0it" value="true" />
+      <property role="TrG5h" value="refNode" />
+      <node concept="3Tm1VV" id="1dm_BztreEA" role="1B3o_S" />
+      <node concept="3Tqbb2" id="1dm_BztreVa" role="3clF45" />
+      <node concept="3clFbS" id="1dm_BztreEC" role="3clF47" />
+    </node>
     <node concept="13i0hz" id="2BZZUn12r$J" role="13h7CS">
       <property role="13i0iv" value="true" />
       <property role="13i0it" value="true" />

From f1293ce90da6aa455664a20511dacdda811054a3 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Wed, 8 Oct 2025 12:06:47 +0200
Subject: [PATCH 04/22] deprecate unused method (#1474)

---
 .../org.iets3.variability.artifacts.base.behavior.mps       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index 5ce0b40446..6d93561087 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -21664,6 +21664,12 @@
         <node concept="x79VA" id="2BZZUn12sfW" role="3nqlJM">
           <property role="x79VB" value="ArtifactPath" />
         </node>
+        <node concept="TZ5HI" id="1dm_BztJgP5" role="3nqlJM">
+          <node concept="TZ5HA" id="1dm_BztJgP6" role="3HnX3l" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="1dm_BztJgP7" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
       </node>
     </node>
     <node concept="13i0hz" id="2BZZUn1TtlC" role="13h7CS">

From b2b5b9c19df8f68c1d9a28f3497d938cb3842e96 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Wed, 8 Oct 2025 14:58:39 +0200
Subject: [PATCH 05/22] migrate (#1474)

---
 .../models/org.iets3.variability.artifacts.base.behavior.mps    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index 6d93561087..43cc860ef3 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -21669,7 +21669,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="1dm_BztJgP7" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="13i0hz" id="2BZZUn1TtlC" role="13h7CS">

From 730ff7f88f91064a1fd76eef3856dda3c37fee34 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Wed, 22 Oct 2025 14:57:22 +0200
Subject: [PATCH 06/22] fix wrong parametrization (#1474)

---
 .../models/org.iets3.variability.artifacts.base.behavior.mps  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index 43cc860ef3..c7759ea5ab 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -4948,9 +4948,7 @@
                   </node>
                   <node concept="2r$n1x" id="2VCmq77UIe2" role="2r_Bvh">
                     <ref role="2r$qp6" node="2VCmq77SrOB" resolve="dependentOn" />
-                    <node concept="37vLTw" id="2VCmq77UIe3" role="2r_lH1">
-                      <ref role="3cqZAo" node="2VCmq77U4Tb" resolve="n" />
-                    </node>
+                    <node concept="10Nm6u" id="5QTJbF9Nc8r" role="2r_lH1" />
                   </node>
                 </node>
               </node>

From 08b7046205634147965731ff2bc0883b42f55693 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Wed, 12 Nov 2025 16:02:20 +0100
Subject: [PATCH 07/22] Fix: type ':' at Feature to get FeatureModelInclude 
 (#1474)

---
 .../org.iets3.variability.base.plugin.mps     |   9 +
 ...3.variability.featuremodel.base.editor.mps | 338 +++++++++++-------
 ...ts3.variability.os.sandbox.homeNetwork.mps |   2 +-
 ...ability.featuremodel.base.editor@tests.mps |  97 +++++
 4 files changed, 323 insertions(+), 123 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.base/models/org.iets3.variability.base.plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.base/models/org.iets3.variability.base.plugin.mps
index debd8e15e0..239c75bfed 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.base/models/org.iets3.variability.base.plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.base/models/org.iets3.variability.base.plugin.mps
@@ -466,6 +466,15 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="2QHkgIBGJ30" role="3cqZAp">
+          <node concept="3cpWsn" id="2QHkgIBGJ31" role="3cpWs9">
+            <property role="TrG5h" value="string" />
+            <node concept="17QB3L" id="2QHkgIBGGIF" role="1tU5fm" />
+            <node concept="Xl_RD" id="2QHkgIBGJ32" role="33vP2m">
+              <property role="Xl_RC" value=":" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="26cjRACVUI5" role="3cqZAp">
           <node concept="37vLTw" id="307NTAcZFOC" role="3clFbG">
             <ref role="3cqZAo" node="26cjRACVUHk" resolve="settings" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
index 13837062dc..957e59fc17 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
@@ -59,12 +59,12 @@
     <import index="s7nz" ref="r:657b9157-a191-44db-93aa-6c27642f0f64(org.iets3.variability.base.editor)" />
     <import index="2rbz" ref="r:aeef8772-8af4-45c3-a762-623d4009d953(org.iets3.variability.base.plugin)" />
     <import index="mv1c" ref="r:ca6d049d-0cc6-4267-820c-178221dd0ad8(org.iets3.variability.configuration.base.editor)" />
+    <import index="uddc" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus.transformation(MPS.Editor/)" />
     <import index="itrz" ref="r:80fb0853-eb3b-4e84-aebd-cc7fdb011d97(org.iets3.core.base.editor)" implicit="true" />
     <import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
     <import index="1jcu" ref="r:729fa0c7-b4e4-42b1-acfe-71017c020a49(org.iets3.analysis.base.behavior)" implicit="true" />
     <import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
     <import index="yv47" ref="r:da65683e-ff6f-430d-ab68-32a77df72c93(org.iets3.core.expr.toplevel.structure)" implicit="true" />
-    <import index="uddc" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus.transformation(MPS.Editor/)" implicit="true" />
     <import index="av1m" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus.style(MPS.Editor/)" implicit="true" />
     <import index="700h" ref="r:61b1de80-490d-4fee-8e95-b956503290e9(org.iets3.core.expr.collections.structure)" implicit="true" />
   </imports>
@@ -597,6 +597,7 @@
       <concept id="1954385921685784800" name="com.mbeddr.mpsutil.grammarcells.structure.PostprocessFunction" flags="ig" index="315t4" />
       <concept id="7408935449007508559" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell_SubstituteCondition_expectedConcept" flags="ng" index="7dpZ6" />
       <concept id="7408935449007503509" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell_SubstituteCondition" flags="ig" index="7duGs" />
+      <concept id="1984422498402698431" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell_Condition" flags="ig" index="2e7140" />
       <concept id="2529749638821361488" name="com.mbeddr.mpsutil.grammarcells.structure.DisableComponentInline" flags="ng" index="2jxsUO" />
       <concept id="7272510943426093121" name="com.mbeddr.mpsutil.grammarcells.structure.Parameter_SideTransformActionsBuilderContext" flags="ng" index="2kS8pE" />
       <concept id="5083944728298846680" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell" flags="ng" index="_tjkj">
@@ -619,6 +620,7 @@
       </concept>
       <concept id="7363578995839435357" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell" flags="ng" index="1kIj98">
         <child id="7408935449007570592" name="substituteCondition" index="7deOD" />
+        <child id="1984422498402083610" name="sideTransformationCondition" index="2e1Fq_" />
         <child id="7363578995839435358" name="wrapped" index="1kIj9b" />
       </concept>
       <concept id="6349233906483558394" name="com.mbeddr.mpsutil.grammarcells.structure.Parameter_wrappedConcept" flags="ng" index="1ZN7lz" />
@@ -3153,6 +3155,13 @@
             </node>
           </node>
         </node>
+        <node concept="2e7140" id="5rMAXFpHAaH" role="2e1Fq_">
+          <node concept="3clFbS" id="5rMAXFpHAaI" role="2VODD2">
+            <node concept="3clFbF" id="5rMAXFpHW2z" role="3cqZAp">
+              <node concept="3clFbT" id="5rMAXFpHW2y" role="3clFbG" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="2iRfu4" id="7Nu9WvXrFAr" role="2iSdaV" />
       <node concept="3F0A7n" id="7Nu9WvXrFAT" role="3EZMnx">
@@ -10936,158 +10945,124 @@
         <node concept="3F0A7n" id="1lex4TVpCxn" role="3EZMnx">
           <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
         </node>
-        <node concept="_tjkj" id="1lex4TVpCxo" role="3EZMnx">
-          <node concept="3F1sOY" id="1lex4TVpCxp" role="_tjki">
-            <ref role="1NtTu8" to="s6b7:3tsFshP6ikc" resolve="cardinality" />
-          </node>
-          <node concept="ZYGn8" id="1lex4TVpCxq" role="ZWbT9">
-            <node concept="3clFbS" id="1lex4TVpCxr" role="2VODD2">
-              <node concept="3clFbF" id="1lex4TVpCxs" role="3cqZAp">
-                <node concept="Xl_RD" id="1lex4TVpCxt" role="3clFbG">
-                  <property role="Xl_RC" value="[" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1eYWM2" id="1lex4TVpCxu" role="3EZMnx">
-          <node concept="1eYxTg" id="1lex4TVpCxv" role="1eYxTh">
-            <node concept="3clFbS" id="1lex4TVpCxw" role="2VODD2">
-              <node concept="3cpWs8" id="1lex4TVpCxx" role="3cqZAp">
-                <node concept="3cpWsn" id="1lex4TVpCxy" role="3cpWs9">
-                  <property role="TrG5h" value="node" />
-                  <node concept="3Tqbb2" id="1lex4TVpCxz" role="1tU5fm">
-                    <ref role="ehGHo" to="s6b7:3tsFshP5M5B" resolve="FeatureTreeNode" />
-                  </node>
-                  <node concept="1PxgMI" id="1lex4TVpCx$" role="33vP2m">
-                    <node concept="2OqwBi" id="1lex4TVpCx_" role="1m5AlR">
-                      <node concept="2kS8pE" id="1lex4TVpCxA" role="2Oq$k0" />
-                      <node concept="liA8E" id="1lex4TVpCxB" role="2OqNvi">
+        <node concept="1eYWM2" id="5rMAXFqfDPM" role="3EZMnx">
+          <node concept="1eYxTg" id="5rMAXFqfDPN" role="1eYxTh">
+            <node concept="3clFbS" id="5rMAXFqfDPO" role="2VODD2">
+              <node concept="3clFbF" id="5rMAXFrh8u_" role="3cqZAp">
+                <node concept="2YIFZM" id="5rMAXFrh8EL" role="3clFbG">
+                  <ref role="37wK5l" node="5rMAXFr1zA$" resolve="execute" />
+                  <ref role="1Pybhc" node="5rMAXFqYmPn" resolve="TopPartFeatureUtil" />
+                  <node concept="1PxgMI" id="5rMAXFrh8ZS" role="37wK5m">
+                    <node concept="2OqwBi" id="5rMAXFrh8ZT" role="1m5AlR">
+                      <node concept="2kS8pE" id="5rMAXFrh8ZU" role="2Oq$k0" />
+                      <node concept="liA8E" id="5rMAXFrh8ZV" role="2OqNvi">
                         <ref role="37wK5l" to="uddc:~TransformationMenuContext.getNode()" resolve="getNode" />
                       </node>
                     </node>
-                    <node concept="chp4Y" id="1lex4TVpCxC" role="3oSUPX">
+                    <node concept="chp4Y" id="5rMAXFrh8ZW" role="3oSUPX">
                       <ref role="cht4Q" to="s6b7:3tsFshP5M5B" resolve="FeatureTreeNode" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="3cpWs8" id="1lex4TVpCxD" role="3cqZAp">
-                <node concept="3cpWsn" id="1lex4TVpCxE" role="3cpWs9">
-                  <property role="TrG5h" value="fi" />
-                  <node concept="3Tqbb2" id="1lex4TVpCxF" role="1tU5fm">
-                    <ref role="ehGHo" to="s6b7:3tsFshP5M5C" resolve="FeatureModelInclude" />
-                  </node>
-                  <node concept="2OqwBi" id="1lex4TVpCxG" role="33vP2m">
-                    <node concept="37vLTw" id="1lex4TVpCxH" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1lex4TVpCxy" resolve="node" />
-                    </node>
-                    <node concept="2DeJnW" id="1lex4TVpCxI" role="2OqNvi">
-                      <ref role="1_rbq0" to="s6b7:3tsFshP5M5C" resolve="FeatureModelInclude" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="1lex4TVpCxJ" role="3cqZAp">
-                <node concept="37vLTI" id="1lex4TVpCxK" role="3clFbG">
-                  <node concept="2OqwBi" id="1lex4TVpCxL" role="37vLTx">
-                    <node concept="37vLTw" id="1lex4TVpCxM" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1lex4TVpCxy" resolve="node" />
-                    </node>
-                    <node concept="3TrcHB" id="1lex4TVpCxN" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="1lex4TVpCxO" role="37vLTJ">
-                    <node concept="37vLTw" id="1lex4TVpCxP" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1lex4TVpCxE" resolve="fi" />
-                    </node>
-                    <node concept="3TrcHB" id="1lex4TVpCxQ" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="1lex4TVpCxR" role="3cqZAp">
-                <node concept="37vLTI" id="1lex4TVpCxS" role="3clFbG">
-                  <node concept="2OqwBi" id="1lex4TVpCxT" role="37vLTx">
-                    <node concept="37vLTw" id="1lex4TVpCxU" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1lex4TVpCxy" resolve="node" />
-                    </node>
-                    <node concept="3TrEf2" id="1lex4TVpCxV" role="2OqNvi">
-                      <ref role="3Tt5mk" to="s6b7:3tsFshP6ikc" resolve="cardinality" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="1lex4TVpCxW" role="37vLTJ">
-                    <node concept="37vLTw" id="1lex4TVpCxX" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1lex4TVpCxE" resolve="fi" />
+            </node>
+          </node>
+          <node concept="1eYwpX" id="5rMAXFqfDQl" role="1eYxym">
+            <node concept="3clFbS" id="5rMAXFqfDQm" role="2VODD2">
+              <node concept="3clFbF" id="5rMAXFrh74b" role="3cqZAp">
+                <node concept="2YIFZM" id="5rMAXFrh77s" role="3clFbG">
+                  <ref role="37wK5l" node="5rMAXFr1wBY" resolve="isApplicable" />
+                  <ref role="1Pybhc" node="5rMAXFqYmPn" resolve="TopPartFeatureUtil" />
+                  <node concept="1PxgMI" id="5rMAXFrh7ZC" role="37wK5m">
+                    <node concept="chp4Y" id="5rMAXFrh7ZD" role="3oSUPX">
+                      <ref role="cht4Q" to="s6b7:3tsFshP5Ec7" resolve="Feature" />
                     </node>
-                    <node concept="3TrEf2" id="1lex4TVpCxY" role="2OqNvi">
-                      <ref role="3Tt5mk" to="s6b7:3tsFshP6ikc" resolve="cardinality" />
+                    <node concept="2OqwBi" id="5rMAXFrh7ZE" role="1m5AlR">
+                      <node concept="2kS8pE" id="5rMAXFrh7ZF" role="2Oq$k0" />
+                      <node concept="liA8E" id="5rMAXFrh7ZG" role="2OqNvi">
+                        <ref role="37wK5l" to="uddc:~TransformationMenuContext.getNode()" resolve="getNode" />
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="3clFbF" id="1lex4TVpCxZ" role="3cqZAp">
-                <node concept="37vLTw" id="1lex4TVpCy0" role="3clFbG">
-                  <ref role="3cqZAo" node="1lex4TVpCxE" resolve="fi" />
+            </node>
+          </node>
+          <node concept="1eYWSL" id="5rMAXFqfDQE" role="1eYxyj">
+            <node concept="3clFbS" id="5rMAXFqfDQF" role="2VODD2">
+              <node concept="3clFbF" id="5rMAXFqfDQG" role="3cqZAp">
+                <node concept="Xl_RD" id="5rMAXFqfDQH" role="3clFbG">
+                  <property role="Xl_RC" value=":" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="1eYwpX" id="1lex4TVpCy1" role="1eYxym">
-            <node concept="3clFbS" id="1lex4TVpCy2" role="2VODD2">
-              <node concept="3cpWs8" id="1lex4TVpCy3" role="3cqZAp">
-                <node concept="3cpWsn" id="1lex4TVpCy4" role="3cpWs9">
-                  <property role="TrG5h" value="node" />
-                  <node concept="3Tqbb2" id="1lex4TVpCy5" role="1tU5fm">
-                    <ref role="ehGHo" to="s6b7:3tsFshP5Ec7" resolve="Feature" />
-                  </node>
-                  <node concept="1PxgMI" id="1lex4TVpCy6" role="33vP2m">
-                    <node concept="chp4Y" id="1lex4TVpCy7" role="3oSUPX">
-                      <ref role="cht4Q" to="s6b7:3tsFshP5Ec7" resolve="Feature" />
-                    </node>
-                    <node concept="2OqwBi" id="1lex4TVpCy8" role="1m5AlR">
-                      <node concept="2kS8pE" id="1lex4TVpCy9" role="2Oq$k0" />
-                      <node concept="liA8E" id="1lex4TVpCya" role="2OqNvi">
-                        <ref role="37wK5l" to="uddc:~TransformationMenuContext.getNode()" resolve="getNode" />
+        </node>
+        <node concept="_tjkj" id="1lex4TVpCxo" role="3EZMnx">
+          <node concept="3EZMnI" id="5rMAXFqvcqj" role="_tjki">
+            <node concept="2iRfu4" id="5rMAXFqvcqk" role="2iSdaV" />
+            <node concept="3F1sOY" id="1lex4TVpCxp" role="3EZMnx">
+              <ref role="1NtTu8" to="s6b7:3tsFshP6ikc" resolve="cardinality" />
+            </node>
+            <node concept="1eYWM2" id="5rMAXFqIGwO" role="3EZMnx">
+              <node concept="1eYxTg" id="5rMAXFqIGwP" role="1eYxTh">
+                <node concept="3clFbS" id="5rMAXFqIGwQ" role="2VODD2">
+                  <node concept="3clFbF" id="5rMAXFrwHoa" role="3cqZAp">
+                    <node concept="2YIFZM" id="5rMAXFrwHob" role="3clFbG">
+                      <ref role="37wK5l" node="5rMAXFr1zA$" resolve="execute" />
+                      <ref role="1Pybhc" node="5rMAXFqYmPn" resolve="TopPartFeatureUtil" />
+                      <node concept="1PxgMI" id="5rMAXFrwHoc" role="37wK5m">
+                        <node concept="2OqwBi" id="5rMAXFrwHod" role="1m5AlR">
+                          <node concept="2kS8pE" id="5rMAXFrwHoe" role="2Oq$k0" />
+                          <node concept="liA8E" id="5rMAXFrwHof" role="2OqNvi">
+                            <ref role="37wK5l" to="uddc:~TransformationMenuContext.getNode()" resolve="getNode" />
+                          </node>
+                        </node>
+                        <node concept="chp4Y" id="5rMAXFrwHog" role="3oSUPX">
+                          <ref role="cht4Q" to="s6b7:3tsFshP5M5B" resolve="FeatureTreeNode" />
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="3clFbF" id="1lex4TVpCyb" role="3cqZAp">
-                <node concept="1Wc70l" id="1lex4TVpCyc" role="3clFbG">
-                  <node concept="2OqwBi" id="1lex4TVpCyd" role="3uHU7w">
-                    <node concept="2OqwBi" id="1lex4TVpCye" role="2Oq$k0">
-                      <node concept="37vLTw" id="1lex4TVpCyf" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1lex4TVpCy4" resolve="node" />
-                      </node>
-                      <node concept="2qgKlT" id="1lex4TVpCyg" role="2OqNvi">
-                        <ref role="37wK5l" to="zccc:6GZHy357BW_" resolve="subFeatures" />
+              <node concept="1eYwpX" id="5rMAXFqIGxn" role="1eYxym">
+                <node concept="3clFbS" id="5rMAXFqIGxo" role="2VODD2">
+                  <node concept="3clFbF" id="5rMAXFrwGqi" role="3cqZAp">
+                    <node concept="2YIFZM" id="5rMAXFrwGqj" role="3clFbG">
+                      <ref role="37wK5l" node="5rMAXFr1wBY" resolve="isApplicable" />
+                      <ref role="1Pybhc" node="5rMAXFqYmPn" resolve="TopPartFeatureUtil" />
+                      <node concept="1PxgMI" id="5rMAXFrwGqk" role="37wK5m">
+                        <node concept="chp4Y" id="5rMAXFrwGql" role="3oSUPX">
+                          <ref role="cht4Q" to="s6b7:3tsFshP5Ec7" resolve="Feature" />
+                        </node>
+                        <node concept="2OqwBi" id="5rMAXFrwGqm" role="1m5AlR">
+                          <node concept="2kS8pE" id="5rMAXFrwGqn" role="2Oq$k0" />
+                          <node concept="liA8E" id="5rMAXFrwGqo" role="2OqNvi">
+                            <ref role="37wK5l" to="uddc:~TransformationMenuContext.getNode()" resolve="getNode" />
+                          </node>
+                        </node>
                       </node>
                     </node>
-                    <node concept="1v1jN8" id="1lex4TVpCyh" role="2OqNvi" />
                   </node>
-                  <node concept="3fqX7Q" id="1lex4TVpCyi" role="3uHU7B">
-                    <node concept="2OqwBi" id="1lex4TVpCyj" role="3fr31v">
-                      <node concept="37vLTw" id="1lex4TVpCyk" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1lex4TVpCy4" resolve="node" />
-                      </node>
-                      <node concept="2qgKlT" id="1lex4TVpCyl" role="2OqNvi">
-                        <ref role="37wK5l" to="zccc:7Nu9WvXvoDo" resolve="isRoot" />
-                      </node>
+                </node>
+              </node>
+              <node concept="1eYWSL" id="5rMAXFqIGxG" role="1eYxyj">
+                <node concept="3clFbS" id="5rMAXFqIGxH" role="2VODD2">
+                  <node concept="3clFbF" id="5rMAXFqIGxI" role="3cqZAp">
+                    <node concept="Xl_RD" id="5rMAXFqIGxJ" role="3clFbG">
+                      <property role="Xl_RC" value=":" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="1eYWSL" id="1lex4TVpCym" role="1eYxyj">
-            <node concept="3clFbS" id="1lex4TVpCyn" role="2VODD2">
-              <node concept="3clFbF" id="1lex4TVpCyo" role="3cqZAp">
-                <node concept="Xl_RD" id="1lex4TVpCyp" role="3clFbG">
-                  <property role="Xl_RC" value=":" />
+          <node concept="ZYGn8" id="1lex4TVpCxq" role="ZWbT9">
+            <node concept="3clFbS" id="1lex4TVpCxr" role="2VODD2">
+              <node concept="3clFbF" id="1lex4TVpCxs" role="3cqZAp">
+                <node concept="Xl_RD" id="1lex4TVpCxt" role="3clFbG">
+                  <property role="Xl_RC" value="[" />
                 </node>
               </node>
             </node>
@@ -12879,5 +12854,124 @@
     <node concept="22hDWj" id="367j$Y_Cgd6" role="22hAXT" />
     <node concept="2VfDsV" id="367j$Y_Cgd7" role="3ft7WO" />
   </node>
+  <node concept="312cEu" id="5rMAXFqYmPn">
+    <property role="3GE5qa" value="treenodes" />
+    <property role="TrG5h" value="TopPartFeatureUtil" />
+    <node concept="2tJIrI" id="5rMAXFr1qAv" role="jymVt" />
+    <node concept="2YIFZL" id="5rMAXFr1wBY" role="jymVt">
+      <property role="TrG5h" value="isApplicable" />
+      <node concept="3clFbS" id="5rMAXFr1wC4" role="3clF47">
+        <node concept="3clFbF" id="5rMAXFr1wC5" role="3cqZAp">
+          <node concept="1Wc70l" id="5rMAXFr1wC6" role="3clFbG">
+            <node concept="2OqwBi" id="5rMAXFr1wC7" role="3uHU7w">
+              <node concept="2OqwBi" id="5rMAXFr1wC8" role="2Oq$k0">
+                <node concept="37vLTw" id="5rMAXFr1wC9" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5rMAXFr1wC0" resolve="feature" />
+                </node>
+                <node concept="2qgKlT" id="5rMAXFr1wCa" role="2OqNvi">
+                  <ref role="37wK5l" to="zccc:6GZHy357BW_" resolve="subFeatures" />
+                </node>
+              </node>
+              <node concept="1v1jN8" id="5rMAXFr1wCb" role="2OqNvi" />
+            </node>
+            <node concept="3fqX7Q" id="5rMAXFr1wCc" role="3uHU7B">
+              <node concept="2OqwBi" id="5rMAXFr1wCd" role="3fr31v">
+                <node concept="2qgKlT" id="5rMAXFr1wCe" role="2OqNvi">
+                  <ref role="37wK5l" to="zccc:7Nu9WvXvoDo" resolve="isRoot" />
+                </node>
+                <node concept="37vLTw" id="5rMAXFr1wCf" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5rMAXFr1wC0" resolve="feature" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="10P_77" id="5rMAXFr1wC2" role="3clF45" />
+      <node concept="37vLTG" id="5rMAXFr1wC0" role="3clF46">
+        <property role="TrG5h" value="feature" />
+        <node concept="3Tqbb2" id="5rMAXFr1wC1" role="1tU5fm">
+          <ref role="ehGHo" to="s6b7:3tsFshP5Ec7" resolve="Feature" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5rMAXFr1wC3" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="5rMAXFr1x4s" role="jymVt" />
+    <node concept="2YIFZL" id="5rMAXFr1zA$" role="jymVt">
+      <property role="TrG5h" value="execute" />
+      <node concept="3clFbS" id="5rMAXFr1zAC" role="3clF47">
+        <node concept="3cpWs8" id="5rMAXFr1zAD" role="3cqZAp">
+          <node concept="3cpWsn" id="5rMAXFr1zAE" role="3cpWs9">
+            <property role="TrG5h" value="fi" />
+            <node concept="3Tqbb2" id="5rMAXFr1zAF" role="1tU5fm">
+              <ref role="ehGHo" to="s6b7:3tsFshP5M5C" resolve="FeatureModelInclude" />
+            </node>
+            <node concept="2OqwBi" id="5rMAXFr1zAG" role="33vP2m">
+              <node concept="37vLTw" id="5rMAXFr1zAH" role="2Oq$k0">
+                <ref role="3cqZAo" node="5rMAXFr1zB1" resolve="ftn" />
+              </node>
+              <node concept="2DeJnW" id="5rMAXFr1zAI" role="2OqNvi">
+                <ref role="1_rbq0" to="s6b7:3tsFshP5M5C" resolve="FeatureModelInclude" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5rMAXFr1zAJ" role="3cqZAp">
+          <node concept="37vLTI" id="5rMAXFr1zAK" role="3clFbG">
+            <node concept="2OqwBi" id="5rMAXFr1zAL" role="37vLTx">
+              <node concept="37vLTw" id="5rMAXFr1zAM" role="2Oq$k0">
+                <ref role="3cqZAo" node="5rMAXFr1zB1" resolve="ftn" />
+              </node>
+              <node concept="3TrcHB" id="5rMAXFr1zAN" role="2OqNvi">
+                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="5rMAXFr1zAO" role="37vLTJ">
+              <node concept="37vLTw" id="5rMAXFr1zAP" role="2Oq$k0">
+                <ref role="3cqZAo" node="5rMAXFr1zAE" resolve="fi" />
+              </node>
+              <node concept="3TrcHB" id="5rMAXFr1zAQ" role="2OqNvi">
+                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5rMAXFr1zAR" role="3cqZAp">
+          <node concept="37vLTI" id="5rMAXFr1zAS" role="3clFbG">
+            <node concept="2OqwBi" id="5rMAXFr1zAT" role="37vLTx">
+              <node concept="37vLTw" id="5rMAXFr1zAU" role="2Oq$k0">
+                <ref role="3cqZAo" node="5rMAXFr1zB1" resolve="ftn" />
+              </node>
+              <node concept="3TrEf2" id="5rMAXFr1zAV" role="2OqNvi">
+                <ref role="3Tt5mk" to="s6b7:3tsFshP6ikc" resolve="cardinality" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="5rMAXFr1zAW" role="37vLTJ">
+              <node concept="37vLTw" id="5rMAXFr1zAX" role="2Oq$k0">
+                <ref role="3cqZAo" node="5rMAXFr1zAE" resolve="fi" />
+              </node>
+              <node concept="3TrEf2" id="5rMAXFr1zAY" role="2OqNvi">
+                <ref role="3Tt5mk" to="s6b7:3tsFshP6ikc" resolve="cardinality" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5rMAXFr1zAZ" role="3cqZAp">
+          <node concept="37vLTw" id="5rMAXFr1zB0" role="3clFbG">
+            <ref role="3cqZAo" node="5rMAXFr1zAE" resolve="fi" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="5rMAXFr1zAA" role="3clF45" />
+      <node concept="37vLTG" id="5rMAXFr1zB1" role="3clF46">
+        <property role="TrG5h" value="ftn" />
+        <node concept="3Tqbb2" id="5rMAXFr1zB2" role="1tU5fm">
+          <ref role="ehGHo" to="s6b7:3tsFshP5M5B" resolve="FeatureTreeNode" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5rMAXFr1zAB" role="1B3o_S" />
+    </node>
+    <node concept="3Tm1VV" id="5rMAXFqYmPo" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.homeNetwork.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.homeNetwork.mps
index 5036615888..09fe63da79 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.homeNetwork.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.homeNetwork.mps
@@ -217,7 +217,7 @@
     <node concept="12i7jc" id="3FUl$NDSaQR" role="12i2BX" />
     <node concept="12i7jc" id="7oSKjSJ2k0P" role="12i2BX" />
     <node concept="12iwZl" id="4eA6KATjrpg" role="12i2BX">
-      <property role="bVyBI" value="63178535" />
+      <property role="bVyBI" value="-1562615008" />
       <property role="0Rz4W" value="312773256" />
       <node concept="12iwV3" id="4eA6KATjrph" role="12iwV8">
         <property role="TrG5h" value="Power" />
diff --git a/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps b/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
index c9603b501b..d55e8d036f 100644
--- a/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
@@ -35,6 +35,9 @@
         <property id="1932269937152561478" name="useLabelSelection" index="OXtK3" />
         <property id="1229432188737" name="isLastPosition" index="ZRATv" />
       </concept>
+      <concept id="1227182079811" name="jetbrains.mps.lang.test.structure.TypeKeyStatement" flags="nn" index="2TK7Tu">
+        <property id="1227184461946" name="keys" index="2TTd_B" />
+      </concept>
       <concept id="4239542196496927193" name="jetbrains.mps.lang.test.structure.MPSActionReference" flags="ng" index="1iFQzN">
         <reference id="4239542196496929559" name="action" index="1iFR8X" />
       </concept>
@@ -1552,5 +1555,99 @@
       </node>
     </node>
   </node>
+  <node concept="LiM7Y" id="5rMAXFrKsQP">
+    <property role="TrG5h" value="FeatureToFeatureModelInclude" />
+    <node concept="1qefOq" id="5rMAXFrKsQQ" role="25YQCW">
+      <node concept="12icEM" id="5rMAXFrKsQS" role="1qenE9">
+        <property role="TrG5h" value="V" />
+        <node concept="12iwZl" id="5rMAXFrKsQU" role="12i2BX">
+          <property role="bVyBI" value="625539092" />
+          <node concept="12iwV3" id="5rMAXFrKsQV" role="12iwV8">
+            <property role="TrG5h" value="M" />
+            <node concept="12iwV3" id="5rMAXFrKsQX" role="12iwVe">
+              <property role="TrG5h" value="K" />
+              <node concept="LIFWc" id="5rMAXFrKsR1" role="lGtFl">
+                <property role="ZRATv" value="true" />
+                <property role="OXtK3" value="true" />
+                <property role="p6zMq" value="1" />
+                <property role="p6zMs" value="1" />
+                <property role="LIFWd" value="property_name" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1qefOq" id="5rMAXFrKsR2" role="25YQFr">
+      <node concept="12icEM" id="5rMAXFrKsR4" role="1qenE9">
+        <property role="TrG5h" value="V" />
+        <node concept="12iwZl" id="5rMAXFrKsR6" role="12i2BX">
+          <property role="bVyBI" value="1132065276" />
+          <node concept="12iwV3" id="5rMAXFrKsR7" role="12iwV8">
+            <property role="TrG5h" value="M" />
+            <node concept="12iSMG" id="5rMAXFrKsRb" role="12iwVe">
+              <property role="TrG5h" value="K" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3clFbS" id="5rMAXFrKsYg" role="LjaKd">
+      <node concept="2TK7Tu" id="5rMAXFrKsYf" role="3cqZAp">
+        <property role="2TTd_B" value=":" />
+      </node>
+    </node>
+  </node>
+  <node concept="LiM7Y" id="5rMAXFrKxQa">
+    <property role="TrG5h" value="FeatureToFeatureModelInclude_Cardinality" />
+    <node concept="1qefOq" id="5rMAXFrKxQb" role="25YQCW">
+      <node concept="12icEM" id="5rMAXFrKxQc" role="1qenE9">
+        <property role="TrG5h" value="V" />
+        <node concept="12iwZl" id="5rMAXFrKxQd" role="12i2BX">
+          <property role="bVyBI" value="1410293658" />
+          <node concept="12iwV3" id="5rMAXFrKxQe" role="12iwV8">
+            <property role="TrG5h" value="M" />
+            <node concept="12iwV3" id="5rMAXFrKxQf" role="12iwVe">
+              <property role="TrG5h" value="K" />
+              <node concept="12h7s0" id="5rMAXFrKxVI" role="12hoz8">
+                <property role="21J4rj" value="1" />
+                <property role="2jfDHK" value="2" />
+                <node concept="LIFWc" id="5rMAXFrKxZ8" role="lGtFl">
+                  <property role="ZRATv" value="true" />
+                  <property role="OXtK3" value="true" />
+                  <property role="p6zMq" value="1" />
+                  <property role="p6zMs" value="1" />
+                  <property role="LIFWd" value="Constant_8jpa7_e0" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1qefOq" id="5rMAXFrKxQh" role="25YQFr">
+      <node concept="12icEM" id="5rMAXFrKxQi" role="1qenE9">
+        <property role="TrG5h" value="V" />
+        <node concept="12iwZl" id="5rMAXFrKxQj" role="12i2BX">
+          <property role="bVyBI" value="-1809968252" />
+          <node concept="12iwV3" id="5rMAXFrKxQk" role="12iwV8">
+            <property role="TrG5h" value="M" />
+            <node concept="12iSMG" id="5rMAXFrKxQl" role="12iwVe">
+              <property role="TrG5h" value="K" />
+              <node concept="12h7s0" id="5rMAXFrKEqq" role="12hoz8">
+                <property role="21J4rj" value="1" />
+                <property role="2jfDHK" value="2" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3clFbS" id="5rMAXFrKxQm" role="LjaKd">
+      <node concept="2TK7Tu" id="5rMAXFrKxQn" role="3cqZAp">
+        <property role="2TTd_B" value=":" />
+      </node>
+    </node>
+  </node>
 </model>
 

From 95a6561bed40445d9612672476a85e5e585923b9 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Thu, 22 Jan 2026 12:28:58 +0100
Subject: [PATCH 08/22] Add toString-methods (#1474)

---
 ...s3.variability.artifacts.base.behavior.mps | 76 +++++++++++++++++--
 1 file changed, 71 insertions(+), 5 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index 2680e1728c..502bf68bd8 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -6739,6 +6739,9 @@
             <property role="TrG5h" value="pathStr" />
             <node concept="17QB3L" id="2wdh$FhHPtw" role="1tU5fm" />
             <node concept="2EnYce" id="2wdh$FhJVIx" role="33vP2m">
+              <node concept="liA8E" id="2wdh$FhJRlS" role="2OqNvi">
+                <ref role="37wK5l" node="5LihCoMiNAg" resolve="asSegmentPathString" />
+              </node>
               <node concept="2OqwBi" id="2wdh$FhI6A0" role="2Oq$k0">
                 <node concept="37vLTw" id="2wdh$FhI6A1" role="2Oq$k0">
                   <ref role="3cqZAo" node="220xVKpl3iS" resolve="sn" />
@@ -6747,9 +6750,6 @@
                   <ref role="37wK5l" node="SOwwj6zTxH" resolve="getFullPath" />
                 </node>
               </node>
-              <node concept="liA8E" id="2wdh$FhJRlS" role="2OqNvi">
-                <ref role="37wK5l" node="5LihCoMiNAg" resolve="asSegmentPathString" />
-              </node>
             </node>
           </node>
         </node>
@@ -14940,6 +14940,62 @@
         <ref role="3uigEE" node="5LihCoMh$14" resolve="ArtifactPath" />
       </node>
     </node>
+    <node concept="3clFb_" id="5tN59eoeN23" role="jymVt">
+      <property role="TrG5h" value="toString" />
+      <node concept="3Tm1VV" id="5tN59eoeN24" role="1B3o_S" />
+      <node concept="17QB3L" id="5tN59eoeN25" role="3clF45" />
+      <node concept="2AHcQZ" id="5tN59eoeN2m" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+      <node concept="3clFbS" id="5tN59eoeN2n" role="3clF47">
+        <node concept="3clFbF" id="5tN59eof2D6" role="3cqZAp">
+          <node concept="2OqwBi" id="5tN59eogWxt" role="3clFbG">
+            <node concept="2OqwBi" id="5tN59eogrnR" role="2Oq$k0">
+              <node concept="2OqwBi" id="5tN59eofXmo" role="2Oq$k0">
+                <node concept="2ShNRf" id="5tN59eof2D4" role="2Oq$k0">
+                  <node concept="1pGfFk" id="5tN59eofqUa" role="2ShVmc">
+                    <property role="373rjd" value="true" />
+                    <ref role="37wK5l" to="qt06:~ToStringBuilder.&lt;init&gt;(java.lang.Object,org.apache.commons.lang3.builder.ToStringStyle)" resolve="ToStringBuilder" />
+                    <node concept="Xjq3P" id="5tN59eofvh8" role="37wK5m" />
+                    <node concept="10M0yZ" id="5tN59eora9Q" role="37wK5m">
+                      <ref role="3cqZAo" to="qt06:~ToStringStyle.SHORT_PREFIX_STYLE" resolve="SHORT_PREFIX_STYLE" />
+                      <ref role="1PxDUh" to="qt06:~ToStringStyle" resolve="ToStringStyle" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="5tN59eog1ld" role="2OqNvi">
+                  <ref role="37wK5l" to="qt06:~ToStringBuilder.append(java.lang.String,java.lang.Object)" resolve="append" />
+                  <node concept="Xl_RD" id="5tN59eog3iS" role="37wK5m">
+                    <property role="Xl_RC" value="root" />
+                  </node>
+                  <node concept="2OqwBi" id="5tN59eogj3p" role="37wK5m">
+                    <node concept="Xjq3P" id="5tN59eogerk" role="2Oq$k0" />
+                    <node concept="liA8E" id="5tN59eognzp" role="2OqNvi">
+                      <ref role="37wK5l" node="65ATjZHvuwB" resolve="getRootPresentation" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="5tN59eogw6R" role="2OqNvi">
+                <ref role="37wK5l" to="qt06:~ToStringBuilder.append(java.lang.String,java.lang.Object)" resolve="append" />
+                <node concept="Xl_RD" id="5tN59eogz_P" role="37wK5m">
+                  <property role="Xl_RC" value="segments" />
+                </node>
+                <node concept="2OqwBi" id="5tN59eogMiV" role="37wK5m">
+                  <node concept="Xjq3P" id="5tN59eogIul" role="2Oq$k0" />
+                  <node concept="liA8E" id="5tN59eogRZL" role="2OqNvi">
+                    <ref role="37wK5l" to="7wpd:3u1rFxdFBU5" resolve="segments" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="5tN59eoh10P" role="2OqNvi">
+              <ref role="37wK5l" to="qt06:~ToStringBuilder.toString()" resolve="toString" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="1D1O48ssmgv">
     <property role="3GE5qa" value="skeleton" />
@@ -19905,8 +19961,18 @@
                       <node concept="Xl_RD" id="5QUP9a_ekNV" role="3uHU7B">
                         <property role="Xl_RC" value="RefResolved(" />
                       </node>
-                      <node concept="37vLTw" id="5QUP9a_elIM" role="3uHU7w">
-                        <ref role="3cqZAo" node="5zD5ovlKIS0" resolve="ref" />
+                      <node concept="2OqwBi" id="5tN59eowYRY" role="3uHU7w">
+                        <node concept="2OqwBi" id="5tN59eowWAC" role="2Oq$k0">
+                          <node concept="37vLTw" id="5QUP9a_elIM" role="2Oq$k0">
+                            <ref role="3cqZAo" node="5zD5ovlKIS0" resolve="ref" />
+                          </node>
+                          <node concept="liA8E" id="5tN59eowXLE" role="2OqNvi">
+                            <ref role="37wK5l" to="mhbf:~SReference.getSourceNode()" resolve="getSourceNode" />
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="5tN59eowZP1" role="2OqNvi">
+                          <ref role="37wK5l" to="mhbf:~SNode.getPresentation()" resolve="getPresentation" />
+                        </node>
                       </node>
                     </node>
                     <node concept="Xl_RD" id="5QUP9a_em5_" role="3uHU7w">

From be6f6d30dc1750886231c021f3e9ab599705e02b Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Thu, 29 Jan 2026 11:46:39 +0100
Subject: [PATCH 09/22] First step slot-mechanism (#1474)

---
 ...s3.variability.artifacts.base.behavior.mps | 696 +++++++++++++-----
 ...ets3.variability.artifacts.base.plugin.mps |  73 +-
 2 files changed, 571 insertions(+), 198 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index 430be4bba8..0ba695dbc4 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -6515,53 +6515,93 @@
           <node concept="3cpWsn" id="220xVKplin$" role="3cpWs9">
             <property role="TrG5h" value="label" />
             <node concept="17QB3L" id="220xVKplin_" role="1tU5fm" />
-            <node concept="3cpWs3" id="220xVKplinA" role="33vP2m">
-              <node concept="2OqwBi" id="220xVKplinB" role="3uHU7w">
-                <node concept="liA8E" id="220xVKplinC" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
+            <node concept="3cpWs3" id="4un_YeLsRJS" role="33vP2m">
+              <node concept="3cpWs3" id="220xVKplinA" role="3uHU7B">
+                <node concept="3cpWs3" id="220xVKplinH" role="3uHU7B">
+                  <node concept="Xl_RD" id="220xVKplinN" role="3uHU7w">
+                    <property role="Xl_RC" value="\\n" />
+                  </node>
+                  <node concept="3cpWs3" id="2wdh$FhKuMm" role="3uHU7B">
+                    <node concept="37vLTw" id="2wdh$FhKvX3" role="3uHU7w">
+                      <ref role="3cqZAo" node="2wdh$FhK6ud" resolve="origConcept" />
+                    </node>
+                    <node concept="3cpWs3" id="2wdh$FhKsz6" role="3uHU7B">
+                      <node concept="2OqwBi" id="4MuaMivkQDx" role="3uHU7B">
+                        <node concept="2OqwBi" id="220xVKplinI" role="2Oq$k0">
+                          <node concept="2qgKlT" id="220xVKplinM" role="2OqNvi">
+                            <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
+                          </node>
+                          <node concept="37vLTw" id="hc_FFnE7p4" role="2Oq$k0">
+                            <ref role="3cqZAo" node="hc_FFnE7p0" resolve="orig" />
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="4MuaMivkXlt" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~String.replace(char,char)" resolve="replace" />
+                          <node concept="1Xhbcc" id="4MuaMivl32C" role="37wK5m">
+                            <property role="1XhdNS" value="&quot;" />
+                          </node>
+                          <node concept="1Xhbcc" id="4MuaMivleHu" role="37wK5m">
+                            <property role="1XhdNS" value="\'" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Xl_RD" id="2wdh$FhKs$q" role="3uHU7w">
+                        <property role="Xl_RC" value="\\n" />
+                      </node>
+                    </node>
+                  </node>
                 </node>
-                <node concept="2JrnkZ" id="220xVKplinD" role="2Oq$k0">
-                  <node concept="37vLTw" id="hc_FFnE7p5" role="2JrQYb">
-                    <ref role="3cqZAo" node="hc_FFnE7p0" resolve="orig" />
+                <node concept="2OqwBi" id="220xVKplinB" role="3uHU7w">
+                  <node concept="liA8E" id="220xVKplinC" role="2OqNvi">
+                    <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
+                  </node>
+                  <node concept="2JrnkZ" id="220xVKplinD" role="2Oq$k0">
+                    <node concept="37vLTw" id="hc_FFnE7p5" role="2JrQYb">
+                      <ref role="3cqZAo" node="hc_FFnE7p0" resolve="orig" />
+                    </node>
                   </node>
                 </node>
               </node>
-              <node concept="3cpWs3" id="220xVKplinH" role="3uHU7B">
-                <node concept="Xl_RD" id="220xVKplinN" role="3uHU7w">
-                  <property role="Xl_RC" value="\\n" />
-                </node>
-                <node concept="3cpWs3" id="2wdh$FhKuMm" role="3uHU7B">
-                  <node concept="37vLTw" id="2wdh$FhKvX3" role="3uHU7w">
-                    <ref role="3cqZAo" node="2wdh$FhK6ud" resolve="origConcept" />
+              <node concept="Xl_RD" id="4un_YeLsVqT" role="3uHU7w">
+                <property role="Xl_RC" value="\\n" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="4un_YeLo17g" role="3cqZAp">
+          <node concept="3clFbS" id="4un_YeLo17i" role="3clFbx">
+            <node concept="3clFbF" id="4un_YeLocHp" role="3cqZAp">
+              <node concept="d57v9" id="4un_YeLoimy" role="3clFbG">
+                <node concept="3cpWs3" id="4un_YeLozn1" role="37vLTx">
+                  <node concept="Xl_RD" id="4un_YeLolZV" role="3uHU7B">
+                    <property role="Xl_RC" value="InstTarget: " />
                   </node>
-                  <node concept="3cpWs3" id="2wdh$FhKsz6" role="3uHU7B">
-                    <node concept="2OqwBi" id="4MuaMivkQDx" role="3uHU7B">
-                      <node concept="2OqwBi" id="220xVKplinI" role="2Oq$k0">
-                        <node concept="2qgKlT" id="220xVKplinM" role="2OqNvi">
-                          <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
-                        </node>
-                        <node concept="37vLTw" id="hc_FFnE7p4" role="2Oq$k0">
-                          <ref role="3cqZAo" node="hc_FFnE7p0" resolve="orig" />
-                        </node>
+                  <node concept="2EnYce" id="4un_YeLoNkN" role="3uHU7w">
+                    <node concept="2OqwBi" id="4un_YeLoDqA" role="2Oq$k0">
+                      <node concept="37vLTw" id="4un_YeLoB4p" role="2Oq$k0">
+                        <ref role="3cqZAo" node="220xVKpl3iS" resolve="sn" />
                       </node>
-                      <node concept="liA8E" id="4MuaMivkXlt" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.replace(char,char)" resolve="replace" />
-                        <node concept="1Xhbcc" id="4MuaMivl32C" role="37wK5m">
-                          <property role="1XhdNS" value="&quot;" />
-                        </node>
-                        <node concept="1Xhbcc" id="4MuaMivleHu" role="37wK5m">
-                          <property role="1XhdNS" value="\'" />
-                        </node>
+                      <node concept="liA8E" id="4un_YeLoH5u" role="2OqNvi">
+                        <ref role="37wK5l" node="3PY$ATCd3cz" resolve="target" />
                       </node>
                     </node>
-                    <node concept="Xl_RD" id="2wdh$FhKs$q" role="3uHU7w">
-                      <property role="Xl_RC" value="\\n" />
-                    </node>
+                    <node concept="2Iv5rx" id="4un_YeLoPHO" role="2OqNvi" />
                   </node>
                 </node>
+                <node concept="37vLTw" id="4un_YeLocHn" role="37vLTJ">
+                  <ref role="3cqZAo" node="220xVKplin$" resolve="label" />
+                </node>
               </node>
             </node>
           </node>
+          <node concept="2OqwBi" id="4un_YeLo7Qn" role="3clFbw">
+            <node concept="37vLTw" id="4un_YeLo5r3" role="2Oq$k0">
+              <ref role="3cqZAo" node="220xVKpl3iS" resolve="sn" />
+            </node>
+            <node concept="liA8E" id="4un_YeLoaCa" role="2OqNvi">
+              <ref role="37wK5l" node="7LcJ$BbTLVP" resolve="isInstance" />
+            </node>
+          </node>
         </node>
         <node concept="3cpWs8" id="2wdh$FhHPty" role="3cqZAp">
           <node concept="3cpWsn" id="2wdh$FhHPt_" role="3cpWs9">
@@ -7624,7 +7664,14 @@
       <node concept="3Tqbb2" id="1FyQP4mKZY" role="1tU5fm" />
       <node concept="3Tm6S6" id="1FyQP4mKZZ" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="3PVpeZpkS_u" role="jymVt" />
+    <node concept="312cEg" id="3RmCGNPQKrq" role="jymVt">
+      <property role="TrG5h" value="originalDeletable" />
+      <node concept="3Tm6S6" id="3RmCGNPQz2e" role="1B3o_S" />
+      <node concept="10P_77" id="3RmCGNPR5zJ" role="1tU5fm" />
+      <node concept="3clFbT" id="3RmCGNPR6gk" role="33vP2m">
+        <property role="3clFbU" value="true" />
+      </node>
+    </node>
     <node concept="312cEg" id="7LcJ$BbTtUp" role="jymVt">
       <property role="TrG5h" value="isInstance" />
       <node concept="3Tm6S6" id="7LcJ$BbTc1p" role="1B3o_S" />
@@ -7864,41 +7911,39 @@
     </node>
     <node concept="2tJIrI" id="1FyQP4AO5W" role="jymVt" />
     <node concept="2tJIrI" id="WVQivikNVQ" role="jymVt" />
-    <node concept="2tJIrI" id="25RwNEX2Vz2" role="jymVt" />
-    <node concept="2tJIrI" id="25RwNEX2Vz3" role="jymVt" />
-    <node concept="3clFbW" id="25RwNEX31U6" role="jymVt">
-      <node concept="3cqZAl" id="25RwNEX31U7" role="3clF45" />
-      <node concept="3Tm1VV" id="25RwNEX31U8" role="1B3o_S" />
-      <node concept="3clFbS" id="25RwNEX31U9" role="3clF47">
-        <node concept="3clFbF" id="25RwNEX31Ua" role="3cqZAp">
-          <node concept="37vLTI" id="25RwNEX31Ub" role="3clFbG">
-            <node concept="2OqwBi" id="25RwNEX31Uc" role="37vLTJ">
-              <node concept="Xjq3P" id="25RwNEX31Ud" role="2Oq$k0" />
-              <node concept="2OwXpG" id="25RwNEX31Ue" role="2OqNvi">
+    <node concept="3clFbW" id="3RmCGNPRyKp" role="jymVt">
+      <node concept="3cqZAl" id="3RmCGNPRyKq" role="3clF45" />
+      <node concept="3Tm1VV" id="3RmCGNPRyKr" role="1B3o_S" />
+      <node concept="3clFbS" id="3RmCGNPRyKs" role="3clF47">
+        <node concept="3clFbF" id="3RmCGNPRyKt" role="3cqZAp">
+          <node concept="37vLTI" id="3RmCGNPRyKu" role="3clFbG">
+            <node concept="2OqwBi" id="3RmCGNPRyKv" role="37vLTJ">
+              <node concept="Xjq3P" id="3RmCGNPRyKw" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3RmCGNPRyKx" role="2OqNvi">
                 <ref role="2Oxat5" node="1FyQP4mKZX" resolve="original" />
               </node>
             </node>
-            <node concept="37vLTw" id="25RwNEX31Uf" role="37vLTx">
-              <ref role="3cqZAo" node="25RwNEX31UN" resolve="original" />
+            <node concept="37vLTw" id="3RmCGNPRyKy" role="37vLTx">
+              <ref role="3cqZAo" node="3RmCGNPRyLc" resolve="original" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="25RwNEX31Ug" role="3cqZAp">
-          <node concept="37vLTI" id="25RwNEX31Uh" role="3clFbG">
-            <node concept="2OqwBi" id="25RwNEX31Ui" role="37vLTJ">
-              <node concept="Xjq3P" id="25RwNEX31Uj" role="2Oq$k0" />
-              <node concept="2OwXpG" id="25RwNEX31Uk" role="2OqNvi">
+        <node concept="3clFbF" id="3RmCGNPRyKz" role="3cqZAp">
+          <node concept="37vLTI" id="3RmCGNPRyK$" role="3clFbG">
+            <node concept="2OqwBi" id="3RmCGNPRyK_" role="37vLTJ">
+              <node concept="Xjq3P" id="3RmCGNPRyKA" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3RmCGNPRyKB" role="2OqNvi">
                 <ref role="2Oxat5" node="35D74265ALS" resolve="genId" />
               </node>
             </node>
-            <node concept="2pJPEk" id="25RwNEX31Ul" role="37vLTx">
-              <node concept="2pJPED" id="25RwNEX31Um" role="2pJPEn">
+            <node concept="2pJPEk" id="3RmCGNPRyKC" role="37vLTx">
+              <node concept="2pJPED" id="3RmCGNPRyKD" role="2pJPEn">
                 <ref role="2pJxaS" to="tpee:fzcmrck" resolve="IntegerConstant" />
-                <node concept="2pJxcG" id="25RwNEX31Un" role="2pJxcM">
+                <node concept="2pJxcG" id="3RmCGNPRyKE" role="2pJxcM">
                   <ref role="2pJxcJ" to="tpee:fzcmrcl" resolve="value" />
-                  <node concept="WxPPo" id="25RwNEX31Uo" role="28ntcv">
-                    <node concept="3uNrnE" id="25RwNEX31Up" role="WxPPp">
-                      <node concept="37vLTw" id="25RwNEX31Vj" role="2$L3a6">
+                  <node concept="WxPPo" id="3RmCGNPRyKF" role="28ntcv">
+                    <node concept="3uNrnE" id="3RmCGNPRyKG" role="WxPPp">
+                      <node concept="37vLTw" id="3RmCGNPRyLI" role="2$L3a6">
                         <ref role="3cqZAo" node="1FyQP4mKZT" resolve="nextId" />
                       </node>
                     </node>
@@ -7908,79 +7953,150 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="25RwNEX31Uq" role="3cqZAp">
-          <node concept="37vLTI" id="25RwNEX31Ur" role="3clFbG">
-            <node concept="37vLTw" id="25RwNEX31Us" role="37vLTx">
-              <ref role="3cqZAo" node="25RwNEX31UR" resolve="parent" />
+        <node concept="3clFbF" id="3RmCGNPRyKH" role="3cqZAp">
+          <node concept="37vLTI" id="3RmCGNPRyKI" role="3clFbG">
+            <node concept="37vLTw" id="3RmCGNPRyKJ" role="37vLTx">
+              <ref role="3cqZAo" node="3RmCGNPRyLg" resolve="parent" />
             </node>
-            <node concept="2OqwBi" id="25RwNEX31Ut" role="37vLTJ">
-              <node concept="Xjq3P" id="25RwNEX31Uu" role="2Oq$k0" />
-              <node concept="2OwXpG" id="25RwNEX31Uv" role="2OqNvi">
+            <node concept="2OqwBi" id="3RmCGNPRyKK" role="37vLTJ">
+              <node concept="Xjq3P" id="3RmCGNPRyKL" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3RmCGNPRyKM" role="2OqNvi">
                 <ref role="2Oxat5" node="1FyQP4mL06" resolve="parent" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="25RwNEX31Uw" role="3cqZAp">
-          <node concept="37vLTI" id="25RwNEX31Ux" role="3clFbG">
-            <node concept="37vLTw" id="25RwNEX31Uy" role="37vLTx">
-              <ref role="3cqZAo" node="25RwNEX31UT" resolve="path" />
+        <node concept="3clFbF" id="3RmCGNPRyKN" role="3cqZAp">
+          <node concept="37vLTI" id="3RmCGNPRyKO" role="3clFbG">
+            <node concept="37vLTw" id="3RmCGNPRyKP" role="37vLTx">
+              <ref role="3cqZAo" node="3RmCGNPRyLi" resolve="path" />
             </node>
-            <node concept="2OqwBi" id="25RwNEX31Uz" role="37vLTJ">
-              <node concept="Xjq3P" id="25RwNEX31U$" role="2Oq$k0" />
-              <node concept="2OwXpG" id="25RwNEX31U_" role="2OqNvi">
+            <node concept="2OqwBi" id="3RmCGNPRyKQ" role="37vLTJ">
+              <node concept="Xjq3P" id="3RmCGNPRyKR" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3RmCGNPRyKS" role="2OqNvi">
                 <ref role="2Oxat5" node="IzpDYSWOE$" resolve="path" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="25RwNEX31UA" role="3cqZAp">
-          <node concept="37vLTI" id="25RwNEX31UB" role="3clFbG">
-            <node concept="2OqwBi" id="25RwNEX31UC" role="37vLTJ">
-              <node concept="Xjq3P" id="25RwNEX31UD" role="2Oq$k0" />
-              <node concept="2OwXpG" id="25RwNEX31UE" role="2OqNvi">
+        <node concept="3clFbF" id="3RmCGNPRyKT" role="3cqZAp">
+          <node concept="37vLTI" id="3RmCGNPRyKU" role="3clFbG">
+            <node concept="2OqwBi" id="3RmCGNPRyKV" role="37vLTJ">
+              <node concept="Xjq3P" id="3RmCGNPRyKW" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3RmCGNPRyKX" role="2OqNvi">
                 <ref role="2Oxat5" node="1FyQP4mL03" resolve="variationPoint" />
               </node>
             </node>
-            <node concept="2YIFZM" id="25RwNEX31UF" role="37vLTx">
+            <node concept="2YIFZM" id="3RmCGNPRyKY" role="37vLTx">
               <ref role="37wK5l" to="33ny:~Optional.ofNullable(java.lang.Object)" resolve="ofNullable" />
               <ref role="1Pybhc" to="33ny:~Optional" resolve="Optional" />
-              <node concept="37vLTw" id="25RwNEX31UG" role="37wK5m">
-                <ref role="3cqZAo" node="25RwNEX31UP" resolve="varPoint" />
+              <node concept="37vLTw" id="3RmCGNPRyKZ" role="37wK5m">
+                <ref role="3cqZAo" node="3RmCGNPRyLe" resolve="varPoint" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="25RwNEX3dSg" role="3cqZAp">
-          <node concept="37vLTI" id="25RwNEX3ilZ" role="3clFbG">
-            <node concept="37vLTw" id="25RwNEX3iVL" role="37vLTx">
-              <ref role="3cqZAo" node="25RwNEX3cHh" resolve="isInstance" />
+        <node concept="3clFbF" id="3RmCGNPRyL0" role="3cqZAp">
+          <node concept="37vLTI" id="3RmCGNPRyL1" role="3clFbG">
+            <node concept="37vLTw" id="3RmCGNPRyL2" role="37vLTx">
+              <ref role="3cqZAo" node="3RmCGNPRyLk" resolve="isInstance" />
             </node>
-            <node concept="2OqwBi" id="25RwNEX3eQY" role="37vLTJ">
-              <node concept="Xjq3P" id="25RwNEX3dSe" role="2Oq$k0" />
-              <node concept="2OwXpG" id="25RwNEX3g9H" role="2OqNvi">
+            <node concept="2OqwBi" id="3RmCGNPRyL3" role="37vLTJ">
+              <node concept="Xjq3P" id="3RmCGNPRyL4" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3RmCGNPRyL5" role="2OqNvi">
                 <ref role="2Oxat5" node="7LcJ$BbTtUp" resolve="isInstance" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="25RwNEX31UH" role="3cqZAp">
-          <node concept="2OqwBi" id="25RwNEX31UI" role="3clFbG">
-            <node concept="liA8E" id="25RwNEX31UJ" role="2OqNvi">
+        <node concept="3clFbF" id="3RmCGNQNZYq" role="3cqZAp">
+          <node concept="37vLTI" id="3RmCGNQO6gN" role="3clFbG">
+            <node concept="37vLTw" id="3RmCGNQO7BO" role="37vLTx">
+              <ref role="3cqZAo" node="3RmCGNPRBQS" resolve="deleteOriginal" />
+            </node>
+            <node concept="2OqwBi" id="3RmCGNQO1f_" role="37vLTJ">
+              <node concept="Xjq3P" id="3RmCGNQNZYo" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3RmCGNQO3UG" role="2OqNvi">
+                <ref role="2Oxat5" node="3RmCGNPQKrq" resolve="originalDeletable" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3RmCGNPRyL6" role="3cqZAp">
+          <node concept="2OqwBi" id="3RmCGNPRyL7" role="3clFbG">
+            <node concept="liA8E" id="3RmCGNPRyL8" role="2OqNvi">
               <ref role="37wK5l" to="mhbf:~SNode.putUserObject(java.lang.Object,java.lang.Object)" resolve="putUserObject" />
-              <node concept="37vLTw" id="25RwNEX31VP" role="37wK5m">
+              <node concept="37vLTw" id="3RmCGNPRyMo" role="37wK5m">
                 <ref role="3cqZAo" node="fr_H$y8FJe" resolve="KEY2" />
               </node>
-              <node concept="Xjq3P" id="25RwNEX31UK" role="37wK5m" />
+              <node concept="Xjq3P" id="3RmCGNPRyL9" role="37wK5m" />
             </node>
-            <node concept="2JrnkZ" id="25RwNEX31UL" role="2Oq$k0">
-              <node concept="37vLTw" id="25RwNEX31UM" role="2JrQYb">
-                <ref role="3cqZAo" node="25RwNEX31UN" resolve="original" />
+            <node concept="2JrnkZ" id="3RmCGNPRyLa" role="2Oq$k0">
+              <node concept="37vLTw" id="3RmCGNPRyLb" role="2JrQYb">
+                <ref role="3cqZAo" node="3RmCGNPRyLc" resolve="original" />
               </node>
             </node>
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="3RmCGNPRyLc" role="3clF46">
+        <property role="TrG5h" value="original" />
+        <node concept="3Tqbb2" id="3RmCGNPRyLd" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3RmCGNPRyLe" role="3clF46">
+        <property role="TrG5h" value="varPoint" />
+        <node concept="3Tqbb2" id="3RmCGNPRyLf" role="1tU5fm">
+          <ref role="ehGHo" to="i9mv:1_gcnzuM43A" resolve="IVariationPointBase" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3RmCGNPRyLg" role="3clF46">
+        <property role="TrG5h" value="parent" />
+        <node concept="3uibUv" id="3RmCGNPRyLh" role="1tU5fm">
+          <ref role="3uigEE" node="1FyQP4mJjB" resolve="SkeletonNode" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3RmCGNPRyLi" role="3clF46">
+        <property role="TrG5h" value="path" />
+        <node concept="3uibUv" id="3RmCGNPRyLj" role="1tU5fm">
+          <ref role="3uigEE" node="5LihCoMh$14" resolve="ArtifactPath" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3RmCGNPRyLk" role="3clF46">
+        <property role="TrG5h" value="isInstance" />
+        <node concept="10P_77" id="3RmCGNPRyLl" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3RmCGNPRBQS" role="3clF46">
+        <property role="TrG5h" value="deleteOriginal" />
+        <node concept="10P_77" id="3RmCGNPRCwv" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3RmCGNPRrm8" role="jymVt" />
+    <node concept="3clFbW" id="25RwNEX31U6" role="jymVt">
+      <node concept="3cqZAl" id="25RwNEX31U7" role="3clF45" />
+      <node concept="3Tm1VV" id="25RwNEX31U8" role="1B3o_S" />
+      <node concept="3clFbS" id="25RwNEX31U9" role="3clF47">
+        <node concept="1VxSAg" id="3RmCGNPRDC6" role="3cqZAp">
+          <ref role="37wK5l" node="3RmCGNPRyKp" />
+          <node concept="37vLTw" id="3RmCGNPRDZZ" role="37wK5m">
+            <ref role="3cqZAo" node="25RwNEX31UN" resolve="original" />
+          </node>
+          <node concept="37vLTw" id="3RmCGNPREDg" role="37wK5m">
+            <ref role="3cqZAo" node="25RwNEX31UP" resolve="varPoint" />
+          </node>
+          <node concept="37vLTw" id="3RmCGNPRFkg" role="37wK5m">
+            <ref role="3cqZAo" node="25RwNEX31UR" resolve="parent" />
+          </node>
+          <node concept="37vLTw" id="3RmCGNPRGle" role="37wK5m">
+            <ref role="3cqZAo" node="25RwNEX31UT" resolve="path" />
+          </node>
+          <node concept="37vLTw" id="3RmCGNPRHnq" role="37wK5m">
+            <ref role="3cqZAo" node="25RwNEX3cHh" resolve="isInstance" />
+          </node>
+          <node concept="3clFbT" id="3RmCGNPRI4n" role="37wK5m">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
       <node concept="37vLTG" id="25RwNEX31UN" role="3clF46">
         <property role="TrG5h" value="original" />
         <node concept="3Tqbb2" id="25RwNEX31UO" role="1tU5fm" />
@@ -10505,6 +10621,22 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="3RmCGNPRMl9" role="jymVt" />
+    <node concept="3clFb_" id="3RmCGNPS1xD" role="jymVt">
+      <property role="TrG5h" value="deleteOriginal" />
+      <node concept="10P_77" id="3RmCGNPSBK1" role="3clF45" />
+      <node concept="3Tm1VV" id="3RmCGNPS1xG" role="1B3o_S" />
+      <node concept="3clFbS" id="3RmCGNPS1xH" role="3clF47">
+        <node concept="3clFbF" id="3RmCGNPSmQV" role="3cqZAp">
+          <node concept="2OqwBi" id="3RmCGNPSsQd" role="3clFbG">
+            <node concept="Xjq3P" id="3RmCGNPSmQU" role="2Oq$k0" />
+            <node concept="2OwXpG" id="3RmCGNPSyde" role="2OqNvi">
+              <ref role="2Oxat5" node="3RmCGNPQKrq" resolve="originalDeletable" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="3PY$ATC1UTL" role="jymVt" />
     <node concept="3clFb_" id="3PY$ATBXFBX" role="jymVt">
       <property role="TrG5h" value="targetIVAA" />
@@ -10623,27 +10755,41 @@
       <node concept="3clFbS" id="1AW3RV6KYSt" role="3clF47">
         <node concept="3clFbF" id="1AW3RV6L91z" role="3cqZAp">
           <node concept="2OqwBi" id="1AW3RV6Mf5$" role="3clFbG">
-            <node concept="2OqwBi" id="1AW3RV6LvkM" role="2Oq$k0">
-              <node concept="2ShNRf" id="1AW3RV6L91x" role="2Oq$k0">
-                <node concept="1pGfFk" id="1AW3RV6Lg8q" role="2ShVmc">
-                  <property role="373rjd" value="true" />
-                  <ref role="37wK5l" to="qt06:~ToStringBuilder.&lt;init&gt;(java.lang.Object,org.apache.commons.lang3.builder.ToStringStyle)" resolve="ToStringBuilder" />
-                  <node concept="Xjq3P" id="1AW3RV6Lsar" role="37wK5m" />
-                  <node concept="10M0yZ" id="2BXIjDlOe8m" role="37wK5m">
-                    <ref role="3cqZAo" to="qt06:~ToStringStyle.SHORT_PREFIX_STYLE" resolve="SHORT_PREFIX_STYLE" />
-                    <ref role="1PxDUh" to="qt06:~ToStringStyle" resolve="ToStringStyle" />
+            <node concept="2OqwBi" id="2_ThrGHiYXN" role="2Oq$k0">
+              <node concept="2OqwBi" id="1AW3RV6LvkM" role="2Oq$k0">
+                <node concept="2ShNRf" id="1AW3RV6L91x" role="2Oq$k0">
+                  <node concept="1pGfFk" id="1AW3RV6Lg8q" role="2ShVmc">
+                    <property role="373rjd" value="true" />
+                    <ref role="37wK5l" to="qt06:~ToStringBuilder.&lt;init&gt;(java.lang.Object,org.apache.commons.lang3.builder.ToStringStyle)" resolve="ToStringBuilder" />
+                    <node concept="Xjq3P" id="1AW3RV6Lsar" role="37wK5m" />
+                    <node concept="10M0yZ" id="2BXIjDlOe8m" role="37wK5m">
+                      <ref role="3cqZAo" to="qt06:~ToStringStyle.SHORT_PREFIX_STYLE" resolve="SHORT_PREFIX_STYLE" />
+                      <ref role="1PxDUh" to="qt06:~ToStringStyle" resolve="ToStringStyle" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="1AW3RV6LzVE" role="2OqNvi">
+                  <ref role="37wK5l" to="qt06:~ToStringBuilder.append(java.lang.String,java.lang.Object)" resolve="append" />
+                  <node concept="Xl_RD" id="1AW3RV6LAVw" role="37wK5m">
+                    <property role="Xl_RC" value="original" />
+                  </node>
+                  <node concept="2OqwBi" id="1AW3RV6LPxJ" role="37wK5m">
+                    <node concept="Xjq3P" id="1AW3RV6LN8y" role="2Oq$k0" />
+                    <node concept="2OwXpG" id="1AW3RV6LSrN" role="2OqNvi">
+                      <ref role="2Oxat5" node="1FyQP4mKZX" resolve="original" />
+                    </node>
                   </node>
                 </node>
               </node>
-              <node concept="liA8E" id="1AW3RV6LzVE" role="2OqNvi">
+              <node concept="liA8E" id="2_ThrGHj4t2" role="2OqNvi">
                 <ref role="37wK5l" to="qt06:~ToStringBuilder.append(java.lang.String,java.lang.Object)" resolve="append" />
-                <node concept="Xl_RD" id="1AW3RV6LAVw" role="37wK5m">
-                  <property role="Xl_RC" value="original" />
+                <node concept="Xl_RD" id="2_ThrGHj7A0" role="37wK5m">
+                  <property role="Xl_RC" value="target" />
                 </node>
-                <node concept="2OqwBi" id="1AW3RV6LPxJ" role="37wK5m">
-                  <node concept="Xjq3P" id="1AW3RV6LN8y" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="1AW3RV6LSrN" role="2OqNvi">
-                    <ref role="2Oxat5" node="1FyQP4mKZX" resolve="original" />
+                <node concept="2OqwBi" id="2_ThrGHjBo1" role="37wK5m">
+                  <node concept="Xjq3P" id="2_ThrGHjtf0" role="2Oq$k0" />
+                  <node concept="liA8E" id="2_ThrGHjEYf" role="2OqNvi">
+                    <ref role="37wK5l" node="3PY$ATCd3cz" resolve="target" />
                   </node>
                 </node>
               </node>
@@ -12688,7 +12834,14 @@
         <ref role="ehGHo" to="i9mv:75FdNyOGCTb" resolve="IVariabilityAwareArtifact" />
       </node>
     </node>
-    <node concept="2tJIrI" id="5WHJ7lXUF8A" role="jymVt" />
+    <node concept="312cEg" id="2_ThrGHnVgg" role="jymVt">
+      <property role="TrG5h" value="deletePivot" />
+      <node concept="3Tm6S6" id="2_ThrGHnRIf" role="1B3o_S" />
+      <node concept="10P_77" id="2_ThrGHnVMK" role="1tU5fm" />
+      <node concept="3clFbT" id="2_ThrGHnVU1" role="33vP2m">
+        <property role="3clFbU" value="true" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="IzpDYSOg7R" role="jymVt" />
     <node concept="3clFbW" id="IzpDYSOg8e" role="jymVt">
       <node concept="37vLTG" id="IzpDYSOg8G" role="3clF46">
@@ -12714,69 +12867,148 @@
       <node concept="3cqZAl" id="IzpDYSOg8g" role="3clF45" />
       <node concept="3Tm1VV" id="IzpDYSOg8h" role="1B3o_S" />
       <node concept="3clFbS" id="IzpDYSOg8i" role="3clF47">
-        <node concept="3clFbF" id="IzpDYSOg9A" role="3cqZAp">
-          <node concept="37vLTI" id="IzpDYSOgvu" role="3clFbG">
-            <node concept="37vLTw" id="IzpDYSOgxs" role="37vLTx">
-              <ref role="3cqZAo" node="IzpDYSOg8G" resolve="pivotNode" />
-            </node>
-            <node concept="2OqwBi" id="IzpDYSOgfa" role="37vLTJ">
-              <node concept="Xjq3P" id="IzpDYSOg9_" role="2Oq$k0" />
-              <node concept="2OwXpG" id="IzpDYSOgma" role="2OqNvi">
+        <node concept="1VxSAg" id="2_ThrGHoiWJ" role="3cqZAp">
+          <ref role="37wK5l" node="2_ThrGHocbS" />
+          <node concept="37vLTw" id="2_ThrGHoj1$" role="37wK5m">
+            <ref role="3cqZAo" node="IzpDYSOg8G" resolve="pivotNode" />
+          </node>
+          <node concept="37vLTw" id="2_ThrGHoj7X" role="37wK5m">
+            <ref role="3cqZAo" node="IzpDYSPG_2" resolve="targetNode" />
+          </node>
+          <node concept="37vLTw" id="2_ThrGHojk9" role="37wK5m">
+            <ref role="3cqZAo" node="IzpDYSOgL5" resolve="fmInclude" />
+          </node>
+          <node concept="37vLTw" id="2_ThrGHojq7" role="37wK5m">
+            <ref role="3cqZAo" node="IzpDYSOjaP" resolve="targetIVAA" />
+          </node>
+          <node concept="3clFbT" id="2_ThrGHojA3" role="37wK5m">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2_ThrGHobom" role="jymVt" />
+    <node concept="3clFbW" id="2_ThrGHocbS" role="jymVt">
+      <node concept="37vLTG" id="2_ThrGHocbT" role="3clF46">
+        <property role="TrG5h" value="pivotNode" />
+        <node concept="3Tqbb2" id="2_ThrGHocbU" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="2_ThrGHocbV" role="3clF46">
+        <property role="TrG5h" value="targetNode" />
+        <node concept="3Tqbb2" id="2_ThrGHocbW" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="2_ThrGHocbX" role="3clF46">
+        <property role="TrG5h" value="fmInclude" />
+        <node concept="3Tqbb2" id="2_ThrGHocbY" role="1tU5fm">
+          <ref role="ehGHo" to="s6b7:3tsFshP5M5C" resolve="FeatureModelInclude" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2_ThrGHocbZ" role="3clF46">
+        <property role="TrG5h" value="targetIVAA" />
+        <node concept="3Tqbb2" id="2_ThrGHocc0" role="1tU5fm">
+          <ref role="ehGHo" to="i9mv:75FdNyOGCTb" resolve="IVariabilityAwareArtifact" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2_ThrGHofOa" role="3clF46">
+        <property role="TrG5h" value="deletePivot" />
+        <node concept="10P_77" id="2_ThrGHofTD" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="2_ThrGHocc1" role="3clF45" />
+      <node concept="3Tm1VV" id="2_ThrGHocc2" role="1B3o_S" />
+      <node concept="3clFbS" id="2_ThrGHocc3" role="3clF47">
+        <node concept="3clFbF" id="2_ThrGHocc4" role="3cqZAp">
+          <node concept="37vLTI" id="2_ThrGHocc5" role="3clFbG">
+            <node concept="37vLTw" id="2_ThrGHocc6" role="37vLTx">
+              <ref role="3cqZAo" node="2_ThrGHocbT" resolve="pivotNode" />
+            </node>
+            <node concept="2OqwBi" id="2_ThrGHocc7" role="37vLTJ">
+              <node concept="Xjq3P" id="2_ThrGHocc8" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2_ThrGHocc9" role="2OqNvi">
                 <ref role="2Oxat5" node="IzpDYSOg7A" resolve="pivotNode" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="1gVbGN" id="7G$l9GL09AR" role="3cqZAp">
-          <node concept="3y3z36" id="7G$l9GL09RA" role="1gVkn0">
-            <node concept="10Nm6u" id="7G$l9GL0a1Y" role="3uHU7w" />
-            <node concept="37vLTw" id="7G$l9GL09Hc" role="3uHU7B">
-              <ref role="3cqZAo" node="IzpDYSPG_2" resolve="targetNode" />
+        <node concept="1gVbGN" id="2_ThrGHocca" role="3cqZAp">
+          <node concept="3y3z36" id="2_ThrGHoccb" role="1gVkn0">
+            <node concept="10Nm6u" id="2_ThrGHoccc" role="3uHU7w" />
+            <node concept="37vLTw" id="2_ThrGHoccd" role="3uHU7B">
+              <ref role="3cqZAo" node="2_ThrGHocbV" resolve="targetNode" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="IzpDYSSQQ5" role="3cqZAp">
-          <node concept="37vLTI" id="IzpDYSSRxF" role="3clFbG">
-            <node concept="37vLTw" id="IzpDYSSRAg" role="37vLTx">
-              <ref role="3cqZAo" node="IzpDYSPG_2" resolve="targetNode" />
+        <node concept="3clFbF" id="2_ThrGHocce" role="3cqZAp">
+          <node concept="37vLTI" id="2_ThrGHoccf" role="3clFbG">
+            <node concept="37vLTw" id="2_ThrGHoccg" role="37vLTx">
+              <ref role="3cqZAo" node="2_ThrGHocbV" resolve="targetNode" />
             </node>
-            <node concept="2OqwBi" id="IzpDYSSR34" role="37vLTJ">
-              <node concept="Xjq3P" id="IzpDYSSQQ3" role="2Oq$k0" />
-              <node concept="2OwXpG" id="IzpDYSSRkx" role="2OqNvi">
+            <node concept="2OqwBi" id="2_ThrGHocch" role="37vLTJ">
+              <node concept="Xjq3P" id="2_ThrGHocci" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2_ThrGHoccj" role="2OqNvi">
                 <ref role="2Oxat5" node="IzpDYSPGvZ" resolve="targetNode" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="IzpDYSOgO5" role="3cqZAp">
-          <node concept="37vLTI" id="IzpDYSOhwd" role="3clFbG">
-            <node concept="37vLTw" id="IzpDYSOhxy" role="37vLTx">
-              <ref role="3cqZAo" node="IzpDYSOgL5" resolve="fmInclude" />
+        <node concept="3clFbF" id="2_ThrGHocck" role="3cqZAp">
+          <node concept="37vLTI" id="2_ThrGHoccl" role="3clFbG">
+            <node concept="37vLTw" id="2_ThrGHoccm" role="37vLTx">
+              <ref role="3cqZAo" node="2_ThrGHocbX" resolve="fmInclude" />
             </node>
-            <node concept="2OqwBi" id="IzpDYSOgUS" role="37vLTJ">
-              <node concept="Xjq3P" id="IzpDYSOgO3" role="2Oq$k0" />
-              <node concept="2OwXpG" id="IzpDYSOh2q" role="2OqNvi">
+            <node concept="2OqwBi" id="2_ThrGHoccn" role="37vLTJ">
+              <node concept="Xjq3P" id="2_ThrGHocco" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2_ThrGHoccp" role="2OqNvi">
                 <ref role="2Oxat5" node="IzpDYSOgJf" resolve="fmInclude" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="IzpDYSOjhr" role="3cqZAp">
-          <node concept="37vLTI" id="IzpDYSOkj_" role="3clFbG">
-            <node concept="37vLTw" id="IzpDYSOkmv" role="37vLTx">
-              <ref role="3cqZAo" node="IzpDYSOjaP" resolve="targetIVAA" />
+        <node concept="3clFbF" id="2_ThrGHoccq" role="3cqZAp">
+          <node concept="37vLTI" id="2_ThrGHoccr" role="3clFbG">
+            <node concept="37vLTw" id="2_ThrGHoccs" role="37vLTx">
+              <ref role="3cqZAo" node="2_ThrGHocbZ" resolve="targetIVAA" />
             </node>
-            <node concept="2OqwBi" id="IzpDYSOjoF" role="37vLTJ">
-              <node concept="Xjq3P" id="IzpDYSOjhp" role="2Oq$k0" />
-              <node concept="2OwXpG" id="IzpDYSOjvE" role="2OqNvi">
+            <node concept="2OqwBi" id="2_ThrGHocct" role="37vLTJ">
+              <node concept="Xjq3P" id="2_ThrGHoccu" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2_ThrGHoccv" role="2OqNvi">
                 <ref role="2Oxat5" node="IzpDYSOj75" resolve="targetIVAA" />
               </node>
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="2_ThrGHog5F" role="3cqZAp">
+          <node concept="37vLTI" id="2_ThrGHohTh" role="3clFbG">
+            <node concept="37vLTw" id="2_ThrGHoi01" role="37vLTx">
+              <ref role="3cqZAo" node="2_ThrGHofOa" resolve="deletePivot" />
+            </node>
+            <node concept="2OqwBi" id="2_ThrGHogfP" role="37vLTJ">
+              <node concept="Xjq3P" id="2_ThrGHog5D" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2_ThrGHog$I" role="2OqNvi">
+                <ref role="2Oxat5" node="2_ThrGHnVgg" resolve="deletePivot" />
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="2_ThrGHobM7" role="jymVt" />
     <node concept="2tJIrI" id="IzpDYSOBUU" role="jymVt" />
+    <node concept="3clFb_" id="2_ThrGHnZzm" role="jymVt">
+      <property role="TrG5h" value="deletePivotNode" />
+      <node concept="10P_77" id="2_ThrGHo6hb" role="3clF45" />
+      <node concept="3Tm1VV" id="2_ThrGHnZzp" role="1B3o_S" />
+      <node concept="3clFbS" id="2_ThrGHnZzq" role="3clF47">
+        <node concept="3clFbF" id="2_ThrGHo6_Q" role="3cqZAp">
+          <node concept="2OqwBi" id="2_ThrGHo70V" role="3clFbG">
+            <node concept="Xjq3P" id="2_ThrGHo6_P" role="2Oq$k0" />
+            <node concept="2OwXpG" id="2_ThrGHoazM" role="2OqNvi">
+              <ref role="2Oxat5" node="2_ThrGHnVgg" resolve="deletePivot" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2_ThrGHoaQt" role="jymVt" />
     <node concept="3clFb_" id="IzpDYSSmmh" role="jymVt">
       <property role="TrG5h" value="getPivotNode" />
       <node concept="3clFbS" id="IzpDYSSmmk" role="3clF47">
@@ -25674,44 +25906,121 @@
       </node>
     </node>
     <node concept="2tJIrI" id="4nDVfxWo1tf" role="jymVt" />
-    <node concept="3clFb_" id="25RwNEX7lij" role="jymVt">
+    <node concept="2tJIrI" id="3RmCGNQ76jb" role="jymVt" />
+    <node concept="3clFb_" id="3RmCGNQ792t" role="jymVt">
       <property role="TrG5h" value="createSkeletonNodeVP" />
-      <node concept="3clFbS" id="25RwNEX7lik" role="3clF47">
-        <node concept="3clFbF" id="25RwNEX7lil" role="3cqZAp">
-          <node concept="1rXfSq" id="25RwNEX7lim" role="3clFbG">
+      <node concept="3clFbS" id="3RmCGNQ792u" role="3clF47">
+        <node concept="3clFbF" id="3RmCGNQ792v" role="3cqZAp">
+          <node concept="1rXfSq" id="3RmCGNQ792w" role="3clFbG">
             <ref role="37wK5l" node="4nDVfxWo1u0" resolve="finish" />
-            <node concept="37vLTw" id="25RwNEX7lin" role="37wK5m">
-              <ref role="3cqZAo" node="25RwNEX7liz" resolve="target" />
+            <node concept="37vLTw" id="3RmCGNQ792x" role="37wK5m">
+              <ref role="3cqZAo" node="3RmCGNQ792I" resolve="target" />
             </node>
-            <node concept="37vLTw" id="25RwNEX7lio" role="37wK5m">
-              <ref role="3cqZAo" node="25RwNEX7liE" resolve="path" />
+            <node concept="37vLTw" id="3RmCGNQ792y" role="37wK5m">
+              <ref role="3cqZAo" node="3RmCGNQ792P" resolve="path" />
             </node>
-            <node concept="37vLTw" id="25RwNEX7lip" role="37wK5m">
-              <ref role="3cqZAo" node="25RwNEX7liB" resolve="parent" />
+            <node concept="37vLTw" id="3RmCGNQ792z" role="37wK5m">
+              <ref role="3cqZAo" node="3RmCGNQ792M" resolve="parent" />
             </node>
-            <node concept="2ShNRf" id="25RwNEX7liq" role="37wK5m">
-              <node concept="1pGfFk" id="25RwNEX7lir" role="2ShVmc">
-                <ref role="37wK5l" node="25RwNEX31U6" resolve="SkeletonNode" />
-                <node concept="37vLTw" id="25RwNEX7lis" role="37wK5m">
-                  <ref role="3cqZAo" node="25RwNEX7lix" resolve="n" />
+            <node concept="2ShNRf" id="3RmCGNQ792$" role="37wK5m">
+              <node concept="1pGfFk" id="3RmCGNQ792_" role="2ShVmc">
+                <ref role="37wK5l" node="3RmCGNPRyKp" />
+                <node concept="37vLTw" id="3RmCGNQ792A" role="37wK5m">
+                  <ref role="3cqZAo" node="3RmCGNQ792G" resolve="n" />
+                </node>
+                <node concept="37vLTw" id="3RmCGNQ792B" role="37wK5m">
+                  <ref role="3cqZAo" node="3RmCGNQ792K" resolve="varPoint" />
                 </node>
-                <node concept="37vLTw" id="25RwNEX7lit" role="37wK5m">
-                  <ref role="3cqZAo" node="25RwNEX7li_" resolve="varPoint" />
+                <node concept="37vLTw" id="3RmCGNQ792C" role="37wK5m">
+                  <ref role="3cqZAo" node="3RmCGNQ792M" resolve="parent" />
                 </node>
-                <node concept="37vLTw" id="25RwNEX7liu" role="37wK5m">
-                  <ref role="3cqZAo" node="25RwNEX7liB" resolve="parent" />
+                <node concept="37vLTw" id="3RmCGNQ792D" role="37wK5m">
+                  <ref role="3cqZAo" node="3RmCGNQ792P" resolve="path" />
                 </node>
-                <node concept="37vLTw" id="25RwNEX7liv" role="37wK5m">
-                  <ref role="3cqZAo" node="25RwNEX7liE" resolve="path" />
+                <node concept="37vLTw" id="3RmCGNQ792E" role="37wK5m">
+                  <ref role="3cqZAo" node="3RmCGNQ792R" resolve="isInstance" />
                 </node>
-                <node concept="37vLTw" id="25RwNEX7rYA" role="37wK5m">
-                  <ref role="3cqZAo" node="25RwNEX7neC" resolve="isInstance" />
+                <node concept="37vLTw" id="3RmCGNQ7eWA" role="37wK5m">
+                  <ref role="3cqZAo" node="3RmCGNQ7a0i" resolve="deletePivotNode" />
                 </node>
               </node>
             </node>
           </node>
         </node>
       </node>
+      <node concept="3Tmbuc" id="3RmCGNQ792F" role="1B3o_S" />
+      <node concept="37vLTG" id="3RmCGNQ792G" role="3clF46">
+        <property role="TrG5h" value="n" />
+        <node concept="3Tqbb2" id="3RmCGNQ792H" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3RmCGNQ792I" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <node concept="3Tqbb2" id="3RmCGNQ792J" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3RmCGNQ792K" role="3clF46">
+        <property role="TrG5h" value="varPoint" />
+        <node concept="3Tqbb2" id="3RmCGNQ792L" role="1tU5fm">
+          <ref role="ehGHo" to="i9mv:1_gcnzuM43A" resolve="IVariationPointBase" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3RmCGNQ792M" role="3clF46">
+        <property role="TrG5h" value="parent" />
+        <node concept="3uibUv" id="3RmCGNQ792N" role="1tU5fm">
+          <ref role="3uigEE" node="1FyQP4mJjB" resolve="SkeletonNode" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="3RmCGNQ792O" role="3clF45">
+        <ref role="3uigEE" node="1FyQP4mJjB" resolve="SkeletonNode" />
+      </node>
+      <node concept="37vLTG" id="3RmCGNQ792P" role="3clF46">
+        <property role="TrG5h" value="path" />
+        <node concept="3uibUv" id="3RmCGNQ792Q" role="1tU5fm">
+          <ref role="3uigEE" node="5LihCoMh$14" resolve="ArtifactPath" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3RmCGNQ792R" role="3clF46">
+        <property role="TrG5h" value="isInstance" />
+        <node concept="10P_77" id="3RmCGNQ792S" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3RmCGNQ7a0i" role="3clF46">
+        <property role="TrG5h" value="deletePivotNode" />
+        <node concept="10P_77" id="3RmCGNQ7bUb" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3RmCGNQ78c4" role="jymVt" />
+    <node concept="3clFb_" id="25RwNEX7lij" role="jymVt">
+      <property role="TrG5h" value="createSkeletonNodeVP" />
+      <node concept="3clFbS" id="25RwNEX7lik" role="3clF47">
+        <node concept="3clFbF" id="25RwNEX7lil" role="3cqZAp">
+          <node concept="2OqwBi" id="3RmCGNQ7kML" role="3clFbG">
+            <node concept="Xjq3P" id="3RmCGNQ7isI" role="2Oq$k0" />
+            <node concept="liA8E" id="3RmCGNQ7mB4" role="2OqNvi">
+              <ref role="37wK5l" node="3RmCGNQ792t" resolve="createSkeletonNodeVP" />
+              <node concept="37vLTw" id="3RmCGNQ7ozr" role="37wK5m">
+                <ref role="3cqZAo" node="25RwNEX7lix" resolve="n" />
+              </node>
+              <node concept="37vLTw" id="3RmCGNQ7soN" role="37wK5m">
+                <ref role="3cqZAo" node="25RwNEX7liz" resolve="target" />
+              </node>
+              <node concept="37vLTw" id="3RmCGNQ7vBL" role="37wK5m">
+                <ref role="3cqZAo" node="25RwNEX7li_" resolve="varPoint" />
+              </node>
+              <node concept="37vLTw" id="3RmCGNQ7yQ_" role="37wK5m">
+                <ref role="3cqZAo" node="25RwNEX7liB" resolve="parent" />
+              </node>
+              <node concept="37vLTw" id="3RmCGNQ7ALd" role="37wK5m">
+                <ref role="3cqZAo" node="25RwNEX7liE" resolve="path" />
+              </node>
+              <node concept="37vLTw" id="3RmCGNQ7EoH" role="37wK5m">
+                <ref role="3cqZAo" node="25RwNEX7neC" resolve="isInstance" />
+              </node>
+              <node concept="3clFbT" id="3RmCGNQ7HzS" role="37wK5m">
+                <property role="3clFbU" value="true" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="3Tmbuc" id="25RwNEX7liw" role="1B3o_S" />
       <node concept="37vLTG" id="25RwNEX7lix" role="3clF46">
         <property role="TrG5h" value="n" />
@@ -25751,34 +26060,27 @@
     <node concept="3clFb_" id="4nDVfxWo1tg" role="jymVt">
       <property role="TrG5h" value="createSkeletonNodeVP" />
       <node concept="3clFbS" id="4nDVfxWo1th" role="3clF47">
-        <node concept="3clFbF" id="4nDVfxWo1ti" role="3cqZAp">
-          <node concept="1rXfSq" id="4nDVfxWo1tj" role="3clFbG">
-            <ref role="37wK5l" node="4nDVfxWo1u0" resolve="finish" />
-            <node concept="37vLTw" id="4nDVfxWo1tk" role="37wK5m">
-              <ref role="3cqZAo" node="12BR8mHuy_j" resolve="target" />
-            </node>
-            <node concept="37vLTw" id="4nDVfxWo1tl" role="37wK5m">
-              <ref role="3cqZAo" node="4nDVfxWo1t_" resolve="path" />
-            </node>
-            <node concept="37vLTw" id="4nDVfxWo1tm" role="37wK5m">
-              <ref role="3cqZAo" node="4nDVfxWo1ty" resolve="parent" />
-            </node>
-            <node concept="2ShNRf" id="4nDVfxWo1tn" role="37wK5m">
-              <node concept="1pGfFk" id="4nDVfxWo1to" role="2ShVmc">
-                <ref role="37wK5l" node="1FyQP4zQ6h" resolve="SkeletonNode" />
-                <node concept="37vLTw" id="4nDVfxWo1tp" role="37wK5m">
-                  <ref role="3cqZAo" node="4nDVfxWo1tu" resolve="n" />
-                </node>
-                <node concept="37vLTw" id="4nDVfxWo1tq" role="37wK5m">
-                  <ref role="3cqZAo" node="4nDVfxWo1tw" resolve="varPoint" />
-                </node>
-                <node concept="37vLTw" id="4nDVfxWo1tr" role="37wK5m">
-                  <ref role="3cqZAo" node="4nDVfxWo1ty" resolve="parent" />
-                </node>
-                <node concept="37vLTw" id="4nDVfxWo1ts" role="37wK5m">
-                  <ref role="3cqZAo" node="4nDVfxWo1t_" resolve="path" />
-                </node>
+        <node concept="3clFbF" id="3RmCGNQ7LKF" role="3cqZAp">
+          <node concept="2OqwBi" id="3RmCGNQ7LKG" role="3clFbG">
+            <node concept="Xjq3P" id="3RmCGNQ7LKH" role="2Oq$k0" />
+            <node concept="liA8E" id="3RmCGNQ7LKI" role="2OqNvi">
+              <ref role="37wK5l" node="25RwNEX7lij" resolve="createSkeletonNodeVP" />
+              <node concept="37vLTw" id="3RmCGNQ7LKJ" role="37wK5m">
+                <ref role="3cqZAo" node="4nDVfxWo1tu" resolve="n" />
+              </node>
+              <node concept="37vLTw" id="3RmCGNQ7LKK" role="37wK5m">
+                <ref role="3cqZAo" node="12BR8mHuy_j" resolve="target" />
+              </node>
+              <node concept="37vLTw" id="3RmCGNQ7LKL" role="37wK5m">
+                <ref role="3cqZAo" node="4nDVfxWo1tw" resolve="varPoint" />
+              </node>
+              <node concept="37vLTw" id="3RmCGNQ7LKM" role="37wK5m">
+                <ref role="3cqZAo" node="4nDVfxWo1ty" resolve="parent" />
+              </node>
+              <node concept="37vLTw" id="3RmCGNQ7LKN" role="37wK5m">
+                <ref role="3cqZAo" node="4nDVfxWo1t_" resolve="path" />
               </node>
+              <node concept="3clFbT" id="3RmCGNQ7Q$R" role="37wK5m" />
             </node>
           </node>
         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.plugin.mps
index 0f755fa1c2..c6e4fe851a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.plugin.mps
@@ -573,6 +573,7 @@
       <concept id="3358009230508699637" name="jetbrains.mps.baseLanguage.collections.structure.PopOperation" flags="nn" index="2AryhJ" />
       <concept id="3358009230508699932" name="jetbrains.mps.baseLanguage.collections.structure.PushOperation" flags="nn" index="2ArzE6" />
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
+      <concept id="1226934395923" name="jetbrains.mps.baseLanguage.collections.structure.ClearSetOperation" flags="nn" index="2EZike" />
       <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
         <child id="1153944400369" name="variable" index="2Gsz3X" />
         <child id="1153944424730" name="inputSequence" index="2GsD0m" />
@@ -12497,7 +12498,7 @@
         <ref role="37wK5l" to="3o3z:~Sets.newHashSet()" resolve="newHashSet" />
         <ref role="1Pybhc" to="3o3z:~Sets" resolve="Sets" />
       </node>
-      <node concept="3Tm1VV" id="7RrMOpFFxyg" role="1B3o_S" />
+      <node concept="3Tm6S6" id="2_ThrGGhRZN" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="2DhIaeFmcbt" role="jymVt" />
     <node concept="312cEg" id="2DhIaeFmmTD" role="jymVt">
@@ -12593,6 +12594,76 @@
     </node>
     <node concept="2tJIrI" id="6pRB3UnFsDg" role="jymVt" />
     <node concept="2tJIrI" id="3iSvY0PFTmx" role="jymVt" />
+    <node concept="3clFb_" id="2_ThrGGmNDg" role="jymVt">
+      <property role="TrG5h" value="detachments" />
+      <node concept="2hMVRd" id="2_ThrGGn2YB" role="3clF45">
+        <node concept="3Tqbb2" id="2_ThrGGn50Q" role="2hN53Y" />
+      </node>
+      <node concept="3Tm1VV" id="2_ThrGGmNDj" role="1B3o_S" />
+      <node concept="3clFbS" id="2_ThrGGmNDk" role="3clF47">
+        <node concept="3clFbF" id="2_ThrGGn90G" role="3cqZAp">
+          <node concept="2YIFZM" id="2_ThrGGnctd" role="3clFbG">
+            <ref role="37wK5l" to="33ny:~Collections.unmodifiableSet(java.util.Set)" resolve="unmodifiableSet" />
+            <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+            <node concept="2OqwBi" id="2_ThrGGngPu" role="37wK5m">
+              <node concept="Xjq3P" id="2_ThrGGneF2" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2_ThrGGnjFh" role="2OqNvi">
+                <ref role="2Oxat5" node="3vAJxtEPz1X" resolve="detachments" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2_ThrGGo5UZ" role="jymVt" />
+    <node concept="3clFb_" id="2_ThrGGocaa" role="jymVt">
+      <property role="TrG5h" value="addDetachments" />
+      <node concept="37vLTG" id="2_ThrGGp1uj" role="3clF46">
+        <property role="TrG5h" value="nodes" />
+        <node concept="A3Dl8" id="2_ThrGGpbzl" role="1tU5fm">
+          <node concept="3Tqbb2" id="2_ThrGGpbKX" role="A3Ik2" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="2_ThrGGocac" role="3clF45" />
+      <node concept="3Tm1VV" id="2_ThrGGocad" role="1B3o_S" />
+      <node concept="3clFbS" id="2_ThrGGocae" role="3clF47">
+        <node concept="3clFbF" id="2_ThrGGpcv_" role="3cqZAp">
+          <node concept="2OqwBi" id="2_ThrGGpnLQ" role="3clFbG">
+            <node concept="2OqwBi" id="2_ThrGGpfNK" role="2Oq$k0">
+              <node concept="Xjq3P" id="2_ThrGGpcv$" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2_ThrGGpiT9" role="2OqNvi">
+                <ref role="2Oxat5" node="3vAJxtEPz1X" resolve="detachments" />
+              </node>
+            </node>
+            <node concept="X8dFx" id="2_ThrGGprNL" role="2OqNvi">
+              <node concept="37vLTw" id="2_ThrGGpvzB" role="25WWJ7">
+                <ref role="3cqZAo" node="2_ThrGGp1uj" resolve="nodes" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2_ThrGGmWYO" role="jymVt" />
+    <node concept="3clFb_" id="2_ThrGGsSj1" role="jymVt">
+      <property role="TrG5h" value="clearDetachments" />
+      <node concept="3cqZAl" id="2_ThrGGsSj3" role="3clF45" />
+      <node concept="3Tm1VV" id="2_ThrGGsSj4" role="1B3o_S" />
+      <node concept="3clFbS" id="2_ThrGGsSj5" role="3clF47">
+        <node concept="3clFbF" id="2_ThrGGtbGw" role="3cqZAp">
+          <node concept="2OqwBi" id="2_ThrGGtlxw" role="3clFbG">
+            <node concept="2OqwBi" id="2_ThrGGte16" role="2Oq$k0">
+              <node concept="Xjq3P" id="2_ThrGGtbGv" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2_ThrGGtg$e" role="2OqNvi">
+                <ref role="2Oxat5" node="3vAJxtEPz1X" resolve="detachments" />
+              </node>
+            </node>
+            <node concept="2EZike" id="2_ThrGGtqkF" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2_ThrGGt7gY" role="jymVt" />
     <node concept="3clFb_" id="3iSvY0PFUHM" role="jymVt">
       <property role="TrG5h" value="instanceFor" />
       <node concept="37vLTG" id="3iSvY0PFVZU" role="3clF46">

From 869482a5c14e4a06ae5ac58fb251b731313677b4 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Fri, 30 Jan 2026 11:27:01 +0100
Subject: [PATCH 10/22] Enable inheritance of instances (#1474)

---
 ...s3.variability.artifacts.base.behavior.mps | 592 ++++++++++++------
 1 file changed, 404 insertions(+), 188 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index 0ba695dbc4..856bae731a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -4731,6 +4731,14 @@
                     <ref role="2r$qp6" node="2VCmq77SrOB" resolve="dependentOn" />
                     <node concept="10Nm6u" id="5QTJbF9Nc8r" role="2r_lH1" />
                   </node>
+                  <node concept="2r$n1x" id="3RmCGNRGW1H" role="2r_Bvh">
+                    <ref role="2r$qp6" node="3RmCGNRoyUj" resolve="nonStructuralChildren" />
+                    <node concept="2YIFZM" id="3RmCGNRGX3w" role="2r_lH1">
+                      <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
+                      <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+                      <node concept="3Tqbb2" id="3RmCGNRGXPG" role="3PaCim" />
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -18512,83 +18520,90 @@
       </node>
     </node>
     <node concept="2tJIrI" id="79xAwvWtOjm" role="jymVt" />
-    <node concept="3clFb_" id="79xAwvWtUWg" role="jymVt">
+    <node concept="3clFb_" id="3RmCGNRVu1S" role="jymVt">
       <property role="TrG5h" value="relevantChildren" />
-      <node concept="3clFbS" id="79xAwvWtUWj" role="3clF47">
-        <node concept="3SKdUt" id="79xAwvWviqI" role="3cqZAp">
-          <node concept="1PaTwC" id="79xAwvWviqJ" role="1aUNEU">
-            <node concept="3oM_SD" id="79xAwvWviqK" role="1PaTwD">
+      <node concept="3clFbS" id="3RmCGNRVu1T" role="3clF47">
+        <node concept="3SKdUt" id="3RmCGNRVu1U" role="3cqZAp">
+          <node concept="1PaTwC" id="3RmCGNRVu1V" role="1aUNEU">
+            <node concept="3oM_SD" id="3RmCGNRVu1W" role="1PaTwD">
               <property role="3oM_SC" value="start" />
             </node>
-            <node concept="3oM_SD" id="79xAwvWvjfw" role="1PaTwD">
+            <node concept="3oM_SD" id="3RmCGNRVu1X" role="1PaTwD">
               <property role="3oM_SC" value="with" />
             </node>
-            <node concept="3oM_SD" id="79xAwvWvjfN" role="1PaTwD">
+            <node concept="3oM_SD" id="3RmCGNRVu1Y" role="1PaTwD">
               <property role="3oM_SC" value="actual" />
             </node>
-            <node concept="3oM_SD" id="79xAwvWvjg5" role="1PaTwD">
+            <node concept="3oM_SD" id="3RmCGNRVu1Z" role="1PaTwD">
               <property role="3oM_SC" value="AST" />
             </node>
-            <node concept="3oM_SD" id="79xAwvWvjg6" role="1PaTwD">
+            <node concept="3oM_SD" id="3RmCGNRVu20" role="1PaTwD">
               <property role="3oM_SC" value="children" />
             </node>
-            <node concept="3oM_SD" id="79xAwvWyXjB" role="1PaTwD">
+            <node concept="3oM_SD" id="3RmCGNRVu21" role="1PaTwD">
               <property role="3oM_SC" value="(but" />
             </node>
-            <node concept="3oM_SD" id="79xAwvWyYZo" role="1PaTwD">
+            <node concept="3oM_SD" id="3RmCGNRVu22" role="1PaTwD">
               <property role="3oM_SC" value="exclude" />
             </node>
-            <node concept="3oM_SD" id="79xAwvWyYZT" role="1PaTwD">
+            <node concept="3oM_SD" id="3RmCGNRVu23" role="1PaTwD">
               <property role="3oM_SC" value="the" />
             </node>
-            <node concept="3oM_SD" id="79xAwvWyZ0a" role="1PaTwD">
+            <node concept="3oM_SD" id="3RmCGNRVu24" role="1PaTwD">
               <property role="3oM_SC" value="toBeSkipped-nodes," />
             </node>
-            <node concept="3oM_SD" id="79xAwvWyZ0b" role="1PaTwD">
+            <node concept="3oM_SD" id="3RmCGNRVu25" role="1PaTwD">
               <property role="3oM_SC" value="if" />
             </node>
-            <node concept="3oM_SD" id="79xAwvWyZ0s" role="1PaTwD">
+            <node concept="3oM_SD" id="3RmCGNRVu26" role="1PaTwD">
               <property role="3oM_SC" value="any)" />
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="4W$cmJeGuTh" role="3cqZAp">
-          <node concept="3cpWsn" id="4W$cmJeGuTi" role="3cpWs9">
+        <node concept="3cpWs8" id="3RmCGNRVu27" role="3cqZAp">
+          <node concept="3cpWsn" id="3RmCGNRVu28" role="3cpWs9">
             <property role="TrG5h" value="children" />
-            <node concept="_YKpA" id="4W$cmJeGu$M" role="1tU5fm">
-              <node concept="3Tqbb2" id="4W$cmJeGu$P" role="_ZDj9" />
+            <node concept="_YKpA" id="3RmCGNRVu29" role="1tU5fm">
+              <node concept="3Tqbb2" id="3RmCGNRVu2a" role="_ZDj9" />
             </node>
-            <node concept="2YIFZM" id="4W$cmJfbNTL" role="33vP2m">
+            <node concept="2YIFZM" id="3RmCGNRVu2b" role="33vP2m">
               <ref role="37wK5l" to="3o3z:~Lists.newLinkedList(java.lang.Iterable)" resolve="newLinkedList" />
               <ref role="1Pybhc" to="3o3z:~Lists" resolve="Lists" />
-              <node concept="2OqwBi" id="79xAwvW$ACT" role="37wK5m">
-                <node concept="2OqwBi" id="79xAwvW$ySE" role="2Oq$k0">
-                  <node concept="37vLTw" id="79xAwvWyPAh" role="2Oq$k0">
-                    <ref role="3cqZAo" node="79xAwvWtZPa" resolve="n" />
-                  </node>
-                  <node concept="32TBzR" id="79xAwvW$$au" role="2OqNvi" />
-                </node>
-                <node concept="3zZkjj" id="79xAwvW$Drl" role="2OqNvi">
-                  <node concept="1bVj0M" id="79xAwvW$Drn" role="23t8la">
-                    <node concept="3clFbS" id="79xAwvW$Dro" role="1bW5cS">
-                      <node concept="3clFbF" id="79xAwvW$E$A" role="3cqZAp">
-                        <node concept="3fqX7Q" id="79xAwvW$KaV" role="3clFbG">
-                          <node concept="2OqwBi" id="79xAwvW$KaX" role="3fr31v">
-                            <node concept="37vLTw" id="79xAwvW$KaY" role="2Oq$k0">
-                              <ref role="3cqZAo" node="79xAwvWu0yd" resolve="toBeSkipped" />
+              <node concept="2OqwBi" id="3RmCGNRVu2c" role="37wK5m">
+                <node concept="2OqwBi" id="3RmCGNRWuuZ" role="2Oq$k0">
+                  <node concept="2OqwBi" id="3RmCGNRVu2d" role="2Oq$k0">
+                    <node concept="37vLTw" id="3RmCGNRVu2e" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3RmCGNRVu3J" resolve="n" />
+                    </node>
+                    <node concept="32TBzR" id="3RmCGNRVu2f" role="2OqNvi" />
+                  </node>
+                  <node concept="4Tj9Z" id="3RmCGNRWyt6" role="2OqNvi">
+                    <node concept="37vLTw" id="3RmCGNRWzNG" role="576Qk">
+                      <ref role="3cqZAo" node="3RmCGNRVw9O" resolve="nonStructuralChildren" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3zZkjj" id="3RmCGNRVu2g" role="2OqNvi">
+                  <node concept="1bVj0M" id="3RmCGNRVu2h" role="23t8la">
+                    <node concept="3clFbS" id="3RmCGNRVu2i" role="1bW5cS">
+                      <node concept="3clFbF" id="3RmCGNRVu2j" role="3cqZAp">
+                        <node concept="3fqX7Q" id="3RmCGNRVu2k" role="3clFbG">
+                          <node concept="2OqwBi" id="3RmCGNRVu2l" role="3fr31v">
+                            <node concept="37vLTw" id="3RmCGNRVu2m" role="2Oq$k0">
+                              <ref role="3cqZAo" node="3RmCGNRVu3L" resolve="toBeSkipped" />
                             </node>
-                            <node concept="3JPx81" id="79xAwvW$KaZ" role="2OqNvi">
-                              <node concept="37vLTw" id="79xAwvW$Kb0" role="25WWJ7">
-                                <ref role="3cqZAo" node="79xAwvW$Drp" resolve="it" />
+                            <node concept="3JPx81" id="3RmCGNRVu2n" role="2OqNvi">
+                              <node concept="37vLTw" id="3RmCGNRVu2o" role="25WWJ7">
+                                <ref role="3cqZAo" node="3RmCGNRVu2p" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="gl6BB" id="79xAwvW$Drp" role="1bW2Oz">
+                    <node concept="gl6BB" id="3RmCGNRVu2p" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="79xAwvW$Drq" role="1tU5fm" />
+                      <node concept="2jxLKc" id="3RmCGNRVu2q" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -18596,88 +18611,88 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="79xAwvWyEyo" role="3cqZAp" />
-        <node concept="3SKdUt" id="79xAwvWvg1D" role="3cqZAp">
-          <node concept="1PaTwC" id="79xAwvWvg1E" role="1aUNEU">
-            <node concept="3oM_SD" id="79xAwvWvg1F" role="1PaTwD">
+        <node concept="3clFbH" id="3RmCGNRVu2r" role="3cqZAp" />
+        <node concept="3SKdUt" id="3RmCGNRVu2s" role="3cqZAp">
+          <node concept="1PaTwC" id="3RmCGNRVu2t" role="1aUNEU">
+            <node concept="3oM_SD" id="3RmCGNRVu2u" role="1PaTwD">
               <property role="3oM_SC" value="add" />
             </node>
-            <node concept="3oM_SD" id="79xAwvWvgR0" role="1PaTwD">
+            <node concept="3oM_SD" id="3RmCGNRVu2v" role="1PaTwD">
               <property role="3oM_SC" value="logical" />
             </node>
-            <node concept="3oM_SD" id="79xAwvWvgR2" role="1PaTwD">
+            <node concept="3oM_SD" id="3RmCGNRVu2w" role="1PaTwD">
               <property role="3oM_SC" value="children," />
             </node>
-            <node concept="3oM_SD" id="79xAwvWvgRQ" role="1PaTwD">
+            <node concept="3oM_SD" id="3RmCGNRVu2x" role="1PaTwD">
               <property role="3oM_SC" value="if" />
             </node>
-            <node concept="3oM_SD" id="79xAwvWvgRR" role="1PaTwD">
+            <node concept="3oM_SD" id="3RmCGNRVu2y" role="1PaTwD">
               <property role="3oM_SC" value="any" />
             </node>
           </node>
         </node>
-        <node concept="Jncv_" id="4W$cmJeHrLf" role="3cqZAp">
+        <node concept="Jncv_" id="3RmCGNRVu2z" role="3cqZAp">
           <ref role="JncvD" to="xxir:jksL7exwyH" resolve="ILogicalChildOwner" />
-          <node concept="37vLTw" id="4W$cmJeHtL2" role="JncvB">
-            <ref role="3cqZAo" node="79xAwvWtZPa" resolve="n" />
+          <node concept="37vLTw" id="3RmCGNRVu2$" role="JncvB">
+            <ref role="3cqZAo" node="3RmCGNRVu3J" resolve="n" />
           </node>
-          <node concept="3clFbS" id="4W$cmJeHrLj" role="Jncv$">
-            <node concept="3cpWs8" id="66kTDq17A05" role="3cqZAp">
-              <node concept="3cpWsn" id="66kTDq17A06" role="3cpWs9">
+          <node concept="3clFbS" id="3RmCGNRVu2_" role="Jncv$">
+            <node concept="3cpWs8" id="3RmCGNRVu2A" role="3cqZAp">
+              <node concept="3cpWsn" id="3RmCGNRVu2B" role="3cpWs9">
                 <property role="TrG5h" value="logicalChildren" />
-                <node concept="A3Dl8" id="3m$RlrvpFec" role="1tU5fm">
-                  <node concept="3Tqbb2" id="3m$RlrvpFee" role="A3Ik2" />
+                <node concept="A3Dl8" id="3RmCGNRVu2C" role="1tU5fm">
+                  <node concept="3Tqbb2" id="3RmCGNRVu2D" role="A3Ik2" />
                 </node>
-                <node concept="2OqwBi" id="7LqGxA96I1o" role="33vP2m">
-                  <node concept="2OqwBi" id="7LqGxA8TCNl" role="2Oq$k0">
-                    <node concept="Jnkvi" id="7LqGxA8TBss" role="2Oq$k0">
-                      <ref role="1M0zk5" node="4W$cmJeHrLl" resolve="owner" />
+                <node concept="2OqwBi" id="3RmCGNRVu2E" role="33vP2m">
+                  <node concept="2OqwBi" id="3RmCGNRVu2F" role="2Oq$k0">
+                    <node concept="Jnkvi" id="3RmCGNRVu2G" role="2Oq$k0">
+                      <ref role="1M0zk5" node="3RmCGNRVu2O" resolve="owner" />
                     </node>
-                    <node concept="2qgKlT" id="7LqGxA8TEeO" role="2OqNvi">
+                    <node concept="2qgKlT" id="3RmCGNRVu2H" role="2OqNvi">
                       <ref role="37wK5l" to="n7tw:7c93VeVMIYV" resolve="findLogicalChildren" />
                     </node>
                   </node>
-                  <node concept="ANE8D" id="7LqGxA96L5J" role="2OqNvi" />
+                  <node concept="ANE8D" id="3RmCGNRVu2I" role="2OqNvi" />
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="UVhwLgO6p1" role="3cqZAp">
-              <node concept="2OqwBi" id="UVhwLgO7rw" role="3clFbG">
-                <node concept="37vLTw" id="UVhwLgO6oZ" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4W$cmJeGuTi" resolve="children" />
+            <node concept="3clFbF" id="3RmCGNRVu2J" role="3cqZAp">
+              <node concept="2OqwBi" id="3RmCGNRVu2K" role="3clFbG">
+                <node concept="37vLTw" id="3RmCGNRVu2L" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3RmCGNRVu28" resolve="children" />
                 </node>
-                <node concept="X8dFx" id="UVhwLgOchR" role="2OqNvi">
-                  <node concept="37vLTw" id="UVhwLgOdDh" role="25WWJ7">
-                    <ref role="3cqZAo" node="66kTDq17A06" resolve="logicalChildren" />
+                <node concept="X8dFx" id="3RmCGNRVu2M" role="2OqNvi">
+                  <node concept="37vLTw" id="3RmCGNRVu2N" role="25WWJ7">
+                    <ref role="3cqZAo" node="3RmCGNRVu2B" resolve="logicalChildren" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="JncvC" id="4W$cmJeHrLl" role="JncvA">
+          <node concept="JncvC" id="3RmCGNRVu2O" role="JncvA">
             <property role="TrG5h" value="owner" />
-            <node concept="2jxLKc" id="4W$cmJeHrLm" role="1tU5fm" />
+            <node concept="2jxLKc" id="3RmCGNRVu2P" role="1tU5fm" />
           </node>
         </node>
-        <node concept="3clFbH" id="4W$cmJeHwbd" role="3cqZAp" />
-        <node concept="3clFbF" id="66kTDq0ZTG5" role="3cqZAp">
-          <node concept="2OqwBi" id="7gR_b7EtSa3" role="3clFbG">
-            <node concept="1eOMI4" id="4W$cmJeHp$d" role="2Oq$k0">
-              <node concept="2OqwBi" id="79xAwvWX7Tn" role="1eOMHV">
+        <node concept="3clFbH" id="3RmCGNRVu2Q" role="3cqZAp" />
+        <node concept="3clFbF" id="3RmCGNRVu2R" role="3cqZAp">
+          <node concept="2OqwBi" id="3RmCGNRVu2S" role="3clFbG">
+            <node concept="1eOMI4" id="3RmCGNRVu2T" role="2Oq$k0">
+              <node concept="2OqwBi" id="3RmCGNRVu2U" role="1eOMHV">
                 <property role="hSjvv" value="true" />
-                <node concept="2OqwBi" id="4W$cmJeHpzE" role="2Oq$k0">
+                <node concept="2OqwBi" id="3RmCGNRVu2V" role="2Oq$k0">
                   <property role="hSjvv" value="true" />
-                  <node concept="3zZkjj" id="4W$cmJeHpzF" role="2OqNvi">
-                    <node concept="1bVj0M" id="4W$cmJeHpzG" role="23t8la">
-                      <node concept="3clFbS" id="4W$cmJeHpzH" role="1bW5cS">
-                        <node concept="3clFbF" id="4W$cmJeHpzI" role="3cqZAp">
-                          <node concept="3fqX7Q" id="4W$cmJeHpzJ" role="3clFbG">
-                            <node concept="2OqwBi" id="4W$cmJeHpzK" role="3fr31v">
-                              <node concept="37vLTw" id="4W$cmJeHpzL" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4YqPvJUBO1j" resolve="it" />
+                  <node concept="3zZkjj" id="3RmCGNRVu2W" role="2OqNvi">
+                    <node concept="1bVj0M" id="3RmCGNRVu2X" role="23t8la">
+                      <node concept="3clFbS" id="3RmCGNRVu2Y" role="1bW5cS">
+                        <node concept="3clFbF" id="3RmCGNRVu2Z" role="3cqZAp">
+                          <node concept="3fqX7Q" id="3RmCGNRVu30" role="3clFbG">
+                            <node concept="2OqwBi" id="3RmCGNRVu31" role="3fr31v">
+                              <node concept="37vLTw" id="3RmCGNRVu32" role="2Oq$k0">
+                                <ref role="3cqZAo" node="3RmCGNRVu35" resolve="it" />
                               </node>
-                              <node concept="1mIQ4w" id="4W$cmJeHpzM" role="2OqNvi">
-                                <node concept="chp4Y" id="4W$cmJeHpzN" role="cj9EA">
+                              <node concept="1mIQ4w" id="3RmCGNRVu33" role="2OqNvi">
+                                <node concept="chp4Y" id="3RmCGNRVu34" role="cj9EA">
                                   <ref role="cht4Q" to="i9mv:75FdNyOGCTb" resolve="IVariabilityAwareArtifact" />
                                 </node>
                               </node>
@@ -18685,53 +18700,53 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="gl6BB" id="4YqPvJUBO1j" role="1bW2Oz">
+                      <node concept="gl6BB" id="3RmCGNRVu35" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4YqPvJUBO1k" role="1tU5fm" />
+                        <node concept="2jxLKc" id="3RmCGNRVu36" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
-                  <node concept="2OqwBi" id="4W$cmJeHpzQ" role="2Oq$k0">
+                  <node concept="2OqwBi" id="3RmCGNRVu37" role="2Oq$k0">
                     <property role="hSjvv" value="true" />
-                    <node concept="2OqwBi" id="4W$cmJeHpzR" role="2Oq$k0">
-                      <node concept="37vLTw" id="4W$cmJeHpzS" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4W$cmJeGuTi" resolve="children" />
-                      </node>
-                      <node concept="3zZkjj" id="4W$cmJeHpzT" role="2OqNvi">
-                        <node concept="1bVj0M" id="4W$cmJeHpzU" role="23t8la">
-                          <node concept="3clFbS" id="4W$cmJeHpzV" role="1bW5cS">
-                            <node concept="3clFbF" id="4W$cmJeHpzW" role="3cqZAp">
-                              <node concept="3fqX7Q" id="4W$cmJeHpzX" role="3clFbG">
-                                <node concept="2OqwBi" id="1NELwtv7TZ6" role="3fr31v">
-                                  <node concept="Xjq3P" id="1NELwtv7SZc" role="2Oq$k0" />
-                                  <node concept="liA8E" id="1NELwtv7V2F" role="2OqNvi">
+                    <node concept="2OqwBi" id="3RmCGNRVu38" role="2Oq$k0">
+                      <node concept="37vLTw" id="3RmCGNRVu39" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3RmCGNRVu28" resolve="children" />
+                      </node>
+                      <node concept="3zZkjj" id="3RmCGNRVu3a" role="2OqNvi">
+                        <node concept="1bVj0M" id="3RmCGNRVu3b" role="23t8la">
+                          <node concept="3clFbS" id="3RmCGNRVu3c" role="1bW5cS">
+                            <node concept="3clFbF" id="3RmCGNRVu3d" role="3cqZAp">
+                              <node concept="3fqX7Q" id="3RmCGNRVu3e" role="3clFbG">
+                                <node concept="2OqwBi" id="3RmCGNRVu3f" role="3fr31v">
+                                  <node concept="Xjq3P" id="3RmCGNRVu3g" role="2Oq$k0" />
+                                  <node concept="liA8E" id="3RmCGNRVu3h" role="2OqNvi">
                                     <ref role="37wK5l" node="1NELwtv6nWS" resolve="isCommentedOut" />
-                                    <node concept="37vLTw" id="1NELwtv7Vou" role="37wK5m">
-                                      <ref role="3cqZAo" node="4YqPvJUBO1l" resolve="it" />
+                                    <node concept="37vLTw" id="3RmCGNRVu3i" role="37wK5m">
+                                      <ref role="3cqZAo" node="3RmCGNRVu3j" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="gl6BB" id="4YqPvJUBO1l" role="1bW2Oz">
+                          <node concept="gl6BB" id="3RmCGNRVu3j" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4YqPvJUBO1m" role="1tU5fm" />
+                            <node concept="2jxLKc" id="3RmCGNRVu3k" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3zZkjj" id="4W$cmJeHp$2" role="2OqNvi">
-                      <node concept="1bVj0M" id="4W$cmJeHp$3" role="23t8la">
-                        <node concept="3clFbS" id="4W$cmJeHp$4" role="1bW5cS">
-                          <node concept="3clFbF" id="4W$cmJeHp$5" role="3cqZAp">
-                            <node concept="3fqX7Q" id="4W$cmJeHp$6" role="3clFbG">
-                              <node concept="2OqwBi" id="4W$cmJeHp$7" role="3fr31v">
-                                <node concept="37vLTw" id="4W$cmJeHp$8" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4YqPvJUBO1n" resolve="it" />
+                    <node concept="3zZkjj" id="3RmCGNRVu3l" role="2OqNvi">
+                      <node concept="1bVj0M" id="3RmCGNRVu3m" role="23t8la">
+                        <node concept="3clFbS" id="3RmCGNRVu3n" role="1bW5cS">
+                          <node concept="3clFbF" id="3RmCGNRVu3o" role="3cqZAp">
+                            <node concept="3fqX7Q" id="3RmCGNRVu3p" role="3clFbG">
+                              <node concept="2OqwBi" id="3RmCGNRVu3q" role="3fr31v">
+                                <node concept="37vLTw" id="3RmCGNRVu3r" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="3RmCGNRVu3u" resolve="it" />
                                 </node>
-                                <node concept="1mIQ4w" id="4W$cmJeHp$9" role="2OqNvi">
-                                  <node concept="chp4Y" id="4W$cmJeHp$a" role="cj9EA">
+                                <node concept="1mIQ4w" id="3RmCGNRVu3s" role="2OqNvi">
+                                  <node concept="chp4Y" id="3RmCGNRVu3t" role="cj9EA">
                                     <ref role="cht4Q" to="tp5g:hSdkHD7" resolve="AbstractTestNodeAnnotation" />
                                   </node>
                                 </node>
@@ -18739,25 +18754,25 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="gl6BB" id="4YqPvJUBO1n" role="1bW2Oz">
+                        <node concept="gl6BB" id="3RmCGNRVu3u" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4YqPvJUBO1o" role="1tU5fm" />
+                          <node concept="2jxLKc" id="3RmCGNRVu3v" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3zZkjj" id="79xAwvWXakI" role="2OqNvi">
-                  <node concept="1bVj0M" id="79xAwvWXakK" role="23t8la">
-                    <node concept="3clFbS" id="79xAwvWXakL" role="1bW5cS">
-                      <node concept="3clFbF" id="79xAwvWXbtD" role="3cqZAp">
-                        <node concept="3fqX7Q" id="79xAwvWXbtB" role="3clFbG">
-                          <node concept="2OqwBi" id="79xAwvWXcrO" role="3fr31v">
-                            <node concept="37vLTw" id="79xAwvWXbuM" role="2Oq$k0">
-                              <ref role="3cqZAo" node="79xAwvWXakM" resolve="it" />
+                <node concept="3zZkjj" id="3RmCGNRVu3w" role="2OqNvi">
+                  <node concept="1bVj0M" id="3RmCGNRVu3x" role="23t8la">
+                    <node concept="3clFbS" id="3RmCGNRVu3y" role="1bW5cS">
+                      <node concept="3clFbF" id="3RmCGNRVu3z" role="3cqZAp">
+                        <node concept="3fqX7Q" id="3RmCGNRVu3$" role="3clFbG">
+                          <node concept="2OqwBi" id="3RmCGNRVu3_" role="3fr31v">
+                            <node concept="37vLTw" id="3RmCGNRVu3A" role="2Oq$k0">
+                              <ref role="3cqZAo" node="3RmCGNRVu3D" resolve="it" />
                             </node>
-                            <node concept="1mIQ4w" id="79xAwvWXfVR" role="2OqNvi">
-                              <node concept="chp4Y" id="79xAwvWXh1d" role="cj9EA">
+                            <node concept="1mIQ4w" id="3RmCGNRVu3B" role="2OqNvi">
+                              <node concept="chp4Y" id="3RmCGNRVu3C" role="cj9EA">
                                 <ref role="cht4Q" to="i9mv:2B0XdnC4BNx" resolve="IArtifactInstance" />
                               </node>
                             </node>
@@ -18765,65 +18780,118 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="gl6BB" id="79xAwvWXakM" role="1bW2Oz">
+                    <node concept="gl6BB" id="3RmCGNRVu3D" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="79xAwvWXakN" role="1tU5fm" />
+                      <node concept="2jxLKc" id="3RmCGNRVu3E" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="ANE8D" id="7gR_b7EtSaB" role="2OqNvi" />
+            <node concept="ANE8D" id="3RmCGNRVu3F" role="2OqNvi" />
           </node>
         </node>
       </node>
-      <node concept="3Tm1VV" id="79xAwvWtQd0" role="1B3o_S" />
-      <node concept="_YKpA" id="79xAwvWtUTk" role="3clF45">
-        <node concept="3Tqbb2" id="79xAwvWtUWe" role="_ZDj9" />
+      <node concept="3Tm1VV" id="3RmCGNRVu3G" role="1B3o_S" />
+      <node concept="_YKpA" id="3RmCGNRVu3H" role="3clF45">
+        <node concept="3Tqbb2" id="3RmCGNRVu3I" role="_ZDj9" />
       </node>
-      <node concept="37vLTG" id="79xAwvWtZPa" role="3clF46">
+      <node concept="37vLTG" id="3RmCGNRVu3J" role="3clF46">
         <property role="TrG5h" value="n" />
-        <node concept="3Tqbb2" id="79xAwvWtZP9" role="1tU5fm" />
+        <node concept="3Tqbb2" id="3RmCGNRVu3K" role="1tU5fm" />
       </node>
-      <node concept="37vLTG" id="79xAwvWu0yd" role="3clF46">
+      <node concept="37vLTG" id="3RmCGNRVu3L" role="3clF46">
         <property role="TrG5h" value="toBeSkipped" />
-        <node concept="A3Dl8" id="79xAwvW$2BQ" role="1tU5fm">
-          <node concept="3Tqbb2" id="79xAwvW$5HF" role="A3Ik2" />
+        <node concept="A3Dl8" id="3RmCGNRVu3M" role="1tU5fm">
+          <node concept="3Tqbb2" id="3RmCGNRVu3N" role="A3Ik2" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3RmCGNRVw9O" role="3clF46">
+        <property role="TrG5h" value="nonStructuralChildren" />
+        <node concept="_YKpA" id="3RmCGNRVxvU" role="1tU5fm">
+          <node concept="3qUE_q" id="3RmCGNRVzrS" role="_ZDj9">
+            <node concept="3Tqbb2" id="3RmCGNRV$T$" role="3qUE_r" />
+          </node>
         </node>
       </node>
-      <node concept="P$JXv" id="79xAwvWugxU" role="lGtFl">
-        <node concept="TZ5HA" id="79xAwvWuhRK" role="TZ5H$">
-          <node concept="1dT_AC" id="79xAwvWuhRL" role="1dT_Ay">
+      <node concept="P$JXv" id="3RmCGNRVu3O" role="lGtFl">
+        <node concept="TZ5HA" id="3RmCGNRVu3P" role="TZ5H$">
+          <node concept="1dT_AC" id="3RmCGNRVu3Q" role="1dT_Ay">
             <property role="1dT_AB" value="Return all relevant children of a given AST node. This includes:" />
           </node>
         </node>
-        <node concept="TZ5HA" id="79xAwvWuhRM" role="TZ5H$">
-          <node concept="1dT_AC" id="79xAwvWuhRN" role="1dT_Ay">
+        <node concept="TZ5HA" id="3RmCGNRVu3R" role="TZ5H$">
+          <node concept="1dT_AC" id="3RmCGNRVu3S" role="1dT_Ay">
             <property role="1dT_AB" value="- the actual children of the node based on the containment hierarchy" />
           </node>
         </node>
-        <node concept="TZ5HA" id="79xAwvWuhRO" role="TZ5H$">
-          <node concept="1dT_AC" id="79xAwvWuhRP" role="1dT_Ay">
+        <node concept="TZ5HA" id="3RmCGNRVu3T" role="TZ5H$">
+          <node concept="1dT_AC" id="3RmCGNRVu3U" role="1dT_Ay">
             <property role="1dT_AB" value="- the logical children of the node (if it is a ILogicalChildOwner)" />
           </node>
         </node>
-        <node concept="TUZQ0" id="79xAwvWugxX" role="3nqlJM">
+        <node concept="TUZQ0" id="3RmCGNRVu3V" role="3nqlJM">
           <property role="TUZQ4" value="the input node" />
-          <node concept="zr_55" id="79xAwvWugxZ" role="zr_5Q">
-            <ref role="zr_51" node="79xAwvWtZPa" resolve="n" />
+          <node concept="zr_55" id="3RmCGNRVu3W" role="zr_5Q">
+            <ref role="zr_51" node="3RmCGNRVu3J" resolve="n" />
           </node>
         </node>
-        <node concept="TUZQ0" id="79xAwvWugy0" role="3nqlJM">
+        <node concept="TUZQ0" id="3RmCGNRVu3X" role="3nqlJM">
           <property role="TUZQ4" value="a set of nodes which will be skipped if found among the children" />
-          <node concept="zr_55" id="79xAwvWugy2" role="zr_5Q">
-            <ref role="zr_51" node="79xAwvWu0yd" resolve="toBeSkipped" />
+          <node concept="zr_55" id="3RmCGNRVu3Y" role="zr_5Q">
+            <ref role="zr_51" node="3RmCGNRVu3L" resolve="toBeSkipped" />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="3RmCGNRVKHu" role="3nqlJM">
+          <property role="TUZQ4" value="nodes related to 'n', but not structurally contained (content from inheritance, for example)" />
+          <node concept="zr_55" id="3RmCGNRVMfS" role="zr_5Q">
+            <ref role="zr_51" node="3RmCGNRVw9O" resolve="nonStructuralChildren" />
           </node>
         </node>
-        <node concept="x79VA" id="79xAwvWugy3" role="3nqlJM">
+        <node concept="x79VA" id="3RmCGNRVu3Z" role="3nqlJM">
           <property role="x79VB" value="all direct and logical children, excluding the skip-node (if any)" />
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="3RmCGNRVsO$" role="jymVt" />
+    <node concept="3clFb_" id="79xAwvWtUWg" role="jymVt">
+      <property role="TrG5h" value="relevantChildren" />
+      <node concept="3clFbS" id="79xAwvWtUWj" role="3clF47">
+        <node concept="3clFbF" id="3RmCGNRWD_C" role="3cqZAp">
+          <node concept="2OqwBi" id="3RmCGNRWEGE" role="3clFbG">
+            <node concept="Xjq3P" id="3RmCGNRWD_B" role="2Oq$k0" />
+            <node concept="liA8E" id="3RmCGNRWG3e" role="2OqNvi">
+              <ref role="37wK5l" node="3RmCGNRVu1S" resolve="relevantChildren" />
+              <node concept="37vLTw" id="3RmCGNRWH4x" role="37wK5m">
+                <ref role="3cqZAo" node="79xAwvWtZPa" resolve="n" />
+              </node>
+              <node concept="37vLTw" id="3RmCGNRWKYq" role="37wK5m">
+                <ref role="3cqZAo" node="79xAwvWu0yd" resolve="toBeSkipped" />
+              </node>
+              <node concept="2YIFZM" id="3RmCGNRWPm5" role="37wK5m">
+                <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
+                <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+                <node concept="3Tqbb2" id="3RmCGNRWRrP" role="3PaCim" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="79xAwvWtQd0" role="1B3o_S" />
+      <node concept="_YKpA" id="79xAwvWtUTk" role="3clF45">
+        <node concept="3Tqbb2" id="79xAwvWtUWe" role="_ZDj9" />
+      </node>
+      <node concept="37vLTG" id="79xAwvWtZPa" role="3clF46">
+        <property role="TrG5h" value="n" />
+        <node concept="3Tqbb2" id="79xAwvWtZP9" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="79xAwvWu0yd" role="3clF46">
+        <property role="TrG5h" value="toBeSkipped" />
+        <node concept="A3Dl8" id="79xAwvW$2BQ" role="1tU5fm">
+          <node concept="3Tqbb2" id="79xAwvW$5HF" role="A3Ik2" />
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="1ZWkc2tHvd1" role="jymVt" />
     <node concept="3clFb_" id="1NELwtv6nWS" role="jymVt">
       <property role="TrG5h" value="isCommentedOut" />
@@ -22542,7 +22610,12 @@
   <node concept="312cEu" id="6MkAeDP7UDV">
     <property role="3GE5qa" value="skeleton.builder" />
     <property role="TrG5h" value="SkeletonEnvironment" />
-    <node concept="2tJIrI" id="6MkAeDP84vp" role="jymVt" />
+    <node concept="312cEg" id="1impejFLZxN" role="jymVt">
+      <property role="TrG5h" value="structChildrenFull" />
+      <node concept="3Tm1VV" id="1impejFLVgs" role="1B3o_S" />
+      <node concept="10P_77" id="1impejFM3Dx" role="1tU5fm" />
+      <node concept="3clFbT" id="1impejFM3V7" role="33vP2m" />
+    </node>
     <node concept="312cEg" id="6MkAeDP7UI3" role="jymVt">
       <property role="TrG5h" value="skn" />
       <property role="3TUv4t" value="true" />
@@ -22557,6 +22630,30 @@
       <node concept="3Tm6S6" id="6MkAeDP7UJ$" role="1B3o_S" />
       <node concept="3Tqbb2" id="6MkAeDP7UKt" role="1tU5fm" />
     </node>
+    <node concept="312cEg" id="3RmCGNRKH95" role="jymVt">
+      <property role="TrG5h" value="nonStructaralChildren" />
+      <node concept="3Tm6S6" id="3RmCGNRKEB6" role="1B3o_S" />
+      <node concept="_YKpA" id="3RmCGNRKHvb" role="1tU5fm">
+        <node concept="3Tqbb2" id="3lqSg2r8DfU" role="_ZDj9" />
+      </node>
+      <node concept="z59LJ" id="3RmCGNRKHGl" role="lGtFl">
+        <node concept="TZ5HA" id="3RmCGNRKHGm" role="TZ5H$">
+          <node concept="1dT_AC" id="3RmCGNRKHGn" role="1dT_Ay">
+            <property role="1dT_AB" value="children of node, which are not found as children of 'node'." />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="3RmCGNRKHI7" role="TZ5H$">
+          <node concept="1dT_AC" id="3RmCGNRKHI8" role="1dT_Ay">
+            <property role="1dT_AB" value="Example: 'extends'-relation might add children from a superclass" />
+          </node>
+        </node>
+      </node>
+      <node concept="2ShNRf" id="3lqSg2qWv0L" role="33vP2m">
+        <node concept="2Jqq0_" id="3lqSg2qWNUP" role="2ShVmc">
+          <node concept="3Tqbb2" id="3lqSg2qWRsy" role="HW$YZ" />
+        </node>
+      </node>
+    </node>
     <node concept="312cEg" id="6MkAeDPiJss" role="jymVt">
       <property role="TrG5h" value="ivaa" />
       <property role="3TUv4t" value="true" />
@@ -22574,60 +22671,149 @@
       </node>
     </node>
     <node concept="2tJIrI" id="6MkAeDP7USa" role="jymVt" />
-    <node concept="3clFbW" id="6MkAeDP7ULd" role="jymVt">
-      <node concept="3cqZAl" id="6MkAeDP7ULe" role="3clF45" />
-      <node concept="3Tm1VV" id="6MkAeDP7ULf" role="1B3o_S" />
-      <node concept="3clFbS" id="6MkAeDP7ULg" role="3clF47">
-        <node concept="3clFbF" id="6MkAeDP7ULj" role="3cqZAp">
-          <node concept="37vLTI" id="6MkAeDP7ULk" role="3clFbG">
-            <node concept="2OqwBi" id="6MkAeDP7ULl" role="37vLTJ">
-              <node concept="Xjq3P" id="6MkAeDP7ULm" role="2Oq$k0" />
-              <node concept="2OwXpG" id="6MkAeDP7ULn" role="2OqNvi">
+    <node concept="3clFbW" id="3RmCGNROulX" role="jymVt">
+      <node concept="3cqZAl" id="3RmCGNROulY" role="3clF45" />
+      <node concept="3Tm1VV" id="3RmCGNROulZ" role="1B3o_S" />
+      <node concept="3clFbS" id="3RmCGNROum0" role="3clF47">
+        <node concept="3clFbF" id="3RmCGNROum1" role="3cqZAp">
+          <node concept="37vLTI" id="3RmCGNROum2" role="3clFbG">
+            <node concept="2OqwBi" id="3RmCGNROum3" role="37vLTJ">
+              <node concept="Xjq3P" id="3RmCGNROum4" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3RmCGNROum5" role="2OqNvi">
                 <ref role="2Oxat5" node="6MkAeDP7UKC" resolve="node" />
               </node>
             </node>
-            <node concept="37vLTw" id="6MkAeDP7ULo" role="37vLTx">
-              <ref role="3cqZAo" node="6MkAeDP7ULh" resolve="node" />
+            <node concept="37vLTw" id="3RmCGNROum6" role="37vLTx">
+              <ref role="3cqZAo" node="3RmCGNROump" resolve="node" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="6MkAeDP7UOz" role="3cqZAp">
-          <node concept="37vLTI" id="6MkAeDP7UO$" role="3clFbG">
-            <node concept="2OqwBi" id="6MkAeDP7UO_" role="37vLTJ">
-              <node concept="Xjq3P" id="6MkAeDP7UOA" role="2Oq$k0" />
-              <node concept="2OwXpG" id="6MkAeDP7UOB" role="2OqNvi">
+        <node concept="3clFbF" id="3RmCGNROum7" role="3cqZAp">
+          <node concept="37vLTI" id="3RmCGNROum8" role="3clFbG">
+            <node concept="2OqwBi" id="3RmCGNROum9" role="37vLTJ">
+              <node concept="Xjq3P" id="3RmCGNROuma" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3RmCGNROumb" role="2OqNvi">
                 <ref role="2Oxat5" node="6MkAeDP7UI3" resolve="skn" />
               </node>
             </node>
-            <node concept="37vLTw" id="6MkAeDP7UOC" role="37vLTx">
-              <ref role="3cqZAo" node="6MkAeDP7UOx" resolve="skn" />
+            <node concept="37vLTw" id="3RmCGNROumc" role="37vLTx">
+              <ref role="3cqZAo" node="3RmCGNROumr" resolve="skn" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="6MkAeDPiK11" role="3cqZAp">
-          <node concept="37vLTI" id="6MkAeDPiK12" role="3clFbG">
-            <node concept="2OqwBi" id="6MkAeDPiK13" role="37vLTJ">
-              <node concept="Xjq3P" id="6MkAeDPiK14" role="2Oq$k0" />
-              <node concept="2OwXpG" id="6MkAeDPiK15" role="2OqNvi">
+        <node concept="3clFbF" id="3RmCGNROumd" role="3cqZAp">
+          <node concept="37vLTI" id="3RmCGNROume" role="3clFbG">
+            <node concept="2OqwBi" id="3RmCGNROumf" role="37vLTJ">
+              <node concept="Xjq3P" id="3RmCGNROumg" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3RmCGNROumh" role="2OqNvi">
                 <ref role="2Oxat5" node="6MkAeDPiJss" resolve="ivaa" />
               </node>
             </node>
-            <node concept="37vLTw" id="6MkAeDPiK16" role="37vLTx">
-              <ref role="3cqZAo" node="6MkAeDPiK0Z" resolve="ivaa" />
+            <node concept="37vLTw" id="3RmCGNROumi" role="37vLTx">
+              <ref role="3cqZAo" node="3RmCGNROumt" resolve="ivaa" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="6MkAeDPnRBQ" role="3cqZAp">
-          <node concept="37vLTI" id="6MkAeDPnRBR" role="3clFbG">
-            <node concept="2OqwBi" id="6MkAeDPnRBS" role="37vLTJ">
-              <node concept="Xjq3P" id="6MkAeDPnRBT" role="2Oq$k0" />
-              <node concept="2OwXpG" id="6MkAeDPnRBU" role="2OqNvi">
+        <node concept="3clFbF" id="3RmCGNROumj" role="3cqZAp">
+          <node concept="37vLTI" id="3RmCGNROumk" role="3clFbG">
+            <node concept="2OqwBi" id="3RmCGNROuml" role="37vLTJ">
+              <node concept="Xjq3P" id="3RmCGNROumm" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3RmCGNROumn" role="2OqNvi">
                 <ref role="2Oxat5" node="6MkAeDPnQZY" resolve="path" />
               </node>
             </node>
-            <node concept="37vLTw" id="6MkAeDPnRBV" role="37vLTx">
-              <ref role="3cqZAo" node="6MkAeDPnRBO" resolve="path" />
+            <node concept="37vLTw" id="3RmCGNROumo" role="37vLTx">
+              <ref role="3cqZAo" node="3RmCGNROumv" resolve="path" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3lqSg2r0XAG" role="3cqZAp">
+          <node concept="2OqwBi" id="3lqSg2r130Y" role="3clFbG">
+            <node concept="37vLTw" id="3lqSg2r0XAE" role="2Oq$k0">
+              <ref role="3cqZAo" node="3RmCGNROwPC" resolve="nonStructaralChildren" />
             </node>
+            <node concept="2es0OD" id="3lqSg2r173g" role="2OqNvi">
+              <node concept="1bVj0M" id="3lqSg2r173i" role="23t8la">
+                <node concept="3clFbS" id="3lqSg2r173j" role="1bW5cS">
+                  <node concept="3clFbF" id="3lqSg2r1aBX" role="3cqZAp">
+                    <node concept="2OqwBi" id="3lqSg2r1kCg" role="3clFbG">
+                      <node concept="2OqwBi" id="3lqSg2r1e8R" role="2Oq$k0">
+                        <node concept="Xjq3P" id="3lqSg2r1aBW" role="2Oq$k0" />
+                        <node concept="2OwXpG" id="3lqSg2r1f3X" role="2OqNvi">
+                          <ref role="2Oxat5" node="3RmCGNRKH95" resolve="nonStructaralChildren" />
+                        </node>
+                      </node>
+                      <node concept="TSZUe" id="3lqSg2r1pDo" role="2OqNvi">
+                        <node concept="37vLTw" id="1impejF$15p" role="25WWJ7">
+                          <ref role="3cqZAo" node="3lqSg2r173k" resolve="it" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="gl6BB" id="3lqSg2r173k" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="3lqSg2r173l" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="3RmCGNROump" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="3RmCGNROumq" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3RmCGNROumr" role="3clF46">
+        <property role="TrG5h" value="skn" />
+        <node concept="3uibUv" id="3RmCGNROums" role="1tU5fm">
+          <ref role="3uigEE" node="1FyQP4mJjB" resolve="SkeletonNode" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3RmCGNROumt" role="3clF46">
+        <property role="TrG5h" value="ivaa" />
+        <node concept="3Tqbb2" id="3RmCGNROumu" role="1tU5fm">
+          <ref role="ehGHo" to="i9mv:75FdNyOGCTb" resolve="IVariabilityAwareArtifact" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3RmCGNROumv" role="3clF46">
+        <property role="TrG5h" value="path" />
+        <node concept="3uibUv" id="3RmCGNROumw" role="1tU5fm">
+          <ref role="3uigEE" node="5LihCoMh$14" resolve="ArtifactPath" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3RmCGNROwPC" role="3clF46">
+        <property role="TrG5h" value="nonStructaralChildren" />
+        <node concept="_YKpA" id="3RmCGNROwTP" role="1tU5fm">
+          <node concept="3qUE_q" id="3RmCGNROwTQ" role="_ZDj9">
+            <node concept="3Tqbb2" id="3RmCGNROwTR" role="3qUE_r" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3RmCGNROrPB" role="jymVt" />
+    <node concept="3clFbW" id="6MkAeDP7ULd" role="jymVt">
+      <node concept="3cqZAl" id="6MkAeDP7ULe" role="3clF45" />
+      <node concept="3Tm1VV" id="6MkAeDP7ULf" role="1B3o_S" />
+      <node concept="3clFbS" id="6MkAeDP7ULg" role="3clF47">
+        <node concept="1VxSAg" id="3RmCGNROBMU" role="3cqZAp">
+          <ref role="37wK5l" node="3RmCGNROulX" />
+          <node concept="37vLTw" id="3RmCGNROEjk" role="37wK5m">
+            <ref role="3cqZAo" node="6MkAeDP7ULh" resolve="node" />
+          </node>
+          <node concept="37vLTw" id="3RmCGNROETL" role="37wK5m">
+            <ref role="3cqZAo" node="6MkAeDP7UOx" resolve="skn" />
+          </node>
+          <node concept="37vLTw" id="3RmCGNROFyc" role="37wK5m">
+            <ref role="3cqZAo" node="6MkAeDPiK0Z" resolve="ivaa" />
+          </node>
+          <node concept="37vLTw" id="3RmCGNROIJq" role="37wK5m">
+            <ref role="3cqZAo" node="6MkAeDPnRBO" resolve="path" />
+          </node>
+          <node concept="2YIFZM" id="3RmCGNROMpd" role="37wK5m">
+            <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
+            <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+            <node concept="3Tqbb2" id="3RmCGNRON9o" role="3PaCim" />
           </node>
         </node>
       </node>
@@ -22713,6 +22899,28 @@
       </node>
     </node>
     <node concept="2tJIrI" id="6aYyEt2h7vw" role="jymVt" />
+    <node concept="3clFb_" id="3RmCGNROQel" role="jymVt">
+      <property role="TrG5h" value="nonStructaralChildren" />
+      <node concept="3Tm1VV" id="3RmCGNROQeo" role="1B3o_S" />
+      <node concept="3clFbS" id="3RmCGNROQep" role="3clF47">
+        <node concept="3clFbF" id="1impejG9ass" role="3cqZAp">
+          <node concept="2YIFZM" id="1impejG9ex1" role="3clFbG">
+            <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List)" resolve="unmodifiableList" />
+            <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+            <node concept="2OqwBi" id="3RmCGNRP0so" role="37wK5m">
+              <node concept="Xjq3P" id="3RmCGNROXF5" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3RmCGNRP112" role="2OqNvi">
+                <ref role="2Oxat5" node="3RmCGNRKH95" resolve="nonStructaralChildren" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="_YKpA" id="3RmCGNROQDL" role="3clF45">
+        <node concept="3Tqbb2" id="3lqSg2r8Kb3" role="_ZDj9" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3RmCGNROTBP" role="jymVt" />
     <node concept="3clFb_" id="WdqhnhpkVC" role="jymVt">
       <property role="TrG5h" value="sameFor" />
       <node concept="37vLTG" id="Wdqhnhps6M" role="3clF46">
@@ -22870,7 +23078,7 @@
         </node>
       </node>
     </node>
-    <node concept="3Tm1VV" id="4lHDM38DdG2" role="1B3o_S" />
+    <node concept="3Tm1VV" id="3RmCGNRKTvs" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="6a4qfUKxMyJ">
     <property role="3GE5qa" value="artifact" />
@@ -26333,9 +26541,17 @@
       </node>
     </node>
     <node concept="2lGYhJ" id="2VCmq77SrOB" role="2pHZQ9">
-      <property role="TrG5h" value="dependentOn" />
+      <property role="TrG5h" value="pivotDependentsOn" />
       <node concept="3Tqbb2" id="2VCmq77SrPK" role="2lK19J" />
     </node>
+    <node concept="2lGYhJ" id="3RmCGNRoyUj" role="2pHZQ9">
+      <property role="TrG5h" value="nonStructuralChildren" />
+      <node concept="_YKpA" id="3RmCGNRoyUP" role="2lK19J">
+        <node concept="3qUE_q" id="3RmCGNRAqvY" role="_ZDj9">
+          <node concept="3Tqbb2" id="3RmCGNRAqxg" role="3qUE_r" />
+        </node>
+      </node>
+    </node>
   </node>
 </model>
 

From 747e3cc3068da3207fed3c656aa0d95340a8ac4a Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Fri, 30 Jan 2026 13:01:59 +0100
Subject: [PATCH 11/22] Fore Save All (#1474)

---
 .../org.iets3.variability.artifacts.base.behavior.mps  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index 856bae731a..8412a40075 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -4728,7 +4728,7 @@
                     </node>
                   </node>
                   <node concept="2r$n1x" id="2VCmq77UIe2" role="2r_Bvh">
-                    <ref role="2r$qp6" node="2VCmq77SrOB" resolve="dependentOn" />
+                    <ref role="2r$qp6" node="2VCmq77SrOB" resolve="pivotDependentsOn" />
                     <node concept="10Nm6u" id="5QTJbF9Nc8r" role="2r_lH1" />
                   </node>
                   <node concept="2r$n1x" id="3RmCGNRGW1H" role="2r_Bvh">
@@ -8084,7 +8084,7 @@
       <node concept="3Tm1VV" id="25RwNEX31U8" role="1B3o_S" />
       <node concept="3clFbS" id="25RwNEX31U9" role="3clF47">
         <node concept="1VxSAg" id="3RmCGNPRDC6" role="3cqZAp">
-          <ref role="37wK5l" node="3RmCGNPRyKp" />
+          <ref role="37wK5l" node="3RmCGNPRyKp" resolve="SkeletonNode" />
           <node concept="37vLTw" id="3RmCGNPRDZZ" role="37wK5m">
             <ref role="3cqZAo" node="25RwNEX31UN" resolve="original" />
           </node>
@@ -12876,7 +12876,7 @@
       <node concept="3Tm1VV" id="IzpDYSOg8h" role="1B3o_S" />
       <node concept="3clFbS" id="IzpDYSOg8i" role="3clF47">
         <node concept="1VxSAg" id="2_ThrGHoiWJ" role="3cqZAp">
-          <ref role="37wK5l" node="2_ThrGHocbS" />
+          <ref role="37wK5l" node="2_ThrGHocbS" resolve="Pivot" />
           <node concept="37vLTw" id="2_ThrGHoj1$" role="37wK5m">
             <ref role="3cqZAo" node="IzpDYSOg8G" resolve="pivotNode" />
           </node>
@@ -22797,7 +22797,7 @@
       <node concept="3Tm1VV" id="6MkAeDP7ULf" role="1B3o_S" />
       <node concept="3clFbS" id="6MkAeDP7ULg" role="3clF47">
         <node concept="1VxSAg" id="3RmCGNROBMU" role="3cqZAp">
-          <ref role="37wK5l" node="3RmCGNROulX" />
+          <ref role="37wK5l" node="3RmCGNROulX" resolve="SkeletonEnvironment" />
           <node concept="37vLTw" id="3RmCGNROEjk" role="37wK5m">
             <ref role="3cqZAo" node="6MkAeDP7ULh" resolve="node" />
           </node>
@@ -26132,7 +26132,7 @@
             </node>
             <node concept="2ShNRf" id="3RmCGNQ792$" role="37wK5m">
               <node concept="1pGfFk" id="3RmCGNQ792_" role="2ShVmc">
-                <ref role="37wK5l" node="3RmCGNPRyKp" />
+                <ref role="37wK5l" node="3RmCGNPRyKp" resolve="SkeletonNode" />
                 <node concept="37vLTw" id="3RmCGNQ792A" role="37wK5m">
                   <ref role="3cqZAo" node="3RmCGNQ792G" resolve="n" />
                 </node>

From cc78d84eedb06826b174b664f0a07a4a5989ca25 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Wed, 4 Feb 2026 12:27:14 +0100
Subject: [PATCH 12/22] VPEvalContext associates several ivaas to config
 (#1474)

---
 ...s3.variability.artifacts.base.behavior.mps |   2 +-
 ...ets3.variability.artifacts.base.plugin.mps | 198 ++++++++++++++++++
 2 files changed, 199 insertions(+), 1 deletion(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index 8412a40075..4d11d370fc 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -22900,7 +22900,7 @@
     </node>
     <node concept="2tJIrI" id="6aYyEt2h7vw" role="jymVt" />
     <node concept="3clFb_" id="3RmCGNROQel" role="jymVt">
-      <property role="TrG5h" value="nonStructaralChildren" />
+      <property role="TrG5h" value="nonStructuralChildren" />
       <node concept="3Tm1VV" id="3RmCGNROQeo" role="1B3o_S" />
       <node concept="3clFbS" id="3RmCGNROQep" role="3clF47">
         <node concept="3clFbF" id="1impejG9ass" role="3cqZAp">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.plugin.mps
index c6e4fe851a..a0addf932d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.plugin.mps
@@ -9507,6 +9507,204 @@
         </node>
       </node>
     </node>
+    <node concept="3clFb_" id="2LlSZj5c8ik" role="jymVt">
+      <property role="TrG5h" value="push" />
+      <node concept="3clFbS" id="2LlSZj5c8il" role="3clF47">
+        <node concept="3SKdUt" id="2LlSZj5c8im" role="3cqZAp">
+          <node concept="1PaTwC" id="2LlSZj5c8in" role="1aUNEU">
+            <node concept="3oM_SD" id="2LlSZj5c8io" role="1PaTwD">
+              <property role="3oM_SC" value="Create" />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8ip" role="1PaTwD">
+              <property role="3oM_SC" value="a" />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8iq" role="1PaTwD">
+              <property role="3oM_SC" value="new" />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8ir" role="1PaTwD">
+              <property role="3oM_SC" value="environment" />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8is" role="1PaTwD">
+              <property role="3oM_SC" value="layer," />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8it" role="1PaTwD">
+              <property role="3oM_SC" value="with" />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8iu" role="1PaTwD">
+              <property role="3oM_SC" value="a" />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8iv" role="1PaTwD">
+              <property role="3oM_SC" value="mapping" />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8iw" role="1PaTwD">
+              <property role="3oM_SC" value="from" />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8ix" role="1PaTwD">
+              <property role="3oM_SC" value="ivaa" />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8iy" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8iz" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8i$" role="1PaTwD">
+              <property role="3oM_SC" value="configuration." />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="2LlSZj5c8i_" role="3cqZAp">
+          <node concept="1PaTwC" id="2LlSZj5c8iA" role="1aUNEU">
+            <node concept="3oM_SD" id="2LlSZj5c8iB" role="1PaTwD">
+              <property role="3oM_SC" value="If" />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8iC" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8iD" role="1PaTwD">
+              <property role="3oM_SC" value="configuration" />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8iE" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8iF" role="1PaTwD">
+              <property role="3oM_SC" value="unspecified," />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8iG" role="1PaTwD">
+              <property role="3oM_SC" value="use" />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8iH" role="1PaTwD">
+              <property role="3oM_SC" value="marker" />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8iI" role="1PaTwD">
+              <property role="3oM_SC" value="object" />
+            </node>
+            <node concept="3oM_SD" id="2LlSZj5c8iJ" role="1PaTwD">
+              <property role="3oM_SC" value="UNSPECIFIED_CONFIGURATION." />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2LlSZj5c8iK" role="3cqZAp">
+          <node concept="3cpWsn" id="2LlSZj5c8iL" role="3cpWs9">
+            <property role="TrG5h" value="newEnv" />
+            <node concept="3rvAFt" id="2LlSZj5c8iM" role="1tU5fm">
+              <node concept="3Tqbb2" id="2LlSZj5c8iN" role="3rvQeY" />
+              <node concept="3uibUv" id="2LlSZj5c8iO" role="3rvSg0">
+                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="2LlSZj5c8iP" role="33vP2m">
+              <node concept="3rGOSV" id="2LlSZj5c8iQ" role="2ShVmc">
+                <node concept="3Tqbb2" id="2LlSZj5c8iR" role="3rHrn6" />
+                <node concept="3uibUv" id="2LlSZj5c8iS" role="3rHtpV">
+                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2Gpval" id="2LlSZj5cpev" role="3cqZAp">
+          <node concept="2GrKxI" id="2LlSZj5cpex" role="2Gsz3X">
+            <property role="TrG5h" value="ivaa" />
+          </node>
+          <node concept="37vLTw" id="2LlSZj5ctl8" role="2GsD0m">
+            <ref role="3cqZAo" node="2LlSZj5c8jk" resolve="ivaas" />
+          </node>
+          <node concept="3clFbS" id="2LlSZj5cpe_" role="2LFqv$">
+            <node concept="3clFbF" id="2LlSZj5c8iT" role="3cqZAp">
+              <node concept="37vLTI" id="2LlSZj5c8iU" role="3clFbG">
+                <node concept="3K4zz7" id="2LlSZj5c8iV" role="37vLTx">
+                  <node concept="37vLTw" id="2LlSZj5c8iW" role="3K4E3e">
+                    <ref role="3cqZAo" node="2LlSZj5c8jm" resolve="childConfig" />
+                  </node>
+                  <node concept="10M0yZ" id="2LlSZj5c8iX" role="3K4GZi">
+                    <ref role="3cqZAo" to="quv7:73xp4WKf7Ow" resolve="UNSPECIFIED_CONFIGURATION" />
+                    <ref role="1PxDUh" to="quv7:73xp4WKeKi7" resolve="EvalConstants" />
+                  </node>
+                  <node concept="2OqwBi" id="2LlSZj5c8iY" role="3K4Cdx">
+                    <node concept="37vLTw" id="2LlSZj5c8iZ" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2LlSZj5c8jm" resolve="childConfig" />
+                    </node>
+                    <node concept="3x8VRR" id="2LlSZj5c8j0" role="2OqNvi" />
+                  </node>
+                </node>
+                <node concept="3EllGN" id="2LlSZj5c8j1" role="37vLTJ">
+                  <node concept="2GrUjf" id="2LlSZj5cvuZ" role="3ElVtu">
+                    <ref role="2Gs0qQ" node="2LlSZj5cpex" resolve="ivaa" />
+                  </node>
+                  <node concept="37vLTw" id="2LlSZj5c8j3" role="3ElQJh">
+                    <ref role="3cqZAo" node="2LlSZj5c8iL" resolve="newEnv" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2LlSZj5c8j4" role="3cqZAp">
+          <node concept="1rXfSq" id="2LlSZj5c8j5" role="3clFbG">
+            <ref role="37wK5l" to="2ahs:2pAf7L4EsIf" resolve="pushEnvironment" />
+            <node concept="37vLTw" id="2LlSZj5c8j6" role="37wK5m">
+              <ref role="3cqZAo" node="2LlSZj5cauK" resolve="idNode" />
+            </node>
+            <node concept="37vLTw" id="2LlSZj5c8j7" role="37wK5m">
+              <ref role="3cqZAo" node="2LlSZj5c8iL" resolve="newEnv" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2LlSZj5c8j8" role="3cqZAp">
+          <node concept="2OqwBi" id="2LlSZj5c8j9" role="3clFbG">
+            <node concept="37vLTw" id="2LlSZj5c8ja" role="2Oq$k0">
+              <ref role="3cqZAo" node="2LlSZj5c8jo" resolve="actuallyUsed" />
+            </node>
+            <node concept="liA8E" id="2LlSZj5c8jb" role="2OqNvi">
+              <ref role="37wK5l" to="lte6:3mecA8$jQH2" resolve="storeInEnv" />
+              <node concept="1rXfSq" id="2LlSZj5c8jc" role="37wK5m">
+                <ref role="37wK5l" to="2ahs:2X4$XGmeuKp" resolve="getEnvironment" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2LlSZj5c8jd" role="3cqZAp">
+          <node concept="2OqwBi" id="2LlSZj5c8je" role="3clFbG">
+            <node concept="37vLTw" id="2LlSZj5c8jf" role="2Oq$k0">
+              <ref role="3cqZAo" node="9H$A4OSy1l" resolve="configStack" />
+            </node>
+            <node concept="2ArzE6" id="2LlSZj5c8jg" role="2OqNvi">
+              <node concept="37vLTw" id="2LlSZj5c8jh" role="25WWJ7">
+                <ref role="3cqZAo" node="2LlSZj5c8jm" resolve="childConfig" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2LlSZj5c8ji" role="1B3o_S" />
+      <node concept="3cqZAl" id="2LlSZj5c8jj" role="3clF45" />
+      <node concept="37vLTG" id="2LlSZj5cauK" role="3clF46">
+        <property role="TrG5h" value="idNode" />
+        <node concept="3Tqbb2" id="2LlSZj5cbHb" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="2LlSZj5c8jk" role="3clF46">
+        <property role="TrG5h" value="ivaas" />
+        <node concept="3vKaQO" id="2LlSZj5cfFL" role="1tU5fm">
+          <node concept="3Tqbb2" id="2LlSZj5cfFM" role="3O5elw">
+            <ref role="ehGHo" to="i9mv:75FdNyOGCTb" resolve="IVariabilityAwareArtifact" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="2LlSZj5c8jm" role="3clF46">
+        <property role="TrG5h" value="childConfig" />
+        <node concept="3Tqbb2" id="2LlSZj5c8jn" role="1tU5fm">
+          <ref role="ehGHo" to="4ndm:30ECcbtES_0" resolve="AbstractFeatureConfiguration" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2LlSZj5c8jo" role="3clF46">
+        <property role="TrG5h" value="actuallyUsed" />
+        <node concept="3uibUv" id="2LlSZj5c8jp" role="1tU5fm">
+          <ref role="3uigEE" to="lte6:3mecA8$jk0E" resolve="UsedConfigs" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2LlSZj5c7gW" role="jymVt" />
     <node concept="2tJIrI" id="9H$A4OTqHf" role="jymVt" />
     <node concept="3clFb_" id="9H$A4OTsJd" role="jymVt">
       <property role="TrG5h" value="pop" />

From 137846c27b43947bc271507a7f98f0cfa38896de Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Mon, 9 Feb 2026 12:48:23 +0100
Subject: [PATCH 13/22] Add postprocess-method with broader signature (#1474)

---
 ...ariability.artifacts.baseline.behavior.mps | 74 +++++++++++++++++++
 ....variability.artifacts.baseline.plugin.mps |  5 +-
 2 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.baseline/models/org.iets3.variability.artifacts.baseline.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.baseline/models/org.iets3.variability.artifacts.baseline.behavior.mps
index 5f69dfaca6..cf57b5355c 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.baseline/models/org.iets3.variability.artifacts.baseline.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.baseline/models/org.iets3.variability.artifacts.baseline.behavior.mps
@@ -41,6 +41,17 @@
         <child id="1082485599096" name="statements" index="9aQI4" />
       </concept>
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
+        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
+        <child id="1188214630783" name="value" index="2B76xF" />
+      </concept>
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
+        <child id="1188208488637" name="annotation" index="2AJF6D" />
+      </concept>
+      <concept id="1188214545140" name="jetbrains.mps.baseLanguage.structure.AnnotationInstanceValue" flags="ng" index="2B6LJw">
+        <reference id="1188214555875" name="key" index="2B6OnR" />
+        <child id="1188214607812" name="value" index="2B70Vg" />
+      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -430,6 +441,69 @@
           </node>
         </node>
       </node>
+      <node concept="2AHcQZ" id="4bZ3p5x0Kpt" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+        <node concept="2B6LJw" id="4bZ3p5x0KBl" role="2B76xF">
+          <ref role="2B6OnR" to="wyt6:~Deprecated.since()" resolve="since" />
+          <node concept="Xl_RD" id="4bZ3p5x0KE7" role="2B70Vg">
+            <property role="Xl_RC" value="9.2.2026" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="4bZ3p5x0GrM" role="13h7CS">
+      <property role="13i0it" value="true" />
+      <property role="TrG5h" value="postprocess" />
+      <node concept="37vLTG" id="4bZ3p5x0GrN" role="3clF46">
+        <property role="TrG5h" value="filteredModels" />
+        <node concept="_YKpA" id="4bZ3p5x0F2f" role="1tU5fm">
+          <node concept="H_c77" id="4bZ3p5x0F2i" role="_ZDj9" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4bZ3p5x0GrQ" role="1B3o_S" />
+      <node concept="3cqZAl" id="4bZ3p5x0GrR" role="3clF45" />
+      <node concept="3clFbS" id="4bZ3p5x0GrS" role="3clF47">
+        <node concept="3clFbF" id="4bZ3p5x0KUr" role="3cqZAp">
+          <node concept="2OqwBi" id="4bZ3p5x0L4C" role="3clFbG">
+            <node concept="13iPFW" id="4bZ3p5x0KUq" role="2Oq$k0" />
+            <node concept="2qgKlT" id="4bZ3p5x0LuS" role="2OqNvi">
+              <ref role="37wK5l" node="1xsXReQTuZ$" resolve="postprocess" />
+              <node concept="37vLTw" id="4bZ3p5x0N6N" role="37wK5m">
+                <ref role="3cqZAo" node="4bZ3p5x0GrN" resolve="filteredModels" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="P$JXv" id="4bZ3p5x0GrY" role="lGtFl">
+        <node concept="TZ5HA" id="4bZ3p5x0GrZ" role="TZ5H$">
+          <node concept="1dT_AC" id="4bZ3p5x0Gs0" role="1dT_Ay">
+            <property role="1dT_AB" value="This method will be called after a module has been cloned and filtered according to a variant configuration." />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="4bZ3p5x0Gs1" role="TZ5H$">
+          <node concept="1dT_AC" id="4bZ3p5x0Gs2" role="1dT_Ay">
+            <property role="1dT_AB" value="" />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="4bZ3p5x0Gs3" role="TZ5H$">
+          <node concept="1dT_AC" id="4bZ3p5x0Gs4" role="1dT_Ay">
+            <property role="1dT_AB" value="It allows to implement application-specific clean-up logic for variant baselining." />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="4bZ3p5x0Gs5" role="3nqlJM">
+          <property role="TUZQ4" value="the cloned and filtered models to be postprocessed" />
+          <node concept="zr_55" id="4bZ3p5x0Gs6" role="zr_5Q">
+            <ref role="zr_51" node="4bZ3p5x0GrN" resolve="filteredModels" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="4bZ3p5x0Gs7" role="3clF46">
+        <property role="TrG5h" value="configItem" />
+        <node concept="3Tqbb2" id="4bZ3p5x0F1H" role="1tU5fm">
+          <ref role="ehGHo" to="oe8b:4Mwrvj$KmxA" resolve="IVariantBaselineConfigItem" />
+        </node>
+      </node>
     </node>
     <node concept="13i0hz" id="5bEmt06_eiH" role="13h7CS">
       <property role="13i0it" value="true" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.baseline/models/org.iets3.variability.artifacts.baseline.plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.baseline/models/org.iets3.variability.artifacts.baseline.plugin.mps
index 0999226ccf..ffa87e44d8 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.baseline/models/org.iets3.variability.artifacts.baseline.plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.baseline/models/org.iets3.variability.artifacts.baseline.plugin.mps
@@ -995,10 +995,13 @@
               <ref role="3cqZAo" node="6sc6iZad_qH" resolve="hpi" />
             </node>
             <node concept="2qgKlT" id="1xsXReQTzNe" role="2OqNvi">
-              <ref role="37wK5l" to="s50z:1xsXReQTuZ$" resolve="postprocess" />
+              <ref role="37wK5l" to="s50z:4bZ3p5x0GrM" resolve="postprocess" />
               <node concept="37vLTw" id="1xsXReQT$_t" role="37wK5m">
                 <ref role="3cqZAo" node="sM5CfQY3$Q" resolve="allModels" />
               </node>
+              <node concept="37vLTw" id="4bZ3p5wZwpv" role="37wK5m">
+                <ref role="3cqZAo" node="3fjVuHAGqw5" resolve="hpiInClone" />
+              </node>
             </node>
           </node>
         </node>

From a6fb47401ba6ee16af611cc74dcc1a2f99dc64b9 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Tue, 10 Feb 2026 09:20:34 +0100
Subject: [PATCH 14/22] Clen up (#1474)

---
 ...s3.variability.artifacts.base.behavior.mps | 239 +++++++++---------
 1 file changed, 115 insertions(+), 124 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index 70f6c42730..7194fdd8fb 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -4692,7 +4692,7 @@
       <node concept="3Tm1VV" id="2VCmq77U2fq" role="1B3o_S" />
       <node concept="3vKaQO" id="2VCmq77U4UT" role="3clF45">
         <node concept="3uibUv" id="2VCmq77U4UU" role="3O5elw">
-          <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotDuple" />
+          <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
         </node>
       </node>
       <node concept="3clFbS" id="2VCmq77U2fs" role="3clF47">
@@ -4720,7 +4720,7 @@
                 <ref role="37wK5l" to="33ny:~Collections.singleton(java.lang.Object)" resolve="singleton" />
                 <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
                 <node concept="2ry78W" id="2VCmq77UIdZ" role="37wK5m">
-                  <ref role="2ryb1Q" node="2VCmq77Sge8" resolve="PivotDuple" />
+                  <ref role="2ryb1Q" node="2VCmq77Sge8" resolve="PivotData" />
                   <node concept="2r$n1x" id="2VCmq77UIe0" role="2r_Bvh">
                     <ref role="2r$qp6" node="2VCmq77SgeU" resolve="pivot" />
                     <node concept="37vLTw" id="2VCmq77UIe1" role="2r_lH1">
@@ -19304,7 +19304,7 @@
             </node>
             <node concept="3vKaQO" id="2VCmq783EjJ" role="1tU5fm">
               <node concept="3uibUv" id="2VCmq783EjK" role="3O5elw">
-                <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotDuple" />
+                <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
               </node>
             </node>
           </node>
@@ -19345,110 +19345,97 @@
           </node>
           <node concept="9aQIb" id="1ZWkc2up$iB" role="9aQIa">
             <node concept="3clFbS" id="1ZWkc2up$iC" role="9aQI4">
-              <node concept="3cpWs8" id="2VCmq7849hK" role="3cqZAp">
-                <node concept="3cpWsn" id="2VCmq7849hL" role="3cpWs9">
-                  <property role="TrG5h" value="seq" />
-                  <node concept="A3Dl8" id="2VCmq78496K" role="1tU5fm">
-                    <node concept="3uibUv" id="2VCmq78496N" role="A3Ik2">
-                      <ref role="3uigEE" node="5zD5ovlKksz" resolve="ReferenceResolved" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="2VCmq7849hM" role="33vP2m">
-                    <node concept="37vLTw" id="2VCmq7849hN" role="2Oq$k0">
-                      <ref role="3cqZAo" node="5zD5ovlZFHS" resolve="pivots" />
-                    </node>
-                    <node concept="3$u5V9" id="2VCmq7849hO" role="2OqNvi">
-                      <node concept="1bVj0M" id="2VCmq7849hP" role="23t8la">
-                        <node concept="3clFbS" id="2VCmq7849hQ" role="1bW5cS">
-                          <node concept="3SKdUt" id="2VCmq7849hR" role="3cqZAp">
-                            <node concept="1PaTwC" id="2VCmq7849hS" role="1aUNEU">
-                              <node concept="3oM_SD" id="2VCmq7849hT" role="1PaTwD">
-                                <property role="3oM_SC" value="reference" />
-                              </node>
-                              <node concept="3oM_SD" id="2VCmq7849hU" role="1PaTwD">
-                                <property role="3oM_SC" value="to" />
-                              </node>
-                              <node concept="3oM_SD" id="2VCmq7849hV" role="1PaTwD">
-                                <property role="3oM_SC" value="a" />
-                              </node>
-                              <node concept="3oM_SD" id="2VCmq7849hW" role="1PaTwD">
-                                <property role="3oM_SC" value="pivot" />
-                              </node>
-                              <node concept="3oM_SD" id="2VCmq7849hX" role="1PaTwD">
-                                <property role="3oM_SC" value="node," />
-                              </node>
-                              <node concept="3oM_SD" id="2VCmq7849hY" role="1PaTwD">
-                                <property role="3oM_SC" value="add" />
-                              </node>
-                              <node concept="3oM_SD" id="2VCmq7849hZ" role="1PaTwD">
-                                <property role="3oM_SC" value="relative" />
-                              </node>
-                              <node concept="3oM_SD" id="2VCmq7849i0" role="1PaTwD">
-                                <property role="3oM_SC" value="path" />
-                              </node>
-                              <node concept="3oM_SD" id="2VCmq7849i1" role="1PaTwD">
-                                <property role="3oM_SC" value="(only" />
-                              </node>
-                              <node concept="3oM_SD" id="2VCmq7849i2" role="1PaTwD">
-                                <property role="3oM_SC" value="one" />
-                              </node>
-                              <node concept="3oM_SD" id="2VCmq7849i3" role="1PaTwD">
-                                <property role="3oM_SC" value="segment)" />
-                              </node>
+              <node concept="3cpWs6" id="2VCmq7849E3" role="3cqZAp">
+                <node concept="2OqwBi" id="6_IBsN5N6Xz" role="3cqZAk">
+                  <node concept="37vLTw" id="6_IBsN5N6X$" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5zD5ovlZFHS" resolve="pivots" />
+                  </node>
+                  <node concept="3$u5V9" id="6_IBsN5N6X_" role="2OqNvi">
+                    <node concept="1bVj0M" id="6_IBsN5N6XA" role="23t8la">
+                      <node concept="3clFbS" id="6_IBsN5N6XB" role="1bW5cS">
+                        <node concept="3SKdUt" id="6_IBsN5N6XC" role="3cqZAp">
+                          <node concept="1PaTwC" id="6_IBsN5N6XD" role="1aUNEU">
+                            <node concept="3oM_SD" id="6_IBsN5N6XE" role="1PaTwD">
+                              <property role="3oM_SC" value="reference" />
+                            </node>
+                            <node concept="3oM_SD" id="6_IBsN5N6XF" role="1PaTwD">
+                              <property role="3oM_SC" value="to" />
+                            </node>
+                            <node concept="3oM_SD" id="6_IBsN5N6XG" role="1PaTwD">
+                              <property role="3oM_SC" value="a" />
+                            </node>
+                            <node concept="3oM_SD" id="6_IBsN5N6XH" role="1PaTwD">
+                              <property role="3oM_SC" value="pivot" />
+                            </node>
+                            <node concept="3oM_SD" id="6_IBsN5N6XI" role="1PaTwD">
+                              <property role="3oM_SC" value="node," />
+                            </node>
+                            <node concept="3oM_SD" id="6_IBsN5N6XJ" role="1PaTwD">
+                              <property role="3oM_SC" value="add" />
+                            </node>
+                            <node concept="3oM_SD" id="6_IBsN5N6XK" role="1PaTwD">
+                              <property role="3oM_SC" value="relative" />
+                            </node>
+                            <node concept="3oM_SD" id="6_IBsN5N6XL" role="1PaTwD">
+                              <property role="3oM_SC" value="path" />
+                            </node>
+                            <node concept="3oM_SD" id="6_IBsN5N6XM" role="1PaTwD">
+                              <property role="3oM_SC" value="(only" />
+                            </node>
+                            <node concept="3oM_SD" id="6_IBsN5N6XN" role="1PaTwD">
+                              <property role="3oM_SC" value="one" />
+                            </node>
+                            <node concept="3oM_SD" id="6_IBsN5N6XO" role="1PaTwD">
+                              <property role="3oM_SC" value="segment)" />
                             </node>
                           </node>
-                          <node concept="3clFbF" id="2VCmq7849i4" role="3cqZAp">
-                            <node concept="2ShNRf" id="2VCmq7849i5" role="3clFbG">
-                              <node concept="1pGfFk" id="2VCmq7849i6" role="2ShVmc">
-                                <property role="373rjd" value="true" />
-                                <ref role="37wK5l" node="1ZWkc2uwbkl" resolve="ReferenceResolved" />
-                                <node concept="37vLTw" id="2VCmq7849i7" role="37wK5m">
-                                  <ref role="3cqZAo" node="6EGd7Wxz2j" resolve="ref" />
-                                </node>
-                                <node concept="2OqwBi" id="2VCmq7849i8" role="37wK5m">
-                                  <node concept="2OqwBi" id="2VCmq7849i9" role="2Oq$k0">
-                                    <node concept="37vLTw" id="2VCmq7849ia" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2VCmq7849ii" resolve="pd" />
-                                    </node>
-                                    <node concept="2sxana" id="2VCmq7849ib" role="2OqNvi">
-                                      <ref role="2sxfKC" node="2VCmq77SgeU" resolve="pivot" />
-                                    </node>
+                        </node>
+                        <node concept="3clFbF" id="6_IBsN5N6XP" role="3cqZAp">
+                          <node concept="2ShNRf" id="6_IBsN5N6XQ" role="3clFbG">
+                            <node concept="1pGfFk" id="6_IBsN5N6XR" role="2ShVmc">
+                              <property role="373rjd" value="true" />
+                              <ref role="37wK5l" node="1ZWkc2uwbkl" resolve="ReferenceResolved" />
+                              <node concept="37vLTw" id="6_IBsN5N6XS" role="37wK5m">
+                                <ref role="3cqZAo" node="6EGd7Wxz2j" resolve="ref" />
+                              </node>
+                              <node concept="2OqwBi" id="6_IBsN5N6XT" role="37wK5m">
+                                <node concept="2OqwBi" id="6_IBsN5N6XU" role="2Oq$k0">
+                                  <node concept="37vLTw" id="6_IBsN5N6XV" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="6_IBsN5N6Y3" resolve="pd" />
                                   </node>
-                                  <node concept="liA8E" id="2VCmq7849ic" role="2OqNvi">
-                                    <ref role="37wK5l" node="IzpDYSRzQ5" resolve="getTargetNode" />
+                                  <node concept="2sxana" id="6_IBsN5N6XW" role="2OqNvi">
+                                    <ref role="2sxfKC" node="2VCmq77SgeU" resolve="pivot" />
                                   </node>
                                 </node>
-                                <node concept="2OqwBi" id="2VCmq7849id" role="37wK5m">
-                                  <node concept="2OqwBi" id="2VCmq7849ie" role="2Oq$k0">
-                                    <node concept="37vLTw" id="2VCmq7849if" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2VCmq7849ii" resolve="pd" />
-                                    </node>
-                                    <node concept="2sxana" id="2VCmq7849ig" role="2OqNvi">
-                                      <ref role="2sxfKC" node="2VCmq77SgeU" resolve="pivot" />
-                                    </node>
+                                <node concept="liA8E" id="6_IBsN5N6XX" role="2OqNvi">
+                                  <ref role="37wK5l" node="IzpDYSRzQ5" resolve="getTargetNode" />
+                                </node>
+                              </node>
+                              <node concept="2OqwBi" id="6_IBsN5N6XY" role="37wK5m">
+                                <node concept="2OqwBi" id="6_IBsN5N6XZ" role="2Oq$k0">
+                                  <node concept="37vLTw" id="6_IBsN5N6Y0" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="6_IBsN5N6Y3" resolve="pd" />
                                   </node>
-                                  <node concept="liA8E" id="2VCmq7849ih" role="2OqNvi">
-                                    <ref role="37wK5l" node="1ZWkc2utFaB" resolve="asSegment" />
+                                  <node concept="2sxana" id="6_IBsN5N6Y1" role="2OqNvi">
+                                    <ref role="2sxfKC" node="2VCmq77SgeU" resolve="pivot" />
                                   </node>
                                 </node>
+                                <node concept="liA8E" id="6_IBsN5N6Y2" role="2OqNvi">
+                                  <ref role="37wK5l" node="1ZWkc2utFaB" resolve="asSegment" />
+                                </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="gl6BB" id="2VCmq7849ii" role="1bW2Oz">
-                          <property role="TrG5h" value="pd" />
-                          <node concept="2jxLKc" id="2VCmq7849ij" role="1tU5fm" />
-                        </node>
+                      </node>
+                      <node concept="gl6BB" id="6_IBsN5N6Y3" role="1bW2Oz">
+                        <property role="TrG5h" value="pd" />
+                        <node concept="2jxLKc" id="6_IBsN5N6Y4" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="3cpWs6" id="2VCmq7849E3" role="3cqZAp">
-                <node concept="37vLTw" id="2VCmq7849E5" role="3cqZAk">
-                  <ref role="3cqZAo" node="2VCmq7849hL" resolve="seq" />
-                </node>
-              </node>
             </node>
           </node>
           <node concept="2OqwBi" id="2VCmq783OxA" role="3clFbw">
@@ -22610,12 +22597,6 @@
   <node concept="312cEu" id="6MkAeDP7UDV">
     <property role="3GE5qa" value="skeleton.builder" />
     <property role="TrG5h" value="SkeletonEnvironment" />
-    <node concept="312cEg" id="1impejFLZxN" role="jymVt">
-      <property role="TrG5h" value="structChildrenFull" />
-      <node concept="3Tm1VV" id="1impejFLVgs" role="1B3o_S" />
-      <node concept="10P_77" id="1impejFM3Dx" role="1tU5fm" />
-      <node concept="3clFbT" id="1impejFM3V7" role="33vP2m" />
-    </node>
     <node concept="312cEg" id="6MkAeDP7UI3" role="jymVt">
       <property role="TrG5h" value="skn" />
       <property role="3TUv4t" value="true" />
@@ -22727,34 +22708,17 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="3lqSg2r0XAG" role="3cqZAp">
-          <node concept="2OqwBi" id="3lqSg2r130Y" role="3clFbG">
-            <node concept="37vLTw" id="3lqSg2r0XAE" role="2Oq$k0">
-              <ref role="3cqZAo" node="3RmCGNROwPC" resolve="nonStructaralChildren" />
+        <node concept="3clFbF" id="6_IBsN5NhMw" role="3cqZAp">
+          <node concept="2OqwBi" id="6_IBsN5NFub" role="3clFbG">
+            <node concept="2OqwBi" id="6_IBsN5N_T3" role="2Oq$k0">
+              <node concept="Xjq3P" id="6_IBsN5Nz3u" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6_IBsN5NB5a" role="2OqNvi">
+                <ref role="2Oxat5" node="3RmCGNRKH95" resolve="nonStructaralChildren" />
+              </node>
             </node>
-            <node concept="2es0OD" id="3lqSg2r173g" role="2OqNvi">
-              <node concept="1bVj0M" id="3lqSg2r173i" role="23t8la">
-                <node concept="3clFbS" id="3lqSg2r173j" role="1bW5cS">
-                  <node concept="3clFbF" id="3lqSg2r1aBX" role="3cqZAp">
-                    <node concept="2OqwBi" id="3lqSg2r1kCg" role="3clFbG">
-                      <node concept="2OqwBi" id="3lqSg2r1e8R" role="2Oq$k0">
-                        <node concept="Xjq3P" id="3lqSg2r1aBW" role="2Oq$k0" />
-                        <node concept="2OwXpG" id="3lqSg2r1f3X" role="2OqNvi">
-                          <ref role="2Oxat5" node="3RmCGNRKH95" resolve="nonStructaralChildren" />
-                        </node>
-                      </node>
-                      <node concept="TSZUe" id="3lqSg2r1pDo" role="2OqNvi">
-                        <node concept="37vLTw" id="1impejF$15p" role="25WWJ7">
-                          <ref role="3cqZAo" node="3lqSg2r173k" resolve="it" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="gl6BB" id="3lqSg2r173k" role="1bW2Oz">
-                  <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3lqSg2r173l" role="1tU5fm" />
-                </node>
+            <node concept="X8dFx" id="6_IBsN5NM_q" role="2OqNvi">
+              <node concept="37vLTw" id="6_IBsN5NNtz" role="25WWJ7">
+                <ref role="3cqZAo" node="3RmCGNROwPC" resolve="nonStructaralChildren" />
               </node>
             </node>
           </node>
@@ -26532,7 +26496,7 @@
     </node>
   </node>
   <node concept="2fD8I5" id="2VCmq77Sge8">
-    <property role="TrG5h" value="PivotDuple" />
+    <property role="TrG5h" value="PivotData" />
     <node concept="3Tm1VV" id="2VCmq77Sge9" role="1B3o_S" />
     <node concept="2lGYhJ" id="2VCmq77SgeU" role="2pHZQ9">
       <property role="TrG5h" value="pivot" />
@@ -26552,6 +26516,33 @@
         </node>
       </node>
     </node>
+    <node concept="3UR2Jj" id="6_IBsN5N38J" role="lGtFl">
+      <node concept="TZ5HA" id="6_IBsN5N38K" role="TZ5H$">
+        <node concept="1dT_AC" id="6_IBsN5N38L" role="1dT_Ay">
+          <property role="1dT_AB" value="data specifying the following:" />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="6_IBsN5O95$" role="TZ5H$">
+        <node concept="1dT_AC" id="6_IBsN5O95_" role="1dT_Ay">
+          <property role="1dT_AB" value="1. The Pivot which stands for 'instantiatin'" />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="6_IBsN5O95G" role="TZ5H$">
+        <node concept="1dT_AC" id="6_IBsN5O95H" role="1dT_Ay">
+          <property role="1dT_AB" value="2. 'dependsOn' states a dependeny between a node 'n' and the Pivot. if 'n' is erased then also the Pivot" />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="6_IBsN5O95O" role="TZ5H$">
+        <node concept="1dT_AC" id="6_IBsN5O95P" role="1dT_Ay">
+          <property role="1dT_AB" value="3. 'nonStructuralChildren' are children of the Pivot, which it does not directly contain. A scenario are children inherited from" />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="6_IBsN5O95W" role="TZ5H$">
+        <node concept="1dT_AC" id="6_IBsN5O95X" role="1dT_Ay">
+          <property role="1dT_AB" value="a super class." />
+        </node>
+      </node>
+    </node>
   </node>
 </model>
 

From 981b43b22eda09311da3be976813e46bc808f65f Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Tue, 10 Feb 2026 09:21:17 +0100
Subject: [PATCH 15/22] Remove unused method (#1474)

---
 .../org.iets3.variability.artifacts.base.behavior.mps     | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index 7194fdd8fb..be035ee852 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -21559,14 +21559,6 @@
         </node>
       </node>
     </node>
-    <node concept="13i0hz" id="1dm_BztreE_" role="13h7CS">
-      <property role="13i0iv" value="true" />
-      <property role="13i0it" value="true" />
-      <property role="TrG5h" value="refNode" />
-      <node concept="3Tm1VV" id="1dm_BztreEA" role="1B3o_S" />
-      <node concept="3Tqbb2" id="1dm_BztreVa" role="3clF45" />
-      <node concept="3clFbS" id="1dm_BztreEC" role="3clF47" />
-    </node>
     <node concept="13i0hz" id="2BZZUn12r$J" role="13h7CS">
       <property role="13i0iv" value="true" />
       <property role="13i0it" value="true" />

From 040b93723ed9ecc53352229bfee7c65d0dd15aaa Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Wed, 11 Feb 2026 08:36:10 +0100
Subject: [PATCH 16/22] deprecate unused 'Getter' (#1474)

---
 ...s3.variability.artifacts.base.behavior.mps | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index be035ee852..c80bc5eae8 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -6944,12 +6944,25 @@
           <node concept="3cpWsn" id="2BeCnBcx1wI" role="3cpWs9">
             <property role="TrG5h" value="hasVarPoints" />
             <node concept="10P_77" id="2BeCnBcx0OW" role="1tU5fm" />
-            <node concept="2OqwBi" id="2BeCnBcx1wM" role="33vP2m">
-              <node concept="37vLTw" id="2BeCnBcx1wN" role="2Oq$k0">
-                <ref role="3cqZAo" node="220xVKpl3iS" resolve="sn" />
+            <node concept="22lmx$" id="4KRLi9uV$a7" role="33vP2m">
+              <node concept="3y3z36" id="4KRLi9uVNpg" role="3uHU7w">
+                <node concept="10Nm6u" id="4KRLi9uVQ$1" role="3uHU7w" />
+                <node concept="2OqwBi" id="4KRLi9uVEIz" role="3uHU7B">
+                  <node concept="37vLTw" id="4KRLi9uVBZm" role="2Oq$k0">
+                    <ref role="3cqZAo" node="220xVKpl3iS" resolve="sn" />
+                  </node>
+                  <node concept="liA8E" id="4KRLi9uVJrE" role="2OqNvi">
+                    <ref role="37wK5l" node="WVQiviB2Bq" resolve="getTabular" />
+                  </node>
+                </node>
               </node>
-              <node concept="liA8E" id="wv1bximHGf" role="2OqNvi">
-                <ref role="37wK5l" node="1h_GRFdkofs" resolve="hasVarPoint" />
+              <node concept="2OqwBi" id="2BeCnBcx1wM" role="3uHU7B">
+                <node concept="37vLTw" id="2BeCnBcx1wN" role="2Oq$k0">
+                  <ref role="3cqZAo" node="220xVKpl3iS" resolve="sn" />
+                </node>
+                <node concept="liA8E" id="wv1bximHGf" role="2OqNvi">
+                  <ref role="37wK5l" node="1h_GRFdkofs" resolve="hasVarPoint" />
+                </node>
               </node>
             </node>
           </node>
@@ -13028,6 +13041,15 @@
       </node>
       <node concept="3Tm1VV" id="IzpDYSSmjs" role="1B3o_S" />
       <node concept="3Tqbb2" id="IzpDYSTlvv" role="3clF45" />
+      <node concept="2AHcQZ" id="1zFT$dz$tCc" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+        <node concept="2B6LJw" id="1zFT$dz$BBA" role="2B76xF">
+          <ref role="2B6OnR" to="wyt6:~Deprecated.since()" resolve="since" />
+          <node concept="Xl_RD" id="1zFT$dz$BFe" role="2B70Vg">
+            <property role="Xl_RC" value="11.2.2026" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="IzpDYSSmyA" role="jymVt" />
     <node concept="3clFb_" id="IzpDYSRzQ5" role="jymVt">

From 9fff83e23574b9288352160c7263e09b0bcbc8da Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Wed, 25 Feb 2026 15:56:42 +0100
Subject: [PATCH 17/22] update method return of 'instantiatedSubtree' (#1474)

---
 ...s3.variability.artifacts.base.behavior.mps | 326 +++++++++++-------
 1 file changed, 210 insertions(+), 116 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index 173de794fa..9ce2fd8537 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -4690,15 +4690,10 @@
         <node concept="3Tqbb2" id="2VCmq77U4T_" role="1tU5fm" />
       </node>
       <node concept="3Tm1VV" id="2VCmq77U2fq" role="1B3o_S" />
-      <node concept="3vKaQO" id="2VCmq77U4UT" role="3clF45">
-        <node concept="3uibUv" id="2VCmq77U4UU" role="3O5elw">
-          <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
-        </node>
-      </node>
       <node concept="3clFbS" id="2VCmq77U2fs" role="3clF47">
         <node concept="3cpWs8" id="2VCmq77U8XN" role="3cqZAp">
           <node concept="3cpWsn" id="2VCmq77U8XO" role="3cpWs9">
-            <property role="TrG5h" value="pivot" />
+            <property role="TrG5h" value="pivotNullable" />
             <node concept="3uibUv" id="2VCmq77U8Rv" role="1tU5fm">
               <ref role="3uigEE" node="IzpDYSOg6$" resolve="Pivot" />
             </node>
@@ -4713,48 +4708,77 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="2VCmq77U9ie" role="3cqZAp">
-          <node concept="3clFbS" id="2VCmq77U9ig" role="3clFbx">
-            <node concept="3cpWs6" id="2VCmq77UH1D" role="3cqZAp">
-              <node concept="2YIFZM" id="2VCmq77UHhz" role="3cqZAk">
-                <ref role="37wK5l" to="33ny:~Collections.singleton(java.lang.Object)" resolve="singleton" />
-                <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-                <node concept="2ry78W" id="2VCmq77UIdZ" role="37wK5m">
-                  <ref role="2ryb1Q" node="2VCmq77Sge8" resolve="PivotData" />
-                  <node concept="2r$n1x" id="2VCmq77UIe0" role="2r_Bvh">
-                    <ref role="2r$qp6" node="2VCmq77SgeU" resolve="pivot" />
-                    <node concept="37vLTw" id="2VCmq77UIe1" role="2r_lH1">
-                      <ref role="3cqZAo" node="2VCmq77U8XO" resolve="pivot" />
-                    </node>
-                  </node>
-                  <node concept="2r$n1x" id="2VCmq77UIe2" role="2r_Bvh">
-                    <ref role="2r$qp6" node="2VCmq77SrOB" resolve="pivotDependentsOn" />
-                    <node concept="10Nm6u" id="5QTJbF9Nc8r" role="2r_lH1" />
-                  </node>
-                  <node concept="2r$n1x" id="3RmCGNRGW1H" role="2r_Bvh">
-                    <ref role="2r$qp6" node="3RmCGNRoyUj" resolve="nonStructuralChildren" />
-                    <node concept="2YIFZM" id="3RmCGNRGX3w" role="2r_lH1">
-                      <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
-                      <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-                      <node concept="3Tqbb2" id="3RmCGNRGXPG" role="3PaCim" />
+        <node concept="3clFbF" id="7lhbwV9SeUJ" role="3cqZAp">
+          <node concept="2OqwBi" id="7lhbwV9SBiU" role="3clFbG">
+            <node concept="2YIFZM" id="7lhbwV9SBiV" role="2Oq$k0">
+              <ref role="37wK5l" to="33ny:~Optional.ofNullable(java.lang.Object)" resolve="ofNullable" />
+              <ref role="1Pybhc" to="33ny:~Optional" resolve="Optional" />
+              <node concept="37vLTw" id="7lhbwV9SBiW" role="37wK5m">
+                <ref role="3cqZAo" node="2VCmq77U8XO" resolve="pivotNullable" />
+              </node>
+            </node>
+            <node concept="liA8E" id="7lhbwV9SBiX" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Optional.map(java.util.function.Function)" resolve="map" />
+              <node concept="1bVj0M" id="7lhbwV9SBiY" role="37wK5m">
+                <node concept="gl6BB" id="7lhbwV9SBiZ" role="1bW2Oz">
+                  <property role="TrG5h" value="pivot" />
+                  <node concept="2jxLKc" id="7lhbwV9SBj0" role="1tU5fm" />
+                </node>
+                <node concept="3clFbS" id="7lhbwV9SBj1" role="1bW5cS">
+                  <node concept="3cpWs8" id="7lhbwV9SBj2" role="3cqZAp">
+                    <node concept="3cpWsn" id="7lhbwV9SBj3" role="3cpWs9">
+                      <property role="TrG5h" value="data" />
+                      <node concept="3uibUv" id="7lhbwV9SBj4" role="1tU5fm">
+                        <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
+                      </node>
+                      <node concept="2ry78W" id="7lhbwV9SBj5" role="33vP2m">
+                        <ref role="2ryb1Q" node="2VCmq77Sge8" resolve="PivotData" />
+                        <node concept="2r$n1x" id="7lhbwV9SBj6" role="2r_Bvh">
+                          <ref role="2r$qp6" node="2VCmq77SgeU" resolve="pivot" />
+                          <node concept="37vLTw" id="7lhbwV9SBj7" role="2r_lH1">
+                            <ref role="3cqZAo" node="7lhbwV9SBiZ" resolve="pivot" />
+                          </node>
+                        </node>
+                        <node concept="2r$n1x" id="7lhbwV9SBj8" role="2r_Bvh">
+                          <ref role="2r$qp6" node="7lhbwV9MdDg" resolve="pivotInstantiations" />
+                          <node concept="2YIFZM" id="7lhbwV9SBj9" role="2r_lH1">
+                            <ref role="37wK5l" to="33ny:~Collections.emptySet()" resolve="emptySet" />
+                            <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+                            <node concept="3uibUv" id="7lhbwV9SBja" role="3PaCim">
+                              <ref role="3uigEE" node="IzpDYSOg6$" resolve="Pivot" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="2r$n1x" id="7lhbwV9SBjb" role="2r_Bvh">
+                          <ref role="2r$qp6" node="2VCmq77SrOB" resolve="pivotDependentsOn" />
+                          <node concept="10Nm6u" id="7lhbwV9SBjc" role="2r_lH1" />
+                        </node>
+                        <node concept="2r$n1x" id="7lhbwV9SBjd" role="2r_Bvh">
+                          <ref role="2r$qp6" node="3RmCGNRoyUj" resolve="nonStructuralChildren" />
+                          <node concept="2YIFZM" id="7lhbwV9SBje" role="2r_lH1">
+                            <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
+                            <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+                            <node concept="3Tqbb2" id="7lhbwV9SBjf" role="3PaCim" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="7lhbwV9SBjg" role="3cqZAp">
+                    <node concept="37vLTw" id="7lhbwV9SBjh" role="3clFbG">
+                      <ref role="3cqZAo" node="7lhbwV9SBj3" resolve="data" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3y3z36" id="2VCmq77U9xO" role="3clFbw">
-            <node concept="10Nm6u" id="2VCmq77U9G5" role="3uHU7w" />
-            <node concept="37vLTw" id="2VCmq77U9j$" role="3uHU7B">
-              <ref role="3cqZAo" node="2VCmq77U8XO" resolve="pivot" />
-            </node>
-          </node>
         </node>
-        <node concept="3clFbF" id="2VCmq783LYF" role="3cqZAp">
-          <node concept="2YIFZM" id="2VCmq783Mlx" role="3clFbG">
-            <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
-            <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-          </node>
+      </node>
+      <node concept="3uibUv" id="2VCmq77U4UU" role="3clF45">
+        <ref role="3uigEE" to="33ny:~Optional" resolve="Optional" />
+        <node concept="3uibUv" id="7lhbwV9S8US" role="11_B2D">
+          <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
         </node>
       </node>
     </node>
@@ -19203,7 +19227,7 @@
         </node>
         <node concept="3cpWs8" id="5zD5ovlZFHR" role="3cqZAp">
           <node concept="3cpWsn" id="5zD5ovlZFHS" role="3cpWs9">
-            <property role="TrG5h" value="pivots" />
+            <property role="TrG5h" value="pivotMaybe" />
             <node concept="2OqwBi" id="5zD5ovlZFHT" role="33vP2m">
               <node concept="37vLTw" id="6EGd7WxFQD" role="2Oq$k0">
                 <ref role="3cqZAo" node="6EGd7Wxypg" resolve="contextIVAA" />
@@ -19215,8 +19239,9 @@
                 </node>
               </node>
             </node>
-            <node concept="3vKaQO" id="2VCmq783EjJ" role="1tU5fm">
-              <node concept="3uibUv" id="2VCmq783EjK" role="3O5elw">
+            <node concept="3uibUv" id="3MGre_5Y7V4" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~Optional" resolve="Optional" />
+              <node concept="3uibUv" id="3MGre_5Y9Qq" role="11_B2D">
                 <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
               </node>
             </node>
@@ -19258,92 +19283,146 @@
           </node>
           <node concept="9aQIb" id="1ZWkc2up$iB" role="9aQIa">
             <node concept="3clFbS" id="1ZWkc2up$iC" role="9aQI4">
+              <node concept="3cpWs8" id="3MGre_5YnKE" role="3cqZAp">
+                <node concept="3cpWsn" id="3MGre_5YnKF" role="3cpWs9">
+                  <property role="TrG5h" value="pivotData" />
+                  <node concept="3uibUv" id="3MGre_5Yz_h" role="1tU5fm">
+                    <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
+                  </node>
+                  <node concept="2OqwBi" id="3MGre_5YnKG" role="33vP2m">
+                    <node concept="37vLTw" id="3MGre_5YnKH" role="2Oq$k0">
+                      <ref role="3cqZAo" node="5zD5ovlZFHS" resolve="pivotMaybe" />
+                    </node>
+                    <node concept="liA8E" id="3MGre_5YnKI" role="2OqNvi">
+                      <ref role="37wK5l" to="33ny:~Optional.get()" resolve="get" />
+                    </node>
+                  </node>
+                </node>
+              </node>
               <node concept="3cpWs6" id="2VCmq7849E3" role="3cqZAp">
-                <node concept="2OqwBi" id="6_IBsN5N6Xz" role="3cqZAk">
-                  <node concept="37vLTw" id="6_IBsN5N6X$" role="2Oq$k0">
-                    <ref role="3cqZAo" node="5zD5ovlZFHS" resolve="pivots" />
-                  </node>
-                  <node concept="3$u5V9" id="6_IBsN5N6X_" role="2OqNvi">
-                    <node concept="1bVj0M" id="6_IBsN5N6XA" role="23t8la">
-                      <node concept="3clFbS" id="6_IBsN5N6XB" role="1bW5cS">
-                        <node concept="3SKdUt" id="6_IBsN5N6XC" role="3cqZAp">
-                          <node concept="1PaTwC" id="6_IBsN5N6XD" role="1aUNEU">
-                            <node concept="3oM_SD" id="6_IBsN5N6XE" role="1PaTwD">
-                              <property role="3oM_SC" value="reference" />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XF" role="1PaTwD">
-                              <property role="3oM_SC" value="to" />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XG" role="1PaTwD">
-                              <property role="3oM_SC" value="a" />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XH" role="1PaTwD">
-                              <property role="3oM_SC" value="pivot" />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XI" role="1PaTwD">
-                              <property role="3oM_SC" value="node," />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XJ" role="1PaTwD">
-                              <property role="3oM_SC" value="add" />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XK" role="1PaTwD">
-                              <property role="3oM_SC" value="relative" />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XL" role="1PaTwD">
-                              <property role="3oM_SC" value="path" />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XM" role="1PaTwD">
-                              <property role="3oM_SC" value="(only" />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XN" role="1PaTwD">
-                              <property role="3oM_SC" value="one" />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XO" role="1PaTwD">
-                              <property role="3oM_SC" value="segment)" />
+                <node concept="2OqwBi" id="3MGre_5Z$0k" role="3cqZAk">
+                  <node concept="2OqwBi" id="6_IBsN5N6Xz" role="2Oq$k0">
+                    <node concept="2OqwBi" id="3MGre_5YArP" role="2Oq$k0">
+                      <node concept="37vLTw" id="3MGre_5YnKJ" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3MGre_5YnKF" resolve="pivotData" />
+                      </node>
+                      <node concept="2sxana" id="3MGre_5YD8k" role="2OqNvi">
+                        <ref role="2sxfKC" node="7lhbwV9MdDg" resolve="pivotInstantiations" />
+                      </node>
+                    </node>
+                    <node concept="3$u5V9" id="6_IBsN5N6X_" role="2OqNvi">
+                      <node concept="1bVj0M" id="6_IBsN5N6XA" role="23t8la">
+                        <node concept="3clFbS" id="6_IBsN5N6XB" role="1bW5cS">
+                          <node concept="3SKdUt" id="6_IBsN5N6XC" role="3cqZAp">
+                            <node concept="1PaTwC" id="6_IBsN5N6XD" role="1aUNEU">
+                              <node concept="3oM_SD" id="6_IBsN5N6XE" role="1PaTwD">
+                                <property role="3oM_SC" value="reference" />
+                              </node>
+                              <node concept="3oM_SD" id="6_IBsN5N6XF" role="1PaTwD">
+                                <property role="3oM_SC" value="to" />
+                              </node>
+                              <node concept="3oM_SD" id="6_IBsN5N6XG" role="1PaTwD">
+                                <property role="3oM_SC" value="a" />
+                              </node>
+                              <node concept="3oM_SD" id="6_IBsN5N6XH" role="1PaTwD">
+                                <property role="3oM_SC" value="pivot" />
+                              </node>
+                              <node concept="3oM_SD" id="6_IBsN5N6XI" role="1PaTwD">
+                                <property role="3oM_SC" value="node," />
+                              </node>
+                              <node concept="3oM_SD" id="6_IBsN5N6XJ" role="1PaTwD">
+                                <property role="3oM_SC" value="add" />
+                              </node>
+                              <node concept="3oM_SD" id="6_IBsN5N6XK" role="1PaTwD">
+                                <property role="3oM_SC" value="relative" />
+                              </node>
+                              <node concept="3oM_SD" id="6_IBsN5N6XL" role="1PaTwD">
+                                <property role="3oM_SC" value="path" />
+                              </node>
+                              <node concept="3oM_SD" id="6_IBsN5N6XM" role="1PaTwD">
+                                <property role="3oM_SC" value="(only" />
+                              </node>
+                              <node concept="3oM_SD" id="6_IBsN5N6XN" role="1PaTwD">
+                                <property role="3oM_SC" value="one" />
+                              </node>
+                              <node concept="3oM_SD" id="6_IBsN5N6XO" role="1PaTwD">
+                                <property role="3oM_SC" value="segment)" />
+                              </node>
                             </node>
                           </node>
-                        </node>
-                        <node concept="3clFbF" id="6_IBsN5N6XP" role="3cqZAp">
-                          <node concept="2ShNRf" id="6_IBsN5N6XQ" role="3clFbG">
-                            <node concept="1pGfFk" id="6_IBsN5N6XR" role="2ShVmc">
-                              <property role="373rjd" value="true" />
-                              <ref role="37wK5l" node="1ZWkc2uwbkl" resolve="ReferenceResolved" />
-                              <node concept="37vLTw" id="6_IBsN5N6XS" role="37wK5m">
-                                <ref role="3cqZAo" node="6EGd7Wxz2j" resolve="ref" />
-                              </node>
-                              <node concept="2OqwBi" id="6_IBsN5N6XT" role="37wK5m">
-                                <node concept="2OqwBi" id="6_IBsN5N6XU" role="2Oq$k0">
+                          <node concept="3clFbF" id="6_IBsN5N6XP" role="3cqZAp">
+                            <node concept="2ShNRf" id="6_IBsN5N6XQ" role="3clFbG">
+                              <node concept="1pGfFk" id="6_IBsN5N6XR" role="2ShVmc">
+                                <property role="373rjd" value="true" />
+                                <ref role="37wK5l" node="1ZWkc2uwbkl" resolve="ReferenceResolved" />
+                                <node concept="37vLTw" id="6_IBsN5N6XS" role="37wK5m">
+                                  <ref role="3cqZAo" node="6EGd7Wxz2j" resolve="ref" />
+                                </node>
+                                <node concept="2OqwBi" id="6_IBsN5N6XT" role="37wK5m">
                                   <node concept="37vLTw" id="6_IBsN5N6XV" role="2Oq$k0">
                                     <ref role="3cqZAo" node="6_IBsN5N6Y3" resolve="pd" />
                                   </node>
-                                  <node concept="2sxana" id="6_IBsN5N6XW" role="2OqNvi">
-                                    <ref role="2sxfKC" node="2VCmq77SgeU" resolve="pivot" />
+                                  <node concept="liA8E" id="6_IBsN5N6XX" role="2OqNvi">
+                                    <ref role="37wK5l" node="IzpDYSRzQ5" resolve="getTargetNode" />
                                   </node>
                                 </node>
-                                <node concept="liA8E" id="6_IBsN5N6XX" role="2OqNvi">
-                                  <ref role="37wK5l" node="IzpDYSRzQ5" resolve="getTargetNode" />
-                                </node>
-                              </node>
-                              <node concept="2OqwBi" id="6_IBsN5N6XY" role="37wK5m">
-                                <node concept="2OqwBi" id="6_IBsN5N6XZ" role="2Oq$k0">
+                                <node concept="2OqwBi" id="6_IBsN5N6XY" role="37wK5m">
                                   <node concept="37vLTw" id="6_IBsN5N6Y0" role="2Oq$k0">
                                     <ref role="3cqZAo" node="6_IBsN5N6Y3" resolve="pd" />
                                   </node>
-                                  <node concept="2sxana" id="6_IBsN5N6Y1" role="2OqNvi">
-                                    <ref role="2sxfKC" node="2VCmq77SgeU" resolve="pivot" />
+                                  <node concept="liA8E" id="6_IBsN5N6Y2" role="2OqNvi">
+                                    <ref role="37wK5l" node="1ZWkc2utFaB" resolve="asSegment" />
                                   </node>
                                 </node>
-                                <node concept="liA8E" id="6_IBsN5N6Y2" role="2OqNvi">
-                                  <ref role="37wK5l" node="1ZWkc2utFaB" resolve="asSegment" />
-                                </node>
                               </node>
                             </node>
                           </node>
                         </node>
+                        <node concept="gl6BB" id="6_IBsN5N6Y3" role="1bW2Oz">
+                          <property role="TrG5h" value="pd" />
+                          <node concept="2jxLKc" id="6_IBsN5N6Y4" role="1tU5fm" />
+                        </node>
                       </node>
-                      <node concept="gl6BB" id="6_IBsN5N6Y3" role="1bW2Oz">
-                        <property role="TrG5h" value="pd" />
-                        <node concept="2jxLKc" id="6_IBsN5N6Y4" role="1tU5fm" />
+                    </node>
+                  </node>
+                  <node concept="4Tj9Z" id="3MGre_5ZBnq" role="2OqNvi">
+                    <node concept="2YIFZM" id="3MGre_5ZDTO" role="576Qk">
+                      <ref role="37wK5l" to="33ny:~Collections.singleton(java.lang.Object)" resolve="singleton" />
+                      <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+                      <node concept="2ShNRf" id="3MGre_5ZItB" role="37wK5m">
+                        <node concept="1pGfFk" id="3MGre_5ZItC" role="2ShVmc">
+                          <property role="373rjd" value="true" />
+                          <ref role="37wK5l" node="1ZWkc2uwbkl" resolve="ReferenceResolved" />
+                          <node concept="37vLTw" id="3MGre_5ZItD" role="37wK5m">
+                            <ref role="3cqZAo" node="6EGd7Wxz2j" resolve="ref" />
+                          </node>
+                          <node concept="2OqwBi" id="3MGre_5ZItE" role="37wK5m">
+                            <node concept="2OqwBi" id="3MGre_5ZItF" role="2Oq$k0">
+                              <node concept="37vLTw" id="3MGre_5ZItG" role="2Oq$k0">
+                                <ref role="3cqZAo" node="3MGre_5YnKF" resolve="pivotData" />
+                              </node>
+                              <node concept="2sxana" id="3MGre_5ZItH" role="2OqNvi">
+                                <ref role="2sxfKC" node="2VCmq77SgeU" resolve="pivot" />
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="3MGre_5ZItI" role="2OqNvi">
+                              <ref role="37wK5l" node="IzpDYSRzQ5" resolve="getTargetNode" />
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="3MGre_5ZItJ" role="37wK5m">
+                            <node concept="2OqwBi" id="3MGre_5ZItK" role="2Oq$k0">
+                              <node concept="37vLTw" id="3MGre_5ZItL" role="2Oq$k0">
+                                <ref role="3cqZAo" node="3MGre_5YnKF" resolve="pivotData" />
+                              </node>
+                              <node concept="2sxana" id="3MGre_5ZItM" role="2OqNvi">
+                                <ref role="2sxfKC" node="2VCmq77SgeU" resolve="pivot" />
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="3MGre_5ZItN" role="2OqNvi">
+                              <ref role="37wK5l" node="1ZWkc2utFaB" resolve="asSegment" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -19355,7 +19434,9 @@
             <node concept="37vLTw" id="5zD5ovlZHtd" role="2Oq$k0">
               <ref role="3cqZAo" node="5zD5ovlZFHS" resolve="pivots" />
             </node>
-            <node concept="1v1jN8" id="2VCmq783R80" role="2OqNvi" />
+            <node concept="liA8E" id="3MGre_5YbRX" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Optional.isEmpty()" resolve="isEmpty" />
+            </node>
           </node>
         </node>
       </node>
@@ -26409,6 +26490,14 @@
         <ref role="3uigEE" node="IzpDYSOg6$" resolve="Pivot" />
       </node>
     </node>
+    <node concept="2lGYhJ" id="7lhbwV9MdDg" role="2pHZQ9">
+      <property role="TrG5h" value="pivotInstantiations" />
+      <node concept="3vKaQO" id="7lhbwV9MdPv" role="2lK19J">
+        <node concept="3uibUv" id="7lhbwV9MecJ" role="3O5elw">
+          <ref role="3uigEE" node="IzpDYSOg6$" resolve="Pivot" />
+        </node>
+      </node>
+    </node>
     <node concept="2lGYhJ" id="2VCmq77SrOB" role="2pHZQ9">
       <property role="TrG5h" value="pivotDependentsOn" />
       <node concept="3Tqbb2" id="2VCmq77SrPK" role="2lK19J" />
@@ -26429,17 +26518,22 @@
       </node>
       <node concept="TZ5HA" id="6_IBsN5O95$" role="TZ5H$">
         <node concept="1dT_AC" id="6_IBsN5O95_" role="1dT_Ay">
-          <property role="1dT_AB" value="1. The Pivot which stands for 'instantiatin'" />
+          <property role="1dT_AB" value="1. The Pivot which stands for 'instantiation'" />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="7lhbwV9MfZk" role="TZ5H$">
+        <node concept="1dT_AC" id="7lhbwV9MfZl" role="1dT_Ay">
+          <property role="1dT_AB" value="2. A collection of possible instantiations " />
         </node>
       </node>
       <node concept="TZ5HA" id="6_IBsN5O95G" role="TZ5H$">
         <node concept="1dT_AC" id="6_IBsN5O95H" role="1dT_Ay">
-          <property role="1dT_AB" value="2. 'dependsOn' states a dependeny between a node 'n' and the Pivot. if 'n' is erased then also the Pivot" />
+          <property role="1dT_AB" value="3. 'dependsOn' states a dependeny between a node 'n' and the Pivot. if 'n' is erased then also the Pivot" />
         </node>
       </node>
       <node concept="TZ5HA" id="6_IBsN5O95O" role="TZ5H$">
         <node concept="1dT_AC" id="6_IBsN5O95P" role="1dT_Ay">
-          <property role="1dT_AB" value="3. 'nonStructuralChildren' are children of the Pivot, which it does not directly contain. A scenario are children inherited from" />
+          <property role="1dT_AB" value="4. 'nonStructuralChildren' are children of the Pivot, which it does not directly contain. A scenario are children inherited from" />
         </node>
       </node>
       <node concept="TZ5HA" id="6_IBsN5O95W" role="TZ5H$">

From 66f1b55d25526b1eb48280a8881c726d3870b913 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Thu, 26 Feb 2026 12:03:34 +0100
Subject: [PATCH 18/22] replaece 'instantiatedSubtree2' with new version
 (#1474)

---
 ...s3.variability.artifacts.base.behavior.mps | 720 ++++++++++++++----
 1 file changed, 583 insertions(+), 137 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index 173de794fa..0712d6ea5a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -81,6 +81,7 @@
       <concept id="1239462176079" name="jetbrains.mps.baseLanguage.tuples.structure.NamedTupleComponentDeclaration" flags="ng" index="2lGYhJ">
         <child id="1239462974287" name="type" index="2lK19J" />
       </concept>
+      <concept id="1239531918181" name="jetbrains.mps.baseLanguage.tuples.structure.NamedTupleType" flags="in" index="2pR195" />
       <concept id="1239559992092" name="jetbrains.mps.baseLanguage.tuples.structure.NamedTupleLiteral" flags="nn" index="2ry78W">
         <reference id="1239560008022" name="tupleDeclaration" index="2ryb1Q" />
         <child id="1239560910577" name="componentRef" index="2r_Bvh" />
@@ -4682,79 +4683,88 @@
         <node concept="3Tqbb2" id="5LihCoMjq2r" role="1tU5fm" />
       </node>
     </node>
-    <node concept="13i0hz" id="2VCmq77U2fp" role="13h7CS">
+    <node concept="13i0hz" id="1C4m4CTficZ" role="13h7CS">
       <property role="13i0it" value="true" />
-      <property role="TrG5h" value="getInstantiatedSubtree2" />
-      <node concept="37vLTG" id="2VCmq77U4Tb" role="3clF46">
+      <property role="TrG5h" value="getInstantiatedSubtree3" />
+      <node concept="37vLTG" id="1C4m4CTfid0" role="3clF46">
         <property role="TrG5h" value="n" />
-        <node concept="3Tqbb2" id="2VCmq77U4T_" role="1tU5fm" />
+        <node concept="3Tqbb2" id="1C4m4CTfid1" role="1tU5fm" />
       </node>
-      <node concept="3Tm1VV" id="2VCmq77U2fq" role="1B3o_S" />
-      <node concept="3vKaQO" id="2VCmq77U4UT" role="3clF45">
-        <node concept="3uibUv" id="2VCmq77U4UU" role="3O5elw">
-          <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
+      <node concept="3Tm1VV" id="1C4m4CTfid2" role="1B3o_S" />
+      <node concept="3uibUv" id="4ooUvfp6KLC" role="3clF45">
+        <ref role="3uigEE" to="33ny:~Optional" resolve="Optional" />
+        <node concept="3uibUv" id="1C4m4CTkBRT" role="11_B2D">
+          <ref role="3uigEE" node="4ooUvfoXIrs" resolve="PivotHierarchy" />
         </node>
       </node>
-      <node concept="3clFbS" id="2VCmq77U2fs" role="3clF47">
-        <node concept="3cpWs8" id="2VCmq77U8XN" role="3cqZAp">
-          <node concept="3cpWsn" id="2VCmq77U8XO" role="3cpWs9">
-            <property role="TrG5h" value="pivot" />
-            <node concept="3uibUv" id="2VCmq77U8Rv" role="1tU5fm">
-              <ref role="3uigEE" node="IzpDYSOg6$" resolve="Pivot" />
-            </node>
-            <node concept="2OqwBi" id="2VCmq77U8XP" role="33vP2m">
-              <node concept="13iPFW" id="2VCmq77U8XQ" role="2Oq$k0" />
-              <node concept="2qgKlT" id="2VCmq77U8XR" role="2OqNvi">
-                <ref role="37wK5l" node="5LihCoMjncG" resolve="getInstantiatedSubtree" />
-                <node concept="37vLTw" id="2VCmq77U8XS" role="37wK5m">
-                  <ref role="3cqZAo" node="2VCmq77U4Tb" resolve="n" />
+      <node concept="3clFbS" id="1C4m4CTfid3" role="3clF47">
+        <node concept="3clFbF" id="1C4m4CTkDwL" role="3cqZAp">
+          <node concept="2OqwBi" id="1C4m4CTkKi3" role="3clFbG">
+            <node concept="2YIFZM" id="1C4m4CTkEAN" role="2Oq$k0">
+              <ref role="37wK5l" to="33ny:~Optional.ofNullable(java.lang.Object)" resolve="ofNullable" />
+              <ref role="1Pybhc" to="33ny:~Optional" resolve="Optional" />
+              <node concept="2OqwBi" id="1C4m4CTl2$O" role="37wK5m">
+                <node concept="13iPFW" id="1C4m4CTl2$P" role="2Oq$k0" />
+                <node concept="2qgKlT" id="1C4m4CTl2$Q" role="2OqNvi">
+                  <ref role="37wK5l" node="5LihCoMjncG" resolve="getInstantiatedSubtree" />
+                  <node concept="37vLTw" id="1C4m4CTl2$R" role="37wK5m">
+                    <ref role="3cqZAo" node="1C4m4CTfid0" resolve="n" />
+                  </node>
                 </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="2VCmq77U9ie" role="3cqZAp">
-          <node concept="3clFbS" id="2VCmq77U9ig" role="3clFbx">
-            <node concept="3cpWs6" id="2VCmq77UH1D" role="3cqZAp">
-              <node concept="2YIFZM" id="2VCmq77UHhz" role="3cqZAk">
-                <ref role="37wK5l" to="33ny:~Collections.singleton(java.lang.Object)" resolve="singleton" />
-                <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-                <node concept="2ry78W" id="2VCmq77UIdZ" role="37wK5m">
-                  <ref role="2ryb1Q" node="2VCmq77Sge8" resolve="PivotData" />
-                  <node concept="2r$n1x" id="2VCmq77UIe0" role="2r_Bvh">
-                    <ref role="2r$qp6" node="2VCmq77SgeU" resolve="pivot" />
-                    <node concept="37vLTw" id="2VCmq77UIe1" role="2r_lH1">
-                      <ref role="3cqZAo" node="2VCmq77U8XO" resolve="pivot" />
-                    </node>
-                  </node>
-                  <node concept="2r$n1x" id="2VCmq77UIe2" role="2r_Bvh">
-                    <ref role="2r$qp6" node="2VCmq77SrOB" resolve="pivotDependentsOn" />
-                    <node concept="10Nm6u" id="5QTJbF9Nc8r" role="2r_lH1" />
-                  </node>
-                  <node concept="2r$n1x" id="3RmCGNRGW1H" role="2r_Bvh">
-                    <ref role="2r$qp6" node="3RmCGNRoyUj" resolve="nonStructuralChildren" />
-                    <node concept="2YIFZM" id="3RmCGNRGX3w" role="2r_lH1">
-                      <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
-                      <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-                      <node concept="3Tqbb2" id="3RmCGNRGXPG" role="3PaCim" />
+            <node concept="liA8E" id="1C4m4CTkLCl" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Optional.map(java.util.function.Function)" resolve="map" />
+              <node concept="1bVj0M" id="1C4m4CTkN6p" role="37wK5m">
+                <node concept="gl6BB" id="1C4m4CTkN6G" role="1bW2Oz">
+                  <property role="TrG5h" value="pivot" />
+                  <node concept="2jxLKc" id="1C4m4CTkN6H" role="1tU5fm" />
+                </node>
+                <node concept="3clFbS" id="1C4m4CTkN6I" role="1bW5cS">
+                  <node concept="3cpWs8" id="1C4m4CTkQUq" role="3cqZAp">
+                    <node concept="3cpWsn" id="1C4m4CTkQUr" role="3cpWs9">
+                      <property role="TrG5h" value="data" />
+                      <node concept="2pR195" id="1C4m4CTkQUs" role="1tU5fm">
+                        <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
+                      </node>
+                      <node concept="2ry78W" id="1C4m4CTkQUt" role="33vP2m">
+                        <ref role="2ryb1Q" node="2VCmq77Sge8" resolve="PivotData" />
+                        <node concept="2r$n1x" id="1C4m4CTkQUu" role="2r_Bvh">
+                          <ref role="2r$qp6" node="2VCmq77SgeU" resolve="pivot" />
+                          <node concept="37vLTw" id="1C4m4CTkQUv" role="2r_lH1">
+                            <ref role="3cqZAo" node="1C4m4CTkN6G" resolve="pivot" />
+                          </node>
+                        </node>
+                        <node concept="2r$n1x" id="1C4m4CTkQUw" role="2r_Bvh">
+                          <ref role="2r$qp6" node="2VCmq77SrOB" resolve="pivotDependentsOn" />
+                          <node concept="10Nm6u" id="1C4m4CTkQUx" role="2r_lH1" />
+                        </node>
+                        <node concept="2r$n1x" id="1C4m4CTkQUy" role="2r_Bvh">
+                          <ref role="2r$qp6" node="3RmCGNRoyUj" resolve="nonStructuralChildren" />
+                          <node concept="2YIFZM" id="1C4m4CTkQUz" role="2r_lH1">
+                            <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
+                            <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+                            <node concept="3Tqbb2" id="1C4m4CTkQU$" role="3PaCim" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cpWs6" id="1C4m4CTkQU_" role="3cqZAp">
+                    <node concept="2ShNRf" id="1C4m4CTkQUA" role="3cqZAk">
+                      <node concept="1pGfFk" id="1C4m4CTkQUB" role="2ShVmc">
+                        <property role="373rjd" value="true" />
+                        <ref role="37wK5l" node="4ooUvfp6Lgd" />
+                        <node concept="37vLTw" id="1C4m4CTkQUC" role="37wK5m">
+                          <ref role="3cqZAo" node="1C4m4CTkQUr" resolve="data" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3y3z36" id="2VCmq77U9xO" role="3clFbw">
-            <node concept="10Nm6u" id="2VCmq77U9G5" role="3uHU7w" />
-            <node concept="37vLTw" id="2VCmq77U9j$" role="3uHU7B">
-              <ref role="3cqZAo" node="2VCmq77U8XO" resolve="pivot" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="2VCmq783LYF" role="3cqZAp">
-          <node concept="2YIFZM" id="2VCmq783Mlx" role="3clFbG">
-            <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
-            <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-          </node>
         </node>
       </node>
     </node>
@@ -19209,15 +19219,16 @@
                 <ref role="3cqZAo" node="6EGd7Wxypg" resolve="contextIVAA" />
               </node>
               <node concept="2qgKlT" id="5zD5ovlZFHV" role="2OqNvi">
-                <ref role="37wK5l" node="2VCmq77U2fp" resolve="getInstantiatedSubtree2" />
+                <ref role="37wK5l" node="1C4m4CTficZ" resolve="getInstantiatedSubtree3" />
                 <node concept="37vLTw" id="5zD5ovlZFHW" role="37wK5m">
                   <ref role="3cqZAo" node="5zD5ovlZCzt" resolve="refTarget" />
                 </node>
               </node>
             </node>
-            <node concept="3vKaQO" id="2VCmq783EjJ" role="1tU5fm">
-              <node concept="3uibUv" id="2VCmq783EjK" role="3O5elw">
-                <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
+            <node concept="3uibUv" id="1C4m4CTBOhK" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~Optional" resolve="Optional" />
+              <node concept="3uibUv" id="1C4m4CTBOhN" role="11_B2D">
+                <ref role="3uigEE" node="4ooUvfoXIrs" resolve="PivotHierarchy" />
               </node>
             </node>
           </node>
@@ -19258,92 +19269,166 @@
           </node>
           <node concept="9aQIb" id="1ZWkc2up$iB" role="9aQIa">
             <node concept="3clFbS" id="1ZWkc2up$iC" role="9aQI4">
+              <node concept="3cpWs8" id="1C4m4CTCXU1" role="3cqZAp">
+                <node concept="3cpWsn" id="1C4m4CTCXU2" role="3cpWs9">
+                  <property role="TrG5h" value="representative" />
+                  <node concept="3uibUv" id="1C4m4CTCW_V" role="1tU5fm">
+                    <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
+                  </node>
+                  <node concept="2OqwBi" id="1C4m4CTCXU3" role="33vP2m">
+                    <node concept="2OqwBi" id="1C4m4CTCXU4" role="2Oq$k0">
+                      <node concept="37vLTw" id="1C4m4CTCXU5" role="2Oq$k0">
+                        <ref role="3cqZAo" node="5zD5ovlZFHS" resolve="pivots" />
+                      </node>
+                      <node concept="liA8E" id="1C4m4CTCXU6" role="2OqNvi">
+                        <ref role="37wK5l" to="33ny:~Optional.get()" resolve="get" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="1C4m4CTCXU7" role="2OqNvi">
+                      <ref role="37wK5l" node="4ooUvfoYu4T" resolve="representative" />
+                    </node>
+                  </node>
+                </node>
+              </node>
               <node concept="3cpWs6" id="2VCmq7849E3" role="3cqZAp">
-                <node concept="2OqwBi" id="6_IBsN5N6Xz" role="3cqZAk">
-                  <node concept="37vLTw" id="6_IBsN5N6X$" role="2Oq$k0">
-                    <ref role="3cqZAo" node="5zD5ovlZFHS" resolve="pivots" />
-                  </node>
-                  <node concept="3$u5V9" id="6_IBsN5N6X_" role="2OqNvi">
-                    <node concept="1bVj0M" id="6_IBsN5N6XA" role="23t8la">
-                      <node concept="3clFbS" id="6_IBsN5N6XB" role="1bW5cS">
-                        <node concept="3SKdUt" id="6_IBsN5N6XC" role="3cqZAp">
-                          <node concept="1PaTwC" id="6_IBsN5N6XD" role="1aUNEU">
-                            <node concept="3oM_SD" id="6_IBsN5N6XE" role="1PaTwD">
-                              <property role="3oM_SC" value="reference" />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XF" role="1PaTwD">
-                              <property role="3oM_SC" value="to" />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XG" role="1PaTwD">
-                              <property role="3oM_SC" value="a" />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XH" role="1PaTwD">
-                              <property role="3oM_SC" value="pivot" />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XI" role="1PaTwD">
-                              <property role="3oM_SC" value="node," />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XJ" role="1PaTwD">
-                              <property role="3oM_SC" value="add" />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XK" role="1PaTwD">
-                              <property role="3oM_SC" value="relative" />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XL" role="1PaTwD">
-                              <property role="3oM_SC" value="path" />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XM" role="1PaTwD">
-                              <property role="3oM_SC" value="(only" />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XN" role="1PaTwD">
-                              <property role="3oM_SC" value="one" />
-                            </node>
-                            <node concept="3oM_SD" id="6_IBsN5N6XO" role="1PaTwD">
-                              <property role="3oM_SC" value="segment)" />
-                            </node>
-                          </node>
+                <node concept="2OqwBi" id="1C4m4CTC8BA" role="3cqZAk">
+                  <node concept="2OqwBi" id="6_IBsN5N6Xz" role="2Oq$k0">
+                    <node concept="2OqwBi" id="1C4m4CTC5VT" role="2Oq$k0">
+                      <node concept="2OqwBi" id="1C4m4CTC2mb" role="2Oq$k0">
+                        <node concept="37vLTw" id="6_IBsN5N6X$" role="2Oq$k0">
+                          <ref role="3cqZAo" node="5zD5ovlZFHS" resolve="pivots" />
+                        </node>
+                        <node concept="liA8E" id="1C4m4CTC4NB" role="2OqNvi">
+                          <ref role="37wK5l" to="33ny:~Optional.get()" resolve="get" />
                         </node>
-                        <node concept="3clFbF" id="6_IBsN5N6XP" role="3cqZAp">
-                          <node concept="2ShNRf" id="6_IBsN5N6XQ" role="3clFbG">
-                            <node concept="1pGfFk" id="6_IBsN5N6XR" role="2ShVmc">
-                              <property role="373rjd" value="true" />
-                              <ref role="37wK5l" node="1ZWkc2uwbkl" resolve="ReferenceResolved" />
-                              <node concept="37vLTw" id="6_IBsN5N6XS" role="37wK5m">
-                                <ref role="3cqZAo" node="6EGd7Wxz2j" resolve="ref" />
+                      </node>
+                      <node concept="liA8E" id="1C4m4CTC765" role="2OqNvi">
+                        <ref role="37wK5l" node="4ooUvfoYKTK" resolve="implementations" />
+                      </node>
+                    </node>
+                    <node concept="3$u5V9" id="6_IBsN5N6X_" role="2OqNvi">
+                      <node concept="1bVj0M" id="6_IBsN5N6XA" role="23t8la">
+                        <node concept="3clFbS" id="6_IBsN5N6XB" role="1bW5cS">
+                          <node concept="3SKdUt" id="6_IBsN5N6XC" role="3cqZAp">
+                            <node concept="1PaTwC" id="6_IBsN5N6XD" role="1aUNEU">
+                              <node concept="3oM_SD" id="6_IBsN5N6XE" role="1PaTwD">
+                                <property role="3oM_SC" value="reference" />
+                              </node>
+                              <node concept="3oM_SD" id="6_IBsN5N6XF" role="1PaTwD">
+                                <property role="3oM_SC" value="to" />
+                              </node>
+                              <node concept="3oM_SD" id="6_IBsN5N6XG" role="1PaTwD">
+                                <property role="3oM_SC" value="a" />
+                              </node>
+                              <node concept="3oM_SD" id="6_IBsN5N6XH" role="1PaTwD">
+                                <property role="3oM_SC" value="pivot" />
+                              </node>
+                              <node concept="3oM_SD" id="6_IBsN5N6XI" role="1PaTwD">
+                                <property role="3oM_SC" value="node," />
+                              </node>
+                              <node concept="3oM_SD" id="6_IBsN5N6XJ" role="1PaTwD">
+                                <property role="3oM_SC" value="add" />
+                              </node>
+                              <node concept="3oM_SD" id="6_IBsN5N6XK" role="1PaTwD">
+                                <property role="3oM_SC" value="relative" />
                               </node>
-                              <node concept="2OqwBi" id="6_IBsN5N6XT" role="37wK5m">
-                                <node concept="2OqwBi" id="6_IBsN5N6XU" role="2Oq$k0">
-                                  <node concept="37vLTw" id="6_IBsN5N6XV" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6_IBsN5N6Y3" resolve="pd" />
+                              <node concept="3oM_SD" id="6_IBsN5N6XL" role="1PaTwD">
+                                <property role="3oM_SC" value="path" />
+                              </node>
+                              <node concept="3oM_SD" id="6_IBsN5N6XM" role="1PaTwD">
+                                <property role="3oM_SC" value="(only" />
+                              </node>
+                              <node concept="3oM_SD" id="6_IBsN5N6XN" role="1PaTwD">
+                                <property role="3oM_SC" value="one" />
+                              </node>
+                              <node concept="3oM_SD" id="6_IBsN5N6XO" role="1PaTwD">
+                                <property role="3oM_SC" value="segment)" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbF" id="6_IBsN5N6XP" role="3cqZAp">
+                            <node concept="2ShNRf" id="6_IBsN5N6XQ" role="3clFbG">
+                              <node concept="1pGfFk" id="6_IBsN5N6XR" role="2ShVmc">
+                                <property role="373rjd" value="true" />
+                                <ref role="37wK5l" node="1ZWkc2uwbkl" resolve="ReferenceResolved" />
+                                <node concept="37vLTw" id="6_IBsN5N6XS" role="37wK5m">
+                                  <ref role="3cqZAo" node="6EGd7Wxz2j" resolve="ref" />
+                                </node>
+                                <node concept="2OqwBi" id="6_IBsN5N6XT" role="37wK5m">
+                                  <node concept="2OqwBi" id="6_IBsN5N6XU" role="2Oq$k0">
+                                    <node concept="37vLTw" id="6_IBsN5N6XV" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="6_IBsN5N6Y3" resolve="pd" />
+                                    </node>
+                                    <node concept="2sxana" id="6_IBsN5N6XW" role="2OqNvi">
+                                      <ref role="2sxfKC" node="2VCmq77SgeU" resolve="pivot" />
+                                    </node>
                                   </node>
-                                  <node concept="2sxana" id="6_IBsN5N6XW" role="2OqNvi">
-                                    <ref role="2sxfKC" node="2VCmq77SgeU" resolve="pivot" />
+                                  <node concept="liA8E" id="6_IBsN5N6XX" role="2OqNvi">
+                                    <ref role="37wK5l" node="IzpDYSRzQ5" resolve="getTargetNode" />
                                   </node>
                                 </node>
-                                <node concept="liA8E" id="6_IBsN5N6XX" role="2OqNvi">
-                                  <ref role="37wK5l" node="IzpDYSRzQ5" resolve="getTargetNode" />
-                                </node>
-                              </node>
-                              <node concept="2OqwBi" id="6_IBsN5N6XY" role="37wK5m">
-                                <node concept="2OqwBi" id="6_IBsN5N6XZ" role="2Oq$k0">
-                                  <node concept="37vLTw" id="6_IBsN5N6Y0" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6_IBsN5N6Y3" resolve="pd" />
+                                <node concept="2OqwBi" id="6_IBsN5N6XY" role="37wK5m">
+                                  <node concept="2OqwBi" id="6_IBsN5N6XZ" role="2Oq$k0">
+                                    <node concept="37vLTw" id="6_IBsN5N6Y0" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="6_IBsN5N6Y3" resolve="pd" />
+                                    </node>
+                                    <node concept="2sxana" id="6_IBsN5N6Y1" role="2OqNvi">
+                                      <ref role="2sxfKC" node="2VCmq77SgeU" resolve="pivot" />
+                                    </node>
                                   </node>
-                                  <node concept="2sxana" id="6_IBsN5N6Y1" role="2OqNvi">
-                                    <ref role="2sxfKC" node="2VCmq77SgeU" resolve="pivot" />
+                                  <node concept="liA8E" id="6_IBsN5N6Y2" role="2OqNvi">
+                                    <ref role="37wK5l" node="1ZWkc2utFaB" resolve="asSegment" />
                                   </node>
                                 </node>
-                                <node concept="liA8E" id="6_IBsN5N6Y2" role="2OqNvi">
-                                  <ref role="37wK5l" node="1ZWkc2utFaB" resolve="asSegment" />
-                                </node>
                               </node>
                             </node>
                           </node>
                         </node>
+                        <node concept="gl6BB" id="6_IBsN5N6Y3" role="1bW2Oz">
+                          <property role="TrG5h" value="pd" />
+                          <node concept="2jxLKc" id="6_IBsN5N6Y4" role="1tU5fm" />
+                        </node>
                       </node>
-                      <node concept="gl6BB" id="6_IBsN5N6Y3" role="1bW2Oz">
-                        <property role="TrG5h" value="pd" />
-                        <node concept="2jxLKc" id="6_IBsN5N6Y4" role="1tU5fm" />
+                    </node>
+                  </node>
+                  <node concept="4Tj9Z" id="1C4m4CTChcl" role="2OqNvi">
+                    <node concept="2YIFZM" id="1C4m4CTCjRD" role="576Qk">
+                      <ref role="37wK5l" to="33ny:~Collections.singleton(java.lang.Object)" resolve="singleton" />
+                      <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+                      <node concept="2ShNRf" id="1C4m4CTClf1" role="37wK5m">
+                        <node concept="1pGfFk" id="1C4m4CTCEOi" role="2ShVmc">
+                          <property role="373rjd" value="true" />
+                          <ref role="37wK5l" node="1ZWkc2uwbkl" />
+                          <node concept="37vLTw" id="1C4m4CTDcnN" role="37wK5m">
+                            <ref role="3cqZAo" node="6EGd7Wxz2j" resolve="ref" />
+                          </node>
+                          <node concept="2OqwBi" id="1C4m4CTDoGY" role="37wK5m">
+                            <node concept="2OqwBi" id="1C4m4CTDedI" role="2Oq$k0">
+                              <node concept="37vLTw" id="1C4m4CTCXU8" role="2Oq$k0">
+                                <ref role="3cqZAo" node="1C4m4CTCXU2" resolve="representative" />
+                              </node>
+                              <node concept="2sxana" id="1C4m4CTDh52" role="2OqNvi">
+                                <ref role="2sxfKC" node="2VCmq77SgeU" resolve="pivot" />
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="1C4m4CTDuXZ" role="2OqNvi">
+                              <ref role="37wK5l" node="IzpDYSRzQ5" resolve="getTargetNode" />
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="1C4m4CTDGyh" role="37wK5m">
+                            <node concept="2OqwBi" id="1C4m4CTDzfa" role="2Oq$k0">
+                              <node concept="37vLTw" id="1C4m4CTDx0q" role="2Oq$k0">
+                                <ref role="3cqZAo" node="1C4m4CTCXU2" resolve="representative" />
+                              </node>
+                              <node concept="2sxana" id="1C4m4CTD_QM" role="2OqNvi">
+                                <ref role="2sxfKC" node="2VCmq77SgeU" resolve="pivot" />
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="1C4m4CTDMf4" role="2OqNvi">
+                              <ref role="37wK5l" node="1ZWkc2utFaB" resolve="asSegment" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -19351,11 +19436,13 @@
               </node>
             </node>
           </node>
-          <node concept="2OqwBi" id="2VCmq783OxA" role="3clFbw">
+          <node concept="2OqwBi" id="1C4m4CTC042" role="3clFbw">
             <node concept="37vLTw" id="5zD5ovlZHtd" role="2Oq$k0">
               <ref role="3cqZAo" node="5zD5ovlZFHS" resolve="pivots" />
             </node>
-            <node concept="1v1jN8" id="2VCmq783R80" role="2OqNvi" />
+            <node concept="liA8E" id="1C4m4CTC1iQ" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Optional.isEmpty()" resolve="isEmpty" />
+            </node>
           </node>
         </node>
       </node>
@@ -26449,5 +26536,364 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="4ooUvfoXIrs">
+    <property role="TrG5h" value="PivotHierarchy" />
+    <node concept="312cEg" id="4ooUvfoXQbb" role="jymVt">
+      <property role="TrG5h" value="representative" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3uibUv" id="4ooUvfoXL5o" role="1tU5fm">
+        <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
+      </node>
+      <node concept="3Tm6S6" id="4ooUvfoY6ym" role="1B3o_S" />
+    </node>
+    <node concept="312cEg" id="4ooUvfoY1hv" role="jymVt">
+      <property role="TrG5h" value="implementations" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3vKaQO" id="4ooUvfoXVj5" role="1tU5fm">
+        <node concept="3uibUv" id="4ooUvfoXW0U" role="3O5elw">
+          <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="4ooUvfoY7qk" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="4ooUvfoXL5$" role="jymVt" />
+    <node concept="3Tm1VV" id="4ooUvfoXIrt" role="1B3o_S" />
+    <node concept="3clFbW" id="4ooUvfoY8t$" role="jymVt">
+      <node concept="3cqZAl" id="4ooUvfoY8t_" role="3clF45" />
+      <node concept="3Tm1VV" id="4ooUvfoY8tA" role="1B3o_S" />
+      <node concept="3clFbS" id="4ooUvfoY8tB" role="3clF47">
+        <node concept="3clFbF" id="4ooUvfoY8tF" role="3cqZAp">
+          <node concept="37vLTI" id="4ooUvfoY8tG" role="3clFbG">
+            <node concept="2OqwBi" id="4ooUvfoY8tH" role="37vLTJ">
+              <node concept="Xjq3P" id="4ooUvfoY8tI" role="2Oq$k0" />
+              <node concept="2OwXpG" id="4ooUvfoY8tJ" role="2OqNvi">
+                <ref role="2Oxat5" node="4ooUvfoXQbb" resolve="representative" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="4ooUvfoY8tK" role="37vLTx">
+              <ref role="3cqZAo" node="4ooUvfoYen0" resolve="master" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4ooUvfoYen2" role="3cqZAp">
+          <node concept="37vLTI" id="4ooUvfoYen3" role="3clFbG">
+            <node concept="2OqwBi" id="4ooUvfoYen4" role="37vLTJ">
+              <node concept="Xjq3P" id="4ooUvfoYen5" role="2Oq$k0" />
+              <node concept="2OwXpG" id="4ooUvfoYen6" role="2OqNvi">
+                <ref role="2Oxat5" node="4ooUvfoY1hv" resolve="implementations" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="4ooUvfoYen7" role="37vLTx">
+              <ref role="3cqZAo" node="4ooUvfoY8tC" resolve="slaves" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="4ooUvfoY8tC" role="3clF46">
+        <property role="TrG5h" value="slaves" />
+        <node concept="3vKaQO" id="4ooUvfoY8tD" role="1tU5fm">
+          <node concept="3uibUv" id="4ooUvfoY8tE" role="3O5elw">
+            <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="4ooUvfoYen0" role="3clF46">
+        <property role="TrG5h" value="master" />
+        <node concept="3uibUv" id="4ooUvfoYen1" role="1tU5fm">
+          <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4ooUvfp6Lqb" role="jymVt" />
+    <node concept="3clFbW" id="4ooUvfp6Lgd" role="jymVt">
+      <node concept="3cqZAl" id="4ooUvfp6Lgf" role="3clF45" />
+      <node concept="3Tm1VV" id="4ooUvfp6Lgg" role="1B3o_S" />
+      <node concept="3clFbS" id="4ooUvfp6Lgh" role="3clF47">
+        <node concept="3clFbF" id="4ooUvfp6Lu2" role="3cqZAp">
+          <node concept="37vLTI" id="4ooUvfp6Lu3" role="3clFbG">
+            <node concept="2OqwBi" id="4ooUvfp6Lu4" role="37vLTJ">
+              <node concept="Xjq3P" id="4ooUvfp6Lu5" role="2Oq$k0" />
+              <node concept="2OwXpG" id="4ooUvfp6Lu6" role="2OqNvi">
+                <ref role="2Oxat5" node="4ooUvfoXQbb" resolve="representative" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="4ooUvfp6Lu7" role="37vLTx">
+              <ref role="3cqZAo" node="4ooUvfp6Lu0" resolve="representative" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4ooUvfp6LEe" role="3cqZAp">
+          <node concept="37vLTI" id="4ooUvfp6LEf" role="3clFbG">
+            <node concept="37vLTw" id="4ooUvfp6LEg" role="37vLTJ">
+              <ref role="3cqZAo" node="4ooUvfoY1hv" resolve="implementations" />
+            </node>
+            <node concept="2YIFZM" id="4ooUvfp6Mgd" role="37vLTx">
+              <ref role="37wK5l" to="33ny:~Collections.emptySet()" resolve="emptySet" />
+              <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="4ooUvfp6Lu0" role="3clF46">
+        <property role="TrG5h" value="representative" />
+        <node concept="3uibUv" id="4ooUvfp6Lu1" role="1tU5fm">
+          <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
+        </node>
+      </node>
+    </node>
+    <node concept="3clFb_" id="4ooUvfoYu4T" role="jymVt">
+      <property role="TrG5h" value="representative" />
+      <node concept="3uibUv" id="4ooUvfoYv$T" role="3clF45">
+        <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
+      </node>
+      <node concept="3Tm1VV" id="4ooUvfoYu4W" role="1B3o_S" />
+      <node concept="3clFbS" id="4ooUvfoYu4X" role="3clF47">
+        <node concept="3clFbF" id="4ooUvfoY$Pj" role="3cqZAp">
+          <node concept="2OqwBi" id="4ooUvfoY_5p" role="3clFbG">
+            <node concept="Xjq3P" id="4ooUvfoY$Pi" role="2Oq$k0" />
+            <node concept="2OwXpG" id="4ooUvfoY_$Y" role="2OqNvi">
+              <ref role="2Oxat5" node="4ooUvfoXQbb" resolve="representative" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3clFb_" id="4ooUvfoYKTK" role="jymVt">
+      <property role="TrG5h" value="implementations" />
+      <node concept="3vKaQO" id="4ooUvfoYSPj" role="3clF45">
+        <node concept="3uibUv" id="4ooUvfoYSPk" role="3O5elw">
+          <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4ooUvfoYKTM" role="1B3o_S" />
+      <node concept="3clFbS" id="4ooUvfoYKTN" role="3clF47">
+        <node concept="3clFbF" id="4ooUvfoYKTO" role="3cqZAp">
+          <node concept="2OqwBi" id="4ooUvfoYKTP" role="3clFbG">
+            <node concept="Xjq3P" id="4ooUvfoYKTQ" role="2Oq$k0" />
+            <node concept="2OwXpG" id="4ooUvfoYRYj" role="2OqNvi">
+              <ref role="2Oxat5" node="4ooUvfoY1hv" resolve="implementations" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4ooUvfoYKLc" role="jymVt" />
+    <node concept="3clFb_" id="2NgICqna6ZA" role="jymVt">
+      <property role="TrG5h" value="pivots" />
+      <node concept="A3Dl8" id="2NgICqnavPg" role="3clF45">
+        <node concept="3uibUv" id="2NgICqnaw$D" role="A3Ik2">
+          <ref role="3uigEE" node="IzpDYSOg6$" resolve="Pivot" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2NgICqna6ZD" role="1B3o_S" />
+      <node concept="3clFbS" id="2NgICqna6ZE" role="3clF47">
+        <node concept="3clFbF" id="2NgICqnagZn" role="3cqZAp">
+          <node concept="2OqwBi" id="2NgICqna_S8" role="3clFbG">
+            <node concept="2OqwBi" id="2NgICqnajE6" role="2Oq$k0">
+              <node concept="2OqwBi" id="2NgICqnahx4" role="2Oq$k0">
+                <node concept="Xjq3P" id="2NgICqnagZm" role="2Oq$k0" />
+                <node concept="2OwXpG" id="2NgICqnai7B" role="2OqNvi">
+                  <ref role="2Oxat5" node="4ooUvfoY1hv" resolve="implementations" />
+                </node>
+              </node>
+              <node concept="3$u5V9" id="2NgICqnalAt" role="2OqNvi">
+                <node concept="1bVj0M" id="2NgICqnalAv" role="23t8la">
+                  <node concept="3clFbS" id="2NgICqnalAw" role="1bW5cS">
+                    <node concept="3clFbF" id="2NgICqnam9L" role="3cqZAp">
+                      <node concept="2OqwBi" id="2NgICqnanBA" role="3clFbG">
+                        <node concept="37vLTw" id="2NgICqnam9K" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2NgICqnalAx" resolve="it" />
+                        </node>
+                        <node concept="2sxana" id="2NgICqnaq6K" role="2OqNvi">
+                          <ref role="2sxfKC" node="2VCmq77SgeU" resolve="pivot" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="gl6BB" id="2NgICqnalAx" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="2NgICqnalAy" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="4Tj9Z" id="2NgICqnaGp5" role="2OqNvi">
+              <node concept="2ShNRf" id="2NgICqnaGPt" role="576Qk">
+                <node concept="2HTt$P" id="2NgICqnbfwu" role="2ShVmc">
+                  <node concept="2OqwBi" id="2NgICqnbiCT" role="2HTEbv">
+                    <node concept="2OqwBi" id="2NgICqnbgAW" role="2Oq$k0">
+                      <node concept="Xjq3P" id="2NgICqnbgbn" role="2Oq$k0" />
+                      <node concept="2OwXpG" id="2NgICqnbhoj" role="2OqNvi">
+                        <ref role="2Oxat5" node="4ooUvfoXQbb" resolve="representative" />
+                      </node>
+                    </node>
+                    <node concept="2sxana" id="2NgICqnbkLp" role="2OqNvi">
+                      <ref role="2sxfKC" node="2VCmq77SgeU" resolve="pivot" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6nzGKvMWOlW" role="jymVt" />
+    <node concept="2YIFZL" id="6nzGKvMVG_C" role="jymVt">
+      <property role="TrG5h" value="pivots" />
+      <node concept="37vLTG" id="6nzGKvMVT7P" role="3clF46">
+        <property role="TrG5h" value="ph" />
+        <node concept="3uibUv" id="6nzGKvMVTQy" role="1tU5fm">
+          <ref role="3uigEE" to="33ny:~Optional" resolve="Optional" />
+          <node concept="3uibUv" id="6nzGKvMVYU1" role="11_B2D">
+            <ref role="3uigEE" node="4ooUvfoXIrs" resolve="PivotHierarchy" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="6nzGKvMVG_G" role="3clF47">
+        <node concept="3clFbF" id="6nzGKvMWmsC" role="3cqZAp">
+          <node concept="2OqwBi" id="6nzGKvMWvSt" role="3clFbG">
+            <node concept="2OqwBi" id="6nzGKvMWmHS" role="2Oq$k0">
+              <node concept="37vLTw" id="6nzGKvMWms_" role="2Oq$k0">
+                <ref role="3cqZAo" node="6nzGKvMVT7P" resolve="ph" />
+              </node>
+              <node concept="liA8E" id="6nzGKvMWob8" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Optional.map(java.util.function.Function)" resolve="map" />
+                <node concept="1bVj0M" id="6nzGKvMWtxA" role="37wK5m">
+                  <node concept="gl6BB" id="6nzGKvMWtxT" role="1bW2Oz">
+                    <property role="TrG5h" value="p1" />
+                    <node concept="2jxLKc" id="6nzGKvMWtxU" role="1tU5fm" />
+                  </node>
+                  <node concept="3clFbS" id="6nzGKvMWtxX" role="1bW5cS">
+                    <node concept="3clFbF" id="6nzGKvMWtU1" role="3cqZAp">
+                      <node concept="2OqwBi" id="6nzGKvMWun6" role="3clFbG">
+                        <node concept="37vLTw" id="6nzGKvMWtU0" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6nzGKvMWtxT" resolve="p1" />
+                        </node>
+                        <node concept="liA8E" id="6nzGKvMWvjU" role="2OqNvi">
+                          <ref role="37wK5l" node="2NgICqna6ZA" resolve="pivots" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="6nzGKvMWAdq" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Optional.orElse(java.lang.Object)" resolve="orElse" />
+              <node concept="2YIFZM" id="6nzGKvN0$f$" role="37wK5m">
+                <ref role="37wK5l" to="33ny:~Collections.emptySet()" resolve="emptySet" />
+                <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+                <node concept="3uibUv" id="6nzGKvN0$f_" role="3PaCim">
+                  <ref role="3uigEE" node="IzpDYSOg6$" resolve="Pivot" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="A3Dl8" id="6nzGKvMWfZ8" role="3clF45">
+        <node concept="3uibUv" id="6nzGKvMWgyl" role="A3Ik2">
+          <ref role="3uigEE" node="IzpDYSOg6$" resolve="Pivot" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6nzGKvMVG_F" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="6nzGKvMW3Xl" role="jymVt" />
+    <node concept="3clFb_" id="6nzGKvMDZrT" role="jymVt">
+      <property role="TrG5h" value="pivotData" />
+      <node concept="A3Dl8" id="6nzGKvMEa8K" role="3clF45">
+        <node concept="3uibUv" id="6nzGKvMEaOy" role="A3Ik2">
+          <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6nzGKvMDZrW" role="1B3o_S" />
+      <node concept="3clFbS" id="6nzGKvMDZrX" role="3clF47">
+        <node concept="3clFbF" id="6nzGKvMEc6V" role="3cqZAp">
+          <node concept="2OqwBi" id="6nzGKvMEc6W" role="3clFbG">
+            <node concept="2OqwBi" id="6nzGKvMEc6Y" role="2Oq$k0">
+              <node concept="Xjq3P" id="6nzGKvMEc6Z" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6nzGKvMEc70" role="2OqNvi">
+                <ref role="2Oxat5" node="4ooUvfoY1hv" resolve="implementations" />
+              </node>
+            </node>
+            <node concept="4Tj9Z" id="6nzGKvMEc7a" role="2OqNvi">
+              <node concept="2ShNRf" id="6nzGKvMEc7b" role="576Qk">
+                <node concept="2HTt$P" id="6nzGKvMEc7c" role="2ShVmc">
+                  <node concept="2OqwBi" id="6nzGKvMEc7e" role="2HTEbv">
+                    <node concept="Xjq3P" id="6nzGKvMEc7f" role="2Oq$k0" />
+                    <node concept="2OwXpG" id="6nzGKvMEc7g" role="2OqNvi">
+                      <ref role="2Oxat5" node="4ooUvfoXQbb" resolve="representative" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6nzGKvN9kMP" role="jymVt" />
+    <node concept="2YIFZL" id="6nzGKvN97U1" role="jymVt">
+      <property role="TrG5h" value="pivotDatas" />
+      <node concept="37vLTG" id="6nzGKvN97U2" role="3clF46">
+        <property role="TrG5h" value="ph" />
+        <node concept="3uibUv" id="6nzGKvN97U3" role="1tU5fm">
+          <ref role="3uigEE" to="33ny:~Optional" resolve="Optional" />
+          <node concept="3uibUv" id="6nzGKvN97U4" role="11_B2D">
+            <ref role="3uigEE" node="4ooUvfoXIrs" resolve="PivotHierarchy" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="6nzGKvN97U5" role="3clF47">
+        <node concept="3clFbF" id="6nzGKvN97U6" role="3cqZAp">
+          <node concept="2OqwBi" id="6nzGKvN97U7" role="3clFbG">
+            <node concept="2OqwBi" id="6nzGKvN97U8" role="2Oq$k0">
+              <node concept="37vLTw" id="6nzGKvN97U9" role="2Oq$k0">
+                <ref role="3cqZAo" node="6nzGKvN97U2" resolve="ph" />
+              </node>
+              <node concept="liA8E" id="6nzGKvN97Ua" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Optional.map(java.util.function.Function)" resolve="map" />
+                <node concept="1bVj0M" id="6nzGKvN97Ub" role="37wK5m">
+                  <node concept="gl6BB" id="6nzGKvN97Uc" role="1bW2Oz">
+                    <property role="TrG5h" value="p1" />
+                    <node concept="2jxLKc" id="6nzGKvN97Ud" role="1tU5fm" />
+                  </node>
+                  <node concept="3clFbS" id="6nzGKvN97Ue" role="1bW5cS">
+                    <node concept="3clFbF" id="6nzGKvN97Uf" role="3cqZAp">
+                      <node concept="2OqwBi" id="6nzGKvN97Ug" role="3clFbG">
+                        <node concept="37vLTw" id="6nzGKvN97Uh" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6nzGKvN97Uc" resolve="p1" />
+                        </node>
+                        <node concept="liA8E" id="6nzGKvN97Ui" role="2OqNvi">
+                          <ref role="37wK5l" node="6nzGKvMDZrT" resolve="pivotData" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="6nzGKvN97Uj" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Optional.orElse(java.lang.Object)" resolve="orElse" />
+              <node concept="2YIFZM" id="6nzGKvN97Uk" role="37wK5m">
+                <ref role="37wK5l" to="33ny:~Collections.emptySet()" resolve="emptySet" />
+                <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+                <node concept="3uibUv" id="6nzGKvN97Ul" role="3PaCim">
+                  <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="A3Dl8" id="6nzGKvN97Um" role="3clF45">
+        <node concept="3uibUv" id="6nzGKvN97Un" role="A3Ik2">
+          <ref role="3uigEE" node="2VCmq77Sge8" resolve="PivotData" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6nzGKvN97Uo" role="1B3o_S" />
+    </node>
+  </node>
 </model>
 

From 65e4f30551f75974e2918f189c28cc320d984b34 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Thu, 26 Feb 2026 12:05:28 +0100
Subject: [PATCH 19/22] Force save all (#1474)

---
 .../org.iets3.variability.artifacts.base.behavior.mps       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index 9f5f32167d..d0e72c329e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -4754,7 +4754,7 @@
                     <node concept="2ShNRf" id="1C4m4CTkQUA" role="3cqZAk">
                       <node concept="1pGfFk" id="1C4m4CTkQUB" role="2ShVmc">
                         <property role="373rjd" value="true" />
-                        <ref role="37wK5l" node="4ooUvfp6Lgd" />
+                        <ref role="37wK5l" node="4ooUvfp6Lgd" resolve="PivotHierarchy" />
                         <node concept="37vLTw" id="1C4m4CTkQUC" role="37wK5m">
                           <ref role="3cqZAo" node="1C4m4CTkQUr" resolve="data" />
                         </node>
@@ -19278,7 +19278,7 @@
                   <node concept="2OqwBi" id="1C4m4CTCXU3" role="33vP2m">
                     <node concept="2OqwBi" id="1C4m4CTCXU4" role="2Oq$k0">
                       <node concept="37vLTw" id="1C4m4CTCXU5" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5zD5ovlZFHS" resolve="pivots" />
+                        <ref role="3cqZAo" node="5zD5ovlZFHS" resolve="pivotMaybe" />
                       </node>
                       <node concept="liA8E" id="1C4m4CTCXU6" role="2OqNvi">
                         <ref role="37wK5l" to="33ny:~Optional.get()" resolve="get" />
@@ -19296,7 +19296,7 @@
                     <node concept="2OqwBi" id="1C4m4CTC5VT" role="2Oq$k0">
                       <node concept="2OqwBi" id="1C4m4CTC2mb" role="2Oq$k0">
                         <node concept="37vLTw" id="6_IBsN5N6X$" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5zD5ovlZFHS" resolve="pivots" />
+                          <ref role="3cqZAo" node="5zD5ovlZFHS" resolve="pivotMaybe" />
                         </node>
                         <node concept="liA8E" id="1C4m4CTC4NB" role="2OqNvi">
                           <ref role="37wK5l" to="33ny:~Optional.get()" resolve="get" />

From 97788377c791a0ec8e45c7755619861ac92a3560 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Thu, 26 Feb 2026 12:21:59 +0100
Subject: [PATCH 20/22] fix compilation issue (#1474)

---
 .../org.iets3.variability.artifacts.base.behavior.mps     | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index d0e72c329e..dd54bbb7cc 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -26496,14 +26496,6 @@
         <ref role="3uigEE" node="IzpDYSOg6$" resolve="Pivot" />
       </node>
     </node>
-    <node concept="2lGYhJ" id="7lhbwV9MdDg" role="2pHZQ9">
-      <property role="TrG5h" value="pivotInstantiations" />
-      <node concept="3vKaQO" id="7lhbwV9MdPv" role="2lK19J">
-        <node concept="3uibUv" id="7lhbwV9MecJ" role="3O5elw">
-          <ref role="3uigEE" node="IzpDYSOg6$" resolve="Pivot" />
-        </node>
-      </node>
-    </node>
     <node concept="2lGYhJ" id="2VCmq77SrOB" role="2pHZQ9">
       <property role="TrG5h" value="pivotDependentsOn" />
       <node concept="3Tqbb2" id="2VCmq77SrPK" role="2lK19J" />

From 254a7f8c022a58e5fdfb297e10593fce5592a272 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Mon, 16 Mar 2026 17:18:50 +0100
Subject: [PATCH 21/22] add setter (#1474)

---
 ...s3.variability.artifacts.base.behavior.mps | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index dd54bbb7cc..e57e4a526a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -10543,6 +10543,30 @@
         </node>
       </node>
     </node>
+    <node concept="3clFb_" id="5mu4l81RBWW" role="jymVt">
+      <property role="TrG5h" value="setInstance" />
+      <node concept="37vLTG" id="5mu4l81RS8k" role="3clF46">
+        <property role="TrG5h" value="b" />
+        <node concept="10P_77" id="5mu4l81RXQO" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="5mu4l81RBWY" role="3clF45" />
+      <node concept="3Tm1VV" id="5mu4l81RBWZ" role="1B3o_S" />
+      <node concept="3clFbS" id="5mu4l81RBX0" role="3clF47">
+        <node concept="3clFbF" id="5mu4l81RYCU" role="3cqZAp">
+          <node concept="37vLTI" id="5mu4l81SoTo" role="3clFbG">
+            <node concept="37vLTw" id="5mu4l81Stj1" role="37vLTx">
+              <ref role="3cqZAo" node="5mu4l81RS8k" resolve="b" />
+            </node>
+            <node concept="2OqwBi" id="5mu4l81S4FG" role="37vLTJ">
+              <node concept="Xjq3P" id="5mu4l81RYCT" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5mu4l81S8Gs" role="2OqNvi">
+                <ref role="2Oxat5" node="7LcJ$BbTtUp" resolve="isInstance" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="3RmCGNPRMl9" role="jymVt" />
     <node concept="3clFb_" id="3RmCGNPS1xD" role="jymVt">
       <property role="TrG5h" value="deleteOriginal" />

From fe5fdae994dbad1a3945753c13fc70e3c628a9ff Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Tue, 24 Mar 2026 10:58:42 +0100
Subject: [PATCH 22/22] Clean up (#1474)

---
 ...s3.variability.artifacts.base.behavior.mps | 27 -------------------
 1 file changed, 27 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
index e57e4a526a..a8967d42af 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
@@ -10543,30 +10543,6 @@
         </node>
       </node>
     </node>
-    <node concept="3clFb_" id="5mu4l81RBWW" role="jymVt">
-      <property role="TrG5h" value="setInstance" />
-      <node concept="37vLTG" id="5mu4l81RS8k" role="3clF46">
-        <property role="TrG5h" value="b" />
-        <node concept="10P_77" id="5mu4l81RXQO" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="5mu4l81RBWY" role="3clF45" />
-      <node concept="3Tm1VV" id="5mu4l81RBWZ" role="1B3o_S" />
-      <node concept="3clFbS" id="5mu4l81RBX0" role="3clF47">
-        <node concept="3clFbF" id="5mu4l81RYCU" role="3cqZAp">
-          <node concept="37vLTI" id="5mu4l81SoTo" role="3clFbG">
-            <node concept="37vLTw" id="5mu4l81Stj1" role="37vLTx">
-              <ref role="3cqZAo" node="5mu4l81RS8k" resolve="b" />
-            </node>
-            <node concept="2OqwBi" id="5mu4l81S4FG" role="37vLTJ">
-              <node concept="Xjq3P" id="5mu4l81RYCT" role="2Oq$k0" />
-              <node concept="2OwXpG" id="5mu4l81S8Gs" role="2OqNvi">
-                <ref role="2Oxat5" node="7LcJ$BbTtUp" resolve="isInstance" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="3RmCGNPRMl9" role="jymVt" />
     <node concept="3clFb_" id="3RmCGNPS1xD" role="jymVt">
       <property role="TrG5h" value="deleteOriginal" />
@@ -21610,9 +21586,6 @@
         <node concept="x79VA" id="2BZZUn12sfW" role="3nqlJM">
           <property role="x79VB" value="ArtifactPath" />
         </node>
-        <node concept="TZ5HI" id="1dm_BztJgP5" role="3nqlJM">
-          <node concept="TZ5HA" id="1dm_BztJgP6" role="3HnX3l" />
-        </node>
       </node>
       <node concept="2AHcQZ" id="1dm_BztJgP7" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />