diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.behavior.mps
index 0aa2ddf62..0bdbcf926 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.behavior.mps
@@ -1242,8 +1242,8 @@
                 <ref role="37wK5l" node="6SMbav4Irm1" resolve="configurationRoot" />
               </node>
             </node>
-            <node concept="2qgKlT" id="6tuBwY6S72J" role="2OqNvi">
-              <ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
+            <node concept="2qgKlT" id="1OonrpW$_kz" role="2OqNvi">
+              <ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
             </node>
           </node>
         </node>
@@ -5079,6 +5079,30 @@
         </node>
       </node>
     </node>
+    <node concept="13i0hz" id="1OonrpWrKwH" role="13h7CS">
+      <property role="TrG5h" value="runManuallyAsync" />
+      <ref role="13i0hy" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
+      <node concept="3Tm1VV" id="1OonrpWrKwI" role="1B3o_S" />
+      <node concept="3clFbS" id="1OonrpWrKwU" role="3clF47">
+        <node concept="3clFbF" id="1OonrpWrVQr" role="3cqZAp">
+          <node concept="2OqwBi" id="1OonrpWrWhs" role="3clFbG">
+            <node concept="13iPFW" id="1OonrpWrVQm" role="2Oq$k0" />
+            <node concept="2qgKlT" id="1OonrpWrXEp" role="2OqNvi">
+              <ref role="37wK5l" node="2tL1yL1z_3M" resolve="solverResultsAsync" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="1OonrpWrKwV" role="3clF45">
+        <ref role="3uigEE" to="5zyv:~CompletableFuture" resolve="CompletableFuture" />
+        <node concept="3uibUv" id="1OonrpWrKwW" role="11_B2D">
+          <ref role="3uigEE" to="33ny:~List" resolve="List" />
+          <node concept="3uibUv" id="1OonrpWrKwX" role="11_B2D">
+            <ref role="3uigEE" to="gdgh:5zG5$Lyex1G" resolve="IResult" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="13i0hz" id="1iVIHkN4kr5" role="13h7CS">
       <property role="TrG5h" value="unassignedAttributes" />
       <node concept="3Tm1VV" id="1iVIHkN4kr6" role="1B3o_S" />
@@ -15254,12 +15278,12 @@
         <node concept="3clFbJ" id="5cx1lEoFsLD" role="3cqZAp">
           <node concept="3clFbS" id="5cx1lEoFsLE" role="3clFbx">
             <node concept="3clFbF" id="5cx1lEoFsLF" role="3cqZAp">
-              <node concept="2OqwBi" id="5cx1lEoFsLG" role="3clFbG">
+              <node concept="2OqwBi" id="1OonrpW$Au3" role="3clFbG">
                 <node concept="37vLTw" id="5cx1lEoFsLH" role="2Oq$k0">
                   <ref role="3cqZAo" node="5cx1lEoFsM2" resolve="config" />
                 </node>
-                <node concept="2qgKlT" id="6tuBwY6LK6k" role="2OqNvi">
-                  <ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
+                <node concept="2qgKlT" id="1OonrpW$Bdl" role="2OqNvi">
+                  <ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
                 </node>
               </node>
             </node>
@@ -16031,8 +16055,8 @@
             <node concept="37vLTw" id="1gnhaEd8tWO" role="2Oq$k0">
               <ref role="3cqZAo" node="1gnhaEd8izs" resolve="config" />
             </node>
-            <node concept="2qgKlT" id="1gnhaEd8tWP" role="2OqNvi">
-              <ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
+            <node concept="2qgKlT" id="1OonrpW$C2k" role="2OqNvi">
+              <ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
             </node>
           </node>
         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.constraints.mps
index eaff4ce22..d4d1a48cc 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.constraints.mps
@@ -439,8 +439,8 @@
                           <ref role="37wK5l" to="lte6:6SMbav4Irm1" resolve="configurationRoot" />
                         </node>
                       </node>
-                      <node concept="2qgKlT" id="6tuBwY6XkEG" role="2OqNvi">
-                        <ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
+                      <node concept="2qgKlT" id="1OonrpW$Bdl" role="2OqNvi">
+                        <ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.editor.mps
index 6e1f99669..cbbd317bf 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.editor.mps
@@ -98,6 +98,9 @@
         <child id="1164824815888" name="cellMenuPart" index="OY2wv" />
       </concept>
       <concept id="1078938745671" name="jetbrains.mps.lang.editor.structure.EditorComponentDeclaration" flags="ig" index="PKFIW" />
+      <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
+        <reference id="1078939183255" name="editorComponent" index="PMmxG" />
+      </concept>
       <concept id="1149850725784" name="jetbrains.mps.lang.editor.structure.CellModel_AttributedNodeCell" flags="ng" index="2SsqMj" />
       <concept id="1186403694788" name="jetbrains.mps.lang.editor.structure.ColorStyleClassItem" flags="ln" index="VaVBg">
         <property id="1186403713874" name="color" index="Vb096" />
@@ -656,11 +659,8 @@
                 </node>
               </node>
             </node>
-            <node concept="3F0A7n" id="zJQZm7$hC4" role="1QoVPY">
-              <ref role="1NtTu8" to="4ndm:zJQZm7Q2Fm" resolve="assignmentCause" />
-              <node concept="VechU" id="67408HOpX3w" role="3F10Kt">
-                <property role="Vb096" value="hGRnIZc/lightBlue" />
-              </node>
+            <node concept="PMmxH" id="fgtKqAw$65" role="1QoVPY">
+              <ref role="PMmxG" node="fgtKqAsHZd" resolve="AssignmentCauseEditor" />
             </node>
           </node>
         </node>
@@ -727,11 +727,8 @@
                     <property role="VOm3f" value="true" />
                   </node>
                 </node>
-                <node concept="3F0A7n" id="zJQZm87vi4" role="3EZMnx">
-                  <ref role="1NtTu8" to="4ndm:zJQZm7Q2Fm" resolve="assignmentCause" />
-                  <node concept="VechU" id="zJQZm87vib" role="3F10Kt">
-                    <property role="Vb096" value="hGRnIZc/lightBlue" />
-                  </node>
+                <node concept="PMmxH" id="fgtKqAw$lS" role="3EZMnx">
+                  <ref role="PMmxG" node="fgtKqAsHZd" resolve="AssignmentCauseEditor" />
                 </node>
               </node>
               <node concept="3EZMnI" id="zJQZm8svLE" role="1QoS34">
@@ -747,11 +744,8 @@
                     <property role="VOm3f" value="true" />
                   </node>
                 </node>
-                <node concept="3F0A7n" id="zJQZm8sw3F" role="3EZMnx">
-                  <ref role="1NtTu8" to="4ndm:zJQZm7Q2Fm" resolve="assignmentCause" />
-                  <node concept="VechU" id="zJQZm8sw3G" role="3F10Kt">
-                    <property role="Vb096" value="hGRnIZc/lightBlue" />
-                  </node>
+                <node concept="PMmxH" id="fgtKqAw$lR" role="3EZMnx">
+                  <ref role="PMmxG" node="fgtKqAsHZd" resolve="AssignmentCauseEditor" />
                 </node>
               </node>
             </node>
@@ -768,11 +762,8 @@
                   <property role="VOm3f" value="true" />
                 </node>
               </node>
-              <node concept="3F0A7n" id="zJQZm8swpY" role="3EZMnx">
-                <ref role="1NtTu8" to="4ndm:zJQZm7Q2Fm" resolve="assignmentCause" />
-                <node concept="VechU" id="zJQZm8swpZ" role="3F10Kt">
-                  <property role="Vb096" value="hGRnIZc/lightBlue" />
-                </node>
+              <node concept="PMmxH" id="fgtKqAw$lQ" role="3EZMnx">
+                <ref role="PMmxG" node="fgtKqAsHZd" resolve="AssignmentCauseEditor" />
               </node>
             </node>
           </node>
@@ -2244,8 +2235,8 @@
                   <ref role="37wK5l" to="lte6:6SMbav4Irm1" resolve="configurationRoot" />
                 </node>
               </node>
-              <node concept="2qgKlT" id="6tuBwY6Xl$8" role="2OqNvi">
-                <ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
+              <node concept="2qgKlT" id="1OonrpW$Qu6" role="2OqNvi">
+                <ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
               </node>
             </node>
           </node>
@@ -3679,8 +3670,8 @@
                 <node concept="37vLTw" id="7PDiqB3$ty8" role="2Oq$k0">
                   <ref role="3cqZAo" node="7PDiqB3$txT" resolve="fmc" />
                 </node>
-                <node concept="2qgKlT" id="6tuBwY6Xlay" role="2OqNvi">
-                  <ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
+                <node concept="2qgKlT" id="1OonrpW$Bdl" role="2OqNvi">
+                  <ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
                 </node>
               </node>
             </node>
@@ -4034,5 +4025,19 @@
       </node>
     </node>
   </node>
+  <node concept="PKFIW" id="fgtKqAsHZd">
+    <property role="TrG5h" value="AssignmentCauseEditor" />
+    <ref role="1XX52x" to="4ndm:30ECcbtLqSm" resolve="FeatureAttributeAssignment" />
+    <node concept="3F0A7n" id="fgtKqAsHZf" role="2wV5jI">
+      <property role="1Intyy" value="true" />
+      <ref role="1NtTu8" to="4ndm:zJQZm7Q2Fm" resolve="assignmentCause" />
+      <node concept="VechU" id="fgtKqAsJCM" role="3F10Kt">
+        <property role="Vb096" value="hGRnIZc/lightBlue" />
+      </node>
+      <node concept="xShMh" id="fgtKqA$5_r" role="3F10Kt">
+        <property role="VOm3f" value="true" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.intentions.mps
index 81c3e5d72..2ea7a09f1 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.intentions.mps
@@ -1875,12 +1875,12 @@
         </node>
         <node concept="3clFbF" id="7EMjvkEduhB" role="3cqZAp">
           <node concept="2OqwBi" id="7EMjvkEdv37" role="3clFbG">
-            <node concept="2qgKlT" id="6tuBwY72MUF" role="2OqNvi">
-              <ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
-            </node>
             <node concept="37vLTw" id="4rT4o_z3oB3" role="2Oq$k0">
               <ref role="3cqZAo" node="4rT4o_z3oAX" resolve="fmc" />
             </node>
+            <node concept="2qgKlT" id="1OonrpW$Bdl" role="2OqNvi">
+              <ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
+            </node>
           </node>
         </node>
       </node>
@@ -2495,12 +2495,12 @@
         </node>
         <node concept="3clFbF" id="1nsh0in5b7n" role="3cqZAp">
           <node concept="2OqwBi" id="1nsh0in5b7o" role="3clFbG">
-            <node concept="2qgKlT" id="1nsh0in5b7p" role="2OqNvi">
-              <ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
-            </node>
             <node concept="37vLTw" id="1nsh0in5b7q" role="2Oq$k0">
               <ref role="3cqZAo" node="1nsh0in5b7c" resolve="fmc" />
             </node>
+            <node concept="2qgKlT" id="1OonrpW_b3x" role="2OqNvi">
+              <ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
+            </node>
           </node>
         </node>
       </node>
@@ -2538,8 +2538,8 @@
         <node concept="3clFbF" id="6SMbav4IjL1" role="3cqZAp">
           <node concept="2OqwBi" id="6SMbav4IjXh" role="3clFbG">
             <node concept="2Sf5sV" id="6SMbav4IjKZ" role="2Oq$k0" />
-            <node concept="2qgKlT" id="6tuBwY72NaG" role="2OqNvi">
-              <ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
+            <node concept="2qgKlT" id="1OonrpW_NZG" role="2OqNvi">
+              <ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
             </node>
           </node>
         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.listeners.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.listeners.mps
index 838ce0fd3..bd7127953 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.listeners.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.listeners.mps
@@ -191,7 +191,7 @@
           <node concept="2OqwBi" id="9gaRKr9Y8m" role="3clFbG">
             <node concept="j_vvf" id="9gaRKr9XOP" role="2Oq$k0" />
             <node concept="2qgKlT" id="9gaRKr9YLf" role="2OqNvi">
-              <ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
+              <ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
             </node>
           </node>
         </node>
@@ -203,8 +203,8 @@
         <node concept="3clFbF" id="9gaRKr9YWB" role="3cqZAp">
           <node concept="2OqwBi" id="9gaRKr9ZfR" role="3clFbG">
             <node concept="j_vvf" id="9gaRKr9YWA" role="2Oq$k0" />
-            <node concept="2qgKlT" id="9gaRKr9ZT1" role="2OqNvi">
-              <ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
+            <node concept="2qgKlT" id="1OonrpW_f60" role="2OqNvi">
+              <ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
             </node>
           </node>
         </node>
@@ -228,8 +228,8 @@
                 </node>
               </node>
             </node>
-            <node concept="2qgKlT" id="9gaRKr9Qg4" role="2OqNvi">
-              <ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
+            <node concept="2qgKlT" id="1OonrpW$Bdl" role="2OqNvi">
+              <ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
             </node>
           </node>
         </node>
@@ -250,7 +250,7 @@
               </node>
             </node>
             <node concept="2qgKlT" id="9gaRKr9QCU" role="2OqNvi">
-              <ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
+              <ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
             </node>
           </node>
         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.plugin.mps
index f84b34a4f..71bf12956 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.plugin.mps
@@ -50,6 +50,7 @@
     <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="hnhi" ref="r:d354209e-0bea-497f-b905-d66f72900fa8(org.iets3.analysis.base.plugin)" />
     <import index="l80j" ref="r:9e71c0de-f9ab-4b67-96cc-7d9c857513f6(org.iets3.analysis.base.structure)" />
+    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -7036,8 +7037,8 @@
                 <node concept="37vLTw" id="5oMrF1pTxv2" role="2Oq$k0">
                   <ref role="3cqZAo" node="5oMrF1pTxvE" resolve="fmc" />
                 </node>
-                <node concept="2qgKlT" id="6$BRJSYZ3eK" role="2OqNvi">
-                  <ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
+                <node concept="2qgKlT" id="1OonrpW_ird" role="2OqNvi">
+                  <ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
                 </node>
               </node>
             </node>
@@ -7233,8 +7234,8 @@
                 <node concept="37vLTw" id="6_E9P4eseHv" role="2Oq$k0">
                   <ref role="3cqZAo" node="5oMrF1q1cQ6" resolve="fmconfig" />
                 </node>
-                <node concept="2qgKlT" id="6$BRJSYZ3rn" role="2OqNvi">
-                  <ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
+                <node concept="2qgKlT" id="1OonrpW_jh1" role="2OqNvi">
+                  <ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
                 </node>
               </node>
             </node>
@@ -10308,6 +10309,37 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbJ" id="6UZR8Zbl4gz" role="3cqZAp">
+          <node concept="3clFbS" id="6UZR8Zbl4g_" role="3clFbx">
+            <node concept="3SKdUt" id="6UZR8ZblYwH" role="3cqZAp">
+              <node concept="1PaTwC" id="6UZR8ZblYwI" role="1aUNEU">
+                <node concept="3oM_SD" id="6UZR8ZbmkIW" role="1PaTwD">
+                  <property role="3oM_SC" value="Something" />
+                </node>
+                <node concept="3oM_SD" id="6UZR8ZbmkJe" role="1PaTwD">
+                  <property role="3oM_SC" value="in" />
+                </node>
+                <node concept="3oM_SD" id="6UZR8ZbmkJg" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="6UZR8ZbmkJy" role="1PaTwD">
+                  <property role="3oM_SC" value="Config" />
+                </node>
+                <node concept="3oM_SD" id="6UZR8ZbmkJO" role="1PaTwD">
+                  <property role="3oM_SC" value="changed" />
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs6" id="6UZR8Zblqjr" role="3cqZAp">
+              <node concept="3clFbT" id="6UZR8ZblFjA" role="3cqZAk">
+                <property role="3clFbU" value="true" />
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTw" id="6UZR8ZblfFF" role="3clFbw">
+            <ref role="3cqZAo" node="2BePqP5Ka1h" resolve="updateChanges" />
+          </node>
+        </node>
         <node concept="3cpWs8" id="2BePqP5Ka1B" role="3cqZAp">
           <node concept="3cpWsn" id="2BePqP5Ka1C" role="3cpWs9">
             <property role="TrG5h" value="map1" />
@@ -10330,7 +10362,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="2BePqP5Ka1J" role="3cqZAp" />
         <node concept="3cpWs8" id="2BePqP5Ka1K" role="3cqZAp">
           <node concept="3cpWsn" id="2BePqP5Ka1L" role="3cpWs9">
             <property role="TrG5h" value="subFeatureConfigurations" />
@@ -10385,7 +10416,6 @@
                     </node>
                     <node concept="3clFbF" id="2BePqP5Ka28" role="3cqZAp">
                       <node concept="3K4zz7" id="2BePqP5Ka29" role="3clFbG">
-                        <node concept="3clFbT" id="2BePqP5Ka2a" role="3K4GZi" />
                         <node concept="3y3z36" id="2BePqP5Ka2b" role="3K4Cdx">
                           <node concept="10Nm6u" id="2BePqP5Ka2c" role="3uHU7w" />
                           <node concept="37vLTw" id="2BePqP5Ka2d" role="3uHU7B">
@@ -10408,6 +10438,23 @@
                             </node>
                           </node>
                         </node>
+                        <node concept="3fqX7Q" id="1OonrpW6rs0" role="3K4GZi">
+                          <node concept="1rXfSq" id="1OonrpW6rs1" role="3fr31v">
+                            <ref role="37wK5l" node="77vQCjLRaVy" resolve="matches" />
+                            <node concept="2OqwBi" id="1OonrpW6rs2" role="37wK5m">
+                              <node concept="37vLTw" id="1OonrpW6rs3" role="2Oq$k0">
+                                <ref role="3cqZAo" node="2BePqP5Ka2k" resolve="it" />
+                              </node>
+                              <node concept="3TrcHB" id="1OonrpW6rs4" role="2OqNvi">
+                                <ref role="3TsBF5" to="4ndm:59FNqAPCJNr" resolve="selectionState" />
+                              </node>
+                            </node>
+                            <node concept="Rm8GO" id="1OonrpW6rs5" role="37wK5m">
+                              <ref role="Rm8GQ" to="ni7b:7wcplOcm5vY" resolve="NotFixed" />
+                              <ref role="1Px2BO" to="ni7b:7wcplOcm4TT" resolve="FixedValueCategory" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -10420,110 +10467,171 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="2BePqP5Ka2m" role="3cqZAp">
-          <node concept="3clFbS" id="2BePqP5Ka2n" role="3clFbx">
-            <node concept="3cpWs8" id="2BePqP5Ka2o" role="3cqZAp">
-              <node concept="3cpWsn" id="2BePqP5Ka2p" role="3cpWs9">
-                <property role="TrG5h" value="map2" />
-                <node concept="3uibUv" id="2BePqP5Ka2q" role="1tU5fm">
-                  <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-                  <node concept="3Tqbb2" id="2BePqP5Ka2r" role="11_B2D">
-                    <ref role="ehGHo" to="4ndm:30ECcbtLqSm" resolve="FeatureAttributeAssignment" />
-                  </node>
-                  <node concept="3Tqbb2" id="2BePqP5Ka2s" role="11_B2D">
-                    <ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
-                  </node>
+        <node concept="3clFbJ" id="2t2ZSIPrcuU" role="3cqZAp">
+          <node concept="3clFbS" id="2t2ZSIPrcuV" role="3clFbx">
+            <node concept="3SKdUt" id="2t2ZSIPrcuW" role="3cqZAp">
+              <node concept="1PaTwC" id="2t2ZSIPrcuX" role="1aUNEU">
+                <node concept="3oM_SD" id="2t2ZSIPrmJ5" role="1PaTwD">
+                  <property role="3oM_SC" value="Some" />
                 </node>
-                <node concept="2OqwBi" id="2BePqP5Ka2t" role="33vP2m">
-                  <node concept="37vLTw" id="2BePqP5Ka2u" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2BePqP5Ka35" resolve="configFixedValues" />
-                  </node>
-                  <node concept="liA8E" id="2BePqP5Ka2v" role="2OqNvi">
-                    <ref role="37wK5l" node="eCS_wK0P20" resolve="mapOfAttributeAssignmentToFixedValue" />
-                  </node>
+                <node concept="3oM_SD" id="2t2ZSIPrmJn" role="1PaTwD">
+                  <property role="3oM_SC" value="selection" />
+                </node>
+                <node concept="3oM_SD" id="2t2ZSIPrmKb" role="1PaTwD">
+                  <property role="3oM_SC" value="state" />
+                </node>
+                <node concept="3oM_SD" id="2t2ZSIPrmKZ" role="1PaTwD">
+                  <property role="3oM_SC" value="changed" />
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="2BePqP5Ka2w" role="3cqZAp">
-              <node concept="3vZ8r8" id="2BePqP5Ka2x" role="3clFbG">
-                <node concept="37vLTw" id="2BePqP5Ka2y" role="37vLTJ">
-                  <ref role="3cqZAo" node="2BePqP5Ka1h" resolve="updateChanges" />
+            <node concept="3cpWs6" id="2t2ZSIPrcv3" role="3cqZAp">
+              <node concept="3clFbT" id="2t2ZSIPrcv4" role="3cqZAk">
+                <property role="3clFbU" value="true" />
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTw" id="2t2ZSIPrcv5" role="3clFbw">
+            <ref role="3cqZAo" node="2BePqP5Ka1h" resolve="updateChanges" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="2t2ZSIPr8Kp" role="3cqZAp" />
+        <node concept="3SKdUt" id="2t2ZSIPrQHt" role="3cqZAp">
+          <node concept="1PaTwC" id="2t2ZSIPrQHu" role="1aUNEU">
+            <node concept="3oM_SD" id="2t2ZSIPrQHv" role="1PaTwD">
+              <property role="3oM_SC" value="check" />
+            </node>
+            <node concept="3oM_SD" id="2t2ZSIPs09r" role="1PaTwD">
+              <property role="3oM_SC" value="if" />
+            </node>
+            <node concept="3oM_SD" id="2t2ZSIPs0ZP" role="1PaTwD">
+              <property role="3oM_SC" value="some" />
+            </node>
+            <node concept="3oM_SD" id="2t2ZSIPs10q" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="2t2ZSIPs11z" role="1PaTwD">
+              <property role="3oM_SC" value="a" />
+            </node>
+            <node concept="3oM_SD" id="2t2ZSIPs11$" role="1PaTwD">
+              <property role="3oM_SC" value="attribute" />
+            </node>
+            <node concept="3oM_SD" id="2t2ZSIPs12Z" role="1PaTwD">
+              <property role="3oM_SC" value="assigned" />
+            </node>
+            <node concept="3oM_SD" id="2t2ZSIPs13S" role="1PaTwD">
+              <property role="3oM_SC" value="value" />
+            </node>
+            <node concept="3oM_SD" id="2t2ZSIPs149" role="1PaTwD">
+              <property role="3oM_SC" value="changed" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2BePqP5Ka2o" role="3cqZAp">
+          <node concept="3cpWsn" id="2BePqP5Ka2p" role="3cpWs9">
+            <property role="TrG5h" value="map2" />
+            <node concept="3uibUv" id="2BePqP5Ka2q" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+              <node concept="3Tqbb2" id="2BePqP5Ka2r" role="11_B2D">
+                <ref role="ehGHo" to="4ndm:30ECcbtLqSm" resolve="FeatureAttributeAssignment" />
+              </node>
+              <node concept="3Tqbb2" id="2BePqP5Ka2s" role="11_B2D">
+                <ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="2BePqP5Ka2t" role="33vP2m">
+              <node concept="37vLTw" id="2BePqP5Ka2u" role="2Oq$k0">
+                <ref role="3cqZAo" node="2BePqP5Ka35" resolve="configFixedValues" />
+              </node>
+              <node concept="liA8E" id="2BePqP5Ka2v" role="2OqNvi">
+                <ref role="37wK5l" node="eCS_wK0P20" resolve="mapOfAttributeAssignmentToFixedValue" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2BePqP5Ka2w" role="3cqZAp">
+          <node concept="3vZ8r8" id="2BePqP5Ka2x" role="3clFbG">
+            <node concept="37vLTw" id="2BePqP5Ka2y" role="37vLTJ">
+              <ref role="3cqZAo" node="2BePqP5Ka1h" resolve="updateChanges" />
+            </node>
+            <node concept="2OqwBi" id="2BePqP5Ka2z" role="37vLTx">
+              <node concept="2OqwBi" id="2BePqP5Ka2$" role="2Oq$k0">
+                <node concept="37vLTw" id="2BePqP5Ka2_" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2BePqP5KhiC" resolve="fmc" />
                 </node>
-                <node concept="2OqwBi" id="2BePqP5Ka2z" role="37vLTx">
-                  <node concept="2OqwBi" id="2BePqP5Ka2$" role="2Oq$k0">
-                    <node concept="37vLTw" id="2BePqP5Ka2_" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2BePqP5KhiC" resolve="fmc" />
-                    </node>
-                    <node concept="2qgKlT" id="2BePqP5Ka2A" role="2OqNvi">
-                      <ref role="37wK5l" to="lte6:58DfSnqtfhS" resolve="allAttributeAssignments" />
-                    </node>
-                  </node>
-                  <node concept="2HwmR7" id="2BePqP5Ka2B" role="2OqNvi">
-                    <node concept="1bVj0M" id="2BePqP5Ka2C" role="23t8la">
-                      <node concept="3clFbS" id="2BePqP5Ka2D" role="1bW5cS">
-                        <node concept="3cpWs8" id="2BePqP5Ka2E" role="3cqZAp">
-                          <node concept="3cpWsn" id="2BePqP5Ka2F" role="3cpWs9">
-                            <property role="TrG5h" value="newExpr" />
-                            <node concept="3Tqbb2" id="2BePqP5Ka2G" role="1tU5fm">
-                              <ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
+                <node concept="2qgKlT" id="2BePqP5Ka2A" role="2OqNvi">
+                  <ref role="37wK5l" to="lte6:58DfSnqtfhS" resolve="allAttributeAssignments" />
+                </node>
+              </node>
+              <node concept="2HwmR7" id="2BePqP5Ka2B" role="2OqNvi">
+                <node concept="1bVj0M" id="2BePqP5Ka2C" role="23t8la">
+                  <node concept="3clFbS" id="2BePqP5Ka2D" role="1bW5cS">
+                    <node concept="3cpWs8" id="2BePqP5Ka2E" role="3cqZAp">
+                      <node concept="3cpWsn" id="2BePqP5Ka2F" role="3cpWs9">
+                        <property role="TrG5h" value="newExpr" />
+                        <node concept="3Tqbb2" id="2BePqP5Ka2G" role="1tU5fm">
+                          <ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
+                        </node>
+                        <node concept="2OqwBi" id="2BePqP5Ka2H" role="33vP2m">
+                          <node concept="37vLTw" id="2BePqP5Ka2I" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2BePqP5Ka2p" resolve="map2" />
+                          </node>
+                          <node concept="liA8E" id="2BePqP5Ka2J" role="2OqNvi">
+                            <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
+                            <node concept="37vLTw" id="2BePqP5Ka2K" role="37wK5m">
+                              <ref role="3cqZAo" node="2BePqP5Ka2Y" resolve="attrAssign" />
                             </node>
-                            <node concept="2OqwBi" id="2BePqP5Ka2H" role="33vP2m">
-                              <node concept="37vLTw" id="2BePqP5Ka2I" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2BePqP5Ka2p" resolve="map2" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="2BePqP5Ka2L" role="3cqZAp">
+                      <node concept="3K4zz7" id="2BePqP5Ka2M" role="3clFbG">
+                        <node concept="3fqX7Q" id="2BePqP5Ka2N" role="3K4E3e">
+                          <node concept="1eOMI4" id="2BePqP5Ka2O" role="3fr31v">
+                            <node concept="2YFouu" id="2BePqP5Ka2P" role="1eOMHV">
+                              <node concept="37vLTw" id="2BePqP5Ka2Q" role="3uHU7w">
+                                <ref role="3cqZAo" node="2BePqP5Ka2F" resolve="newExpr" />
                               </node>
-                              <node concept="liA8E" id="2BePqP5Ka2J" role="2OqNvi">
-                                <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
-                                <node concept="37vLTw" id="2BePqP5Ka2K" role="37wK5m">
+                              <node concept="2OqwBi" id="2BePqP5Ka2R" role="3uHU7B">
+                                <node concept="37vLTw" id="2BePqP5Ka2S" role="2Oq$k0">
                                   <ref role="3cqZAo" node="2BePqP5Ka2Y" resolve="attrAssign" />
                                 </node>
+                                <node concept="3TrEf2" id="2BePqP5Ka2T" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="4ndm:30ECcbtOuaE" resolve="value" />
+                                </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbF" id="2BePqP5Ka2L" role="3cqZAp">
-                          <node concept="3K4zz7" id="2BePqP5Ka2M" role="3clFbG">
-                            <node concept="3fqX7Q" id="2BePqP5Ka2N" role="3K4E3e">
-                              <node concept="1eOMI4" id="2BePqP5Ka2O" role="3fr31v">
-                                <node concept="2YFouu" id="2BePqP5Ka2P" role="1eOMHV">
-                                  <node concept="37vLTw" id="2BePqP5Ka2Q" role="3uHU7w">
-                                    <ref role="3cqZAo" node="2BePqP5Ka2F" resolve="newExpr" />
-                                  </node>
-                                  <node concept="2OqwBi" id="2BePqP5Ka2R" role="3uHU7B">
-                                    <node concept="37vLTw" id="2BePqP5Ka2S" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2BePqP5Ka2Y" resolve="attrAssign" />
-                                    </node>
-                                    <node concept="3TrEf2" id="2BePqP5Ka2T" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="4ndm:30ECcbtOuaE" resolve="value" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
+                        <node concept="3y3z36" id="2BePqP5Ka2V" role="3K4Cdx">
+                          <node concept="10Nm6u" id="2BePqP5Ka2W" role="3uHU7w" />
+                          <node concept="37vLTw" id="2BePqP5Ka2X" role="3uHU7B">
+                            <ref role="3cqZAo" node="2BePqP5Ka2F" resolve="newExpr" />
+                          </node>
+                        </node>
+                        <node concept="3y3z36" id="2t2ZSIPvQUI" role="3K4GZi">
+                          <node concept="10Nm6u" id="2t2ZSIPvVVX" role="3uHU7w" />
+                          <node concept="2OqwBi" id="2t2ZSIPvoG8" role="3uHU7B">
+                            <node concept="37vLTw" id="2t2ZSIPvoG9" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2BePqP5Ka2Y" resolve="attrAssign" />
                             </node>
-                            <node concept="3clFbT" id="2BePqP5Ka2U" role="3K4GZi" />
-                            <node concept="3y3z36" id="2BePqP5Ka2V" role="3K4Cdx">
-                              <node concept="10Nm6u" id="2BePqP5Ka2W" role="3uHU7w" />
-                              <node concept="37vLTw" id="2BePqP5Ka2X" role="3uHU7B">
-                                <ref role="3cqZAo" node="2BePqP5Ka2F" resolve="newExpr" />
-                              </node>
+                            <node concept="3TrEf2" id="2t2ZSIPvoGa" role="2OqNvi">
+                              <ref role="3Tt5mk" to="4ndm:30ECcbtOuaE" resolve="value" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="gl6BB" id="2BePqP5Ka2Y" role="1bW2Oz">
-                        <property role="TrG5h" value="attrAssign" />
-                        <node concept="2jxLKc" id="2BePqP5Ka2Z" role="1tU5fm" />
-                      </node>
                     </node>
                   </node>
+                  <node concept="gl6BB" id="2BePqP5Ka2Y" role="1bW2Oz">
+                    <property role="TrG5h" value="attrAssign" />
+                    <node concept="2jxLKc" id="2BePqP5Ka2Z" role="1tU5fm" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3fqX7Q" id="2BePqP5Ka30" role="3clFbw">
-            <node concept="37vLTw" id="2BePqP5Ka31" role="3fr31v">
-              <ref role="3cqZAo" node="2BePqP5Ka1h" resolve="updateChanges" />
-            </node>
-          </node>
         </node>
         <node concept="3cpWs6" id="2BePqP5Ka32" role="3cqZAp">
           <node concept="37vLTw" id="2BePqP5Ka33" role="3cqZAk">
@@ -11107,7 +11215,7 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="1Vm2qfK8AnE" role="3cqZAp" />
+        <node concept="3clFbH" id="1OonrpWbTkp" role="3cqZAp" />
         <node concept="3clFbF" id="6$693rsU5D9" role="3cqZAp">
           <node concept="1rXfSq" id="2OJr5rPVzLr" role="3clFbG">
             <ref role="37wK5l" node="6$693rsRuXz" resolve="updateState" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.typesystem.mps
index 71bd2b812..2ae4be58c 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.typesystem.mps
@@ -3459,8 +3459,8 @@
             <node concept="QwW4i" id="49ZhMclUQUK" role="2Oq$k0">
               <ref role="QwW4h" node="49ZhMclUQUt" resolve="fmc" />
             </node>
-            <node concept="2qgKlT" id="6$BRJSYZ3GE" role="2OqNvi">
-              <ref role="37wK5l" to="1jcu:3NwcubmnBQ5" resolve="runSolverAsync" />
+            <node concept="2qgKlT" id="1OonrpW_k_A" role="2OqNvi">
+              <ref role="37wK5l" to="1jcu:7QODtLvTFnz" resolve="runManuallyAsync" />
             </node>
           </node>
         </node>
diff --git a/code/languages/org.iets3.opensource/tests/test.org.iets3.analysis.base/models/test.org.iets3.analysis.base.async@tests.mps b/code/languages/org.iets3.opensource/tests/test.org.iets3.analysis.base/models/test.org.iets3.analysis.base.async@tests.mps
index 9d02fe2a1..dcbdce2fc 100644
--- a/code/languages/org.iets3.opensource/tests/test.org.iets3.analysis.base/models/test.org.iets3.analysis.base.async@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.org.iets3.analysis.base/models/test.org.iets3.analysis.base.async@tests.mps
@@ -1451,7 +1451,7 @@
                                     <node concept="liA8E" id="41hdHndpp_F" role="2OqNvi">
                                       <ref role="37wK5l" to="5zyv:~Future.get(long,java.util.concurrent.TimeUnit)" resolve="get" />
                                       <node concept="3cmrfG" id="41hdHndpp_G" role="37wK5m">
-                                        <property role="3cmrfH" value="2" />
+                                        <property role="3cmrfH" value="5" />
                                       </node>
                                       <node concept="Rm8GO" id="41hdHndpp_H" role="37wK5m">
                                         <ref role="Rm8GQ" to="5zyv:~TimeUnit.SECONDS" resolve="SECONDS" />
@@ -1462,42 +1462,27 @@
                                 </node>
                               </node>
                               <node concept="3uVAMA" id="41hdHndpp_I" role="1zxBo5">
-                                <node concept="3clFbS" id="41hdHndpp_J" role="1zc67A" />
+                                <node concept="3clFbS" id="41hdHndpp_J" role="1zc67A">
+                                  <node concept="3cpWs6" id="1IfhTxVGqKF" role="3cqZAp">
+                                    <node concept="10Nm6u" id="1IfhTxVGseO" role="3cqZAk" />
+                                  </node>
+                                </node>
                                 <node concept="XOnhg" id="41hdHndpp_K" role="1zc67B">
                                   <property role="TrG5h" value="e" />
                                   <node concept="nSUau" id="41hdHndpp_L" role="1tU5fm">
                                     <node concept="3uibUv" id="41hdHndpp_M" role="nSUat">
                                       <ref role="3uigEE" to="5zyv:~TimeoutException" resolve="TimeoutException" />
                                     </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3uVAMA" id="41hdHndpp_N" role="1zxBo5">
-                                <node concept="3clFbS" id="41hdHndpp_O" role="1zc67A" />
-                                <node concept="XOnhg" id="41hdHndpp_P" role="1zc67B">
-                                  <property role="TrG5h" value="e" />
-                                  <node concept="nSUau" id="41hdHndpp_Q" role="1tU5fm">
-                                    <node concept="3uibUv" id="41hdHndpp_R" role="nSUat">
+                                    <node concept="3uibUv" id="1IfhTxVGk7F" role="nSUat">
                                       <ref role="3uigEE" to="5zyv:~ExecutionException" resolve="ExecutionException" />
                                     </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3uVAMA" id="41hdHndpp_S" role="1zxBo5">
-                                <node concept="3clFbS" id="41hdHndpp_T" role="1zc67A" />
-                                <node concept="XOnhg" id="41hdHndpp_U" role="1zc67B">
-                                  <property role="TrG5h" value="e" />
-                                  <node concept="nSUau" id="41hdHndpp_V" role="1tU5fm">
-                                    <node concept="3uibUv" id="41hdHndpp_W" role="nSUat">
+                                    <node concept="3uibUv" id="1IfhTxVGnyQ" role="nSUat">
                                       <ref role="3uigEE" to="wyt6:~InterruptedException" resolve="InterruptedException" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="3clFbF" id="41hdHndpp_X" role="3cqZAp">
-                              <node concept="10Nm6u" id="41hdHndpp_Y" role="3clFbG" />
-                            </node>
                           </node>
                           <node concept="gl6BB" id="1i3h3A16n4R" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
@@ -1598,7 +1583,7 @@
                         <node concept="liA8E" id="31tKzg5BR3k" role="2OqNvi">
                           <ref role="37wK5l" to="5zyv:~CompletableFuture.get(long,java.util.concurrent.TimeUnit)" resolve="get" />
                           <node concept="3cmrfG" id="31tKzg5BR3l" role="37wK5m">
-                            <property role="3cmrfH" value="5" />
+                            <property role="3cmrfH" value="7" />
                           </node>
                           <node concept="Rm8GO" id="31tKzg5BR3m" role="37wK5m">
                             <ref role="Rm8GQ" to="5zyv:~TimeUnit.SECONDS" resolve="SECONDS" />