diff --git a/code/languages/Flint/models/Flint.behavior.mps b/code/languages/Flint/models/Flint.behavior.mps
index d50d58b..971ab5e 100644
--- a/code/languages/Flint/models/Flint.behavior.mps
+++ b/code/languages/Flint/models/Flint.behavior.mps
@@ -2273,6 +2273,33 @@
         <node concept="3Tqbb2" id="4pyf5wBKQrZ" role="1tU5fm" />
       </node>
     </node>
+    <node concept="13i0hz" id="2vJbluoJwY4" role="13h7CS">
+      <property role="TrG5h" value="getActiveLanguage" />
+      <ref role="13i0hy" node="wJ8RSAMj7a" resolve="getActiveLanguage" />
+      <node concept="3Tm1VV" id="2vJbluoJwY5" role="1B3o_S" />
+      <node concept="3clFbS" id="2vJbluoJwYd" role="3clF47">
+        <node concept="3clFbF" id="2vJbluoJwYl" role="3cqZAp">
+          <node concept="2OqwBi" id="2vJbluoJwYi" role="3clFbG">
+            <node concept="13iAh5" id="2vJbluoJwYj" role="2Oq$k0">
+              <ref role="3eA5LN" to="lnwe:wJ8RSAMhPl" resolve="IHasLanguage" />
+            </node>
+            <node concept="2qgKlT" id="2vJbluoJwYk" role="2OqNvi">
+              <ref role="37wK5l" node="wJ8RSAMj7a" resolve="getActiveLanguage" />
+              <node concept="37vLTw" id="2vJbluoJwYh" role="37wK5m">
+                <ref role="3cqZAo" node="2vJbluoJwYe" resolve="model" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="2vJbluoJwYe" role="3clF46">
+        <property role="TrG5h" value="model" />
+        <node concept="H_c77" id="2vJbluoJwYf" role="1tU5fm" />
+      </node>
+      <node concept="3Tqbb2" id="2vJbluoJwYg" role="3clF45">
+        <ref role="ehGHo" to="lnwe:2ACGKFDB3mq" resolve="Language" />
+      </node>
+    </node>
   </node>
   <node concept="13h7C7" id="10jIHuk9Lsi">
     <property role="3GE5qa" value="flintmodelrunner" />
diff --git a/code/languages/Flint/models/Flint.editor.mps b/code/languages/Flint/models/Flint.editor.mps
index 5d94ea5..106910b 100644
--- a/code/languages/Flint/models/Flint.editor.mps
+++ b/code/languages/Flint/models/Flint.editor.mps
@@ -244,6 +244,7 @@
       <concept id="1950447826681509042" name="jetbrains.mps.lang.editor.structure.ApplyStyleClass" flags="lg" index="3Xmtl4">
         <child id="1950447826683828796" name="target" index="3XvnJa" />
       </concept>
+      <concept id="1198256887712" name="jetbrains.mps.lang.editor.structure.CellModel_Indent" flags="ng" index="3XFhqQ" />
       <concept id="8428109087107030357" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_ReferenceScope" flags="ng" index="3XHNnq">
         <reference id="8428109087107339113" name="reference" index="3XGfJA" />
       </concept>
@@ -579,8 +580,42 @@
         <ref role="PMmxG" node="3JnAoJLYJ6r" resolve="FlintModelLanguage" />
       </node>
       <node concept="3EZMnI" id="5Xjenljbd9G" role="3EZMnx">
-        <node concept="3F0ifn" id="7PeSHTFhIli" role="3EZMnx">
-          <property role="3F0ifm" value="acts:" />
+        <node concept="3EZMnI" id="2vJbluoJ$_U" role="3EZMnx">
+          <node concept="VPM3Z" id="2vJbluoJ$_W" role="3F10Kt" />
+          <node concept="s8t4o" id="2vJbluoJvaD" role="3EZMnx">
+            <property role="28Zw97" value="true" />
+            <ref role="28F8cf" to="lnwe:2ACGKFDB3mq" resolve="Language" />
+            <ref role="1k5W1q" node="3JnAoJLLnLN" resolve="Editor" />
+            <node concept="xShMh" id="2vJbluoJvaF" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+            <node concept="s8sZD" id="2vJbluoJvaG" role="sbcd9">
+              <node concept="3clFbS" id="2vJbluoJvaH" role="2VODD2">
+                <node concept="3clFbF" id="2vJbluoJvvJ" role="3cqZAp">
+                  <node concept="2OqwBi" id="2vJbluoJvGm" role="3clFbG">
+                    <node concept="pncrf" id="2vJbluoJvvI" role="2Oq$k0" />
+                    <node concept="2qgKlT" id="2vJbluoJySI" role="2OqNvi">
+                      <ref role="37wK5l" to="3lmi:wJ8RSAMj7a" resolve="getActiveLanguage" />
+                      <node concept="2OqwBi" id="2vJbluoJzdv" role="37wK5m">
+                        <node concept="pncrf" id="2vJbluoJyYi" role="2Oq$k0" />
+                        <node concept="I4A8Y" id="2vJbluoJzf8" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1yz3lS" id="2vJbluoJvuS" role="1yzFaX">
+              <node concept="3F0A7n" id="2vJbluoJzBy" role="2wV5jI">
+                <ref role="1NtTu8" to="lnwe:2vJbluoeqmL" resolve="eActs" />
+              </node>
+            </node>
+          </node>
+          <node concept="3F0ifn" id="2vJbluoJ$_Y" role="3EZMnx">
+            <property role="3F0ifm" value=":" />
+            <ref role="1k5W1q" node="5LeOc1$LXOc" resolve="Colon" />
+          </node>
+          <node concept="l2Vlx" id="2vJbluoJ$_Z" role="2iSdaV" />
         </node>
         <node concept="3EZMnI" id="7PeSHTFhIlj" role="3EZMnx">
           <node concept="l2Vlx" id="7PeSHTFhIlk" role="2iSdaV" />
@@ -636,8 +671,42 @@
             </node>
           </node>
         </node>
-        <node concept="3F0ifn" id="5XjenljaTWQ" role="3EZMnx">
-          <property role="3F0ifm" value="facts:" />
+        <node concept="3EZMnI" id="2vJbluoJ_zx" role="3EZMnx">
+          <node concept="VPM3Z" id="2vJbluoJ_zy" role="3F10Kt" />
+          <node concept="s8t4o" id="2vJbluoJ_zz" role="3EZMnx">
+            <property role="28Zw97" value="true" />
+            <ref role="28F8cf" to="lnwe:2ACGKFDB3mq" resolve="Language" />
+            <ref role="1k5W1q" node="3JnAoJLLnLN" resolve="Editor" />
+            <node concept="xShMh" id="2vJbluoJ_z$" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+            <node concept="s8sZD" id="2vJbluoJ_z_" role="sbcd9">
+              <node concept="3clFbS" id="2vJbluoJ_zA" role="2VODD2">
+                <node concept="3clFbF" id="2vJbluoJ_zB" role="3cqZAp">
+                  <node concept="2OqwBi" id="2vJbluoJ_zC" role="3clFbG">
+                    <node concept="pncrf" id="2vJbluoJ_zD" role="2Oq$k0" />
+                    <node concept="2qgKlT" id="2vJbluoJ_zE" role="2OqNvi">
+                      <ref role="37wK5l" to="3lmi:wJ8RSAMj7a" resolve="getActiveLanguage" />
+                      <node concept="2OqwBi" id="2vJbluoJ_zF" role="37wK5m">
+                        <node concept="pncrf" id="2vJbluoJ_zG" role="2Oq$k0" />
+                        <node concept="I4A8Y" id="2vJbluoJ_zH" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1yz3lS" id="2vJbluoJ_zI" role="1yzFaX">
+              <node concept="3F0A7n" id="2vJbluoJ_zJ" role="2wV5jI">
+                <ref role="1NtTu8" to="lnwe:2vJbluoeqn7" resolve="eFacts" />
+              </node>
+            </node>
+          </node>
+          <node concept="3F0ifn" id="2vJbluoJ_zK" role="3EZMnx">
+            <property role="3F0ifm" value=":" />
+            <ref role="1k5W1q" node="5LeOc1$LXOc" resolve="Colon" />
+          </node>
+          <node concept="l2Vlx" id="2vJbluoJ_zL" role="2iSdaV" />
         </node>
         <node concept="3EZMnI" id="5Xjenljbxde" role="3EZMnx">
           <node concept="s8t4o" id="qKaVF7rkE_" role="3EZMnx">
@@ -693,8 +762,42 @@
           </node>
           <node concept="l2Vlx" id="5Xjenljbxdf" role="2iSdaV" />
         </node>
-        <node concept="3F0ifn" id="27H3E6HtT7h" role="3EZMnx">
-          <property role="3F0ifm" value="duties:" />
+        <node concept="3EZMnI" id="2vJbluoJ_XR" role="3EZMnx">
+          <node concept="VPM3Z" id="2vJbluoJ_XS" role="3F10Kt" />
+          <node concept="s8t4o" id="2vJbluoJ_XT" role="3EZMnx">
+            <property role="28Zw97" value="true" />
+            <ref role="28F8cf" to="lnwe:2ACGKFDB3mq" resolve="Language" />
+            <ref role="1k5W1q" node="3JnAoJLLnLN" resolve="Editor" />
+            <node concept="xShMh" id="2vJbluoJ_XU" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+            <node concept="s8sZD" id="2vJbluoJ_XV" role="sbcd9">
+              <node concept="3clFbS" id="2vJbluoJ_XW" role="2VODD2">
+                <node concept="3clFbF" id="2vJbluoJ_XX" role="3cqZAp">
+                  <node concept="2OqwBi" id="2vJbluoJ_XY" role="3clFbG">
+                    <node concept="pncrf" id="2vJbluoJ_XZ" role="2Oq$k0" />
+                    <node concept="2qgKlT" id="2vJbluoJ_Y0" role="2OqNvi">
+                      <ref role="37wK5l" to="3lmi:wJ8RSAMj7a" resolve="getActiveLanguage" />
+                      <node concept="2OqwBi" id="2vJbluoJ_Y1" role="37wK5m">
+                        <node concept="pncrf" id="2vJbluoJ_Y2" role="2Oq$k0" />
+                        <node concept="I4A8Y" id="2vJbluoJ_Y3" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1yz3lS" id="2vJbluoJ_Y4" role="1yzFaX">
+              <node concept="3F0A7n" id="2vJbluoJ_Y5" role="2wV5jI">
+                <ref role="1NtTu8" to="lnwe:2vJbluoeqnu" resolve="eDuties" />
+              </node>
+            </node>
+          </node>
+          <node concept="3F0ifn" id="2vJbluoJ_Y6" role="3EZMnx">
+            <property role="3F0ifm" value=":" />
+            <ref role="1k5W1q" node="5LeOc1$LXOc" resolve="Colon" />
+          </node>
+          <node concept="l2Vlx" id="2vJbluoJ_Y7" role="2iSdaV" />
         </node>
         <node concept="3EZMnI" id="27H3E6HtT7i" role="3EZMnx">
           <node concept="s8t4o" id="qKaVF7rlkD" role="3EZMnx">
@@ -750,8 +853,42 @@
           </node>
           <node concept="l2Vlx" id="27H3E6HtT7j" role="2iSdaV" />
         </node>
-        <node concept="3F0ifn" id="5Xjenljcz2K" role="3EZMnx">
-          <property role="3F0ifm" value="sources:" />
+        <node concept="3EZMnI" id="2vJbluoJAg5" role="3EZMnx">
+          <node concept="VPM3Z" id="2vJbluoJAg6" role="3F10Kt" />
+          <node concept="s8t4o" id="2vJbluoJAg7" role="3EZMnx">
+            <property role="28Zw97" value="true" />
+            <ref role="28F8cf" to="lnwe:2ACGKFDB3mq" resolve="Language" />
+            <ref role="1k5W1q" node="3JnAoJLLnLN" resolve="Editor" />
+            <node concept="xShMh" id="2vJbluoJAg8" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+            <node concept="s8sZD" id="2vJbluoJAg9" role="sbcd9">
+              <node concept="3clFbS" id="2vJbluoJAga" role="2VODD2">
+                <node concept="3clFbF" id="2vJbluoJAgb" role="3cqZAp">
+                  <node concept="2OqwBi" id="2vJbluoJAgc" role="3clFbG">
+                    <node concept="pncrf" id="2vJbluoJAgd" role="2Oq$k0" />
+                    <node concept="2qgKlT" id="2vJbluoJAge" role="2OqNvi">
+                      <ref role="37wK5l" to="3lmi:wJ8RSAMj7a" resolve="getActiveLanguage" />
+                      <node concept="2OqwBi" id="2vJbluoJAgf" role="37wK5m">
+                        <node concept="pncrf" id="2vJbluoJAgg" role="2Oq$k0" />
+                        <node concept="I4A8Y" id="2vJbluoJAgh" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1yz3lS" id="2vJbluoJAgi" role="1yzFaX">
+              <node concept="3F0A7n" id="2vJbluoJAgj" role="2wV5jI">
+                <ref role="1NtTu8" to="lnwe:18WT3T5NnIH" resolve="eSources" />
+              </node>
+            </node>
+          </node>
+          <node concept="3F0ifn" id="2vJbluoJAgk" role="3EZMnx">
+            <property role="3F0ifm" value=":" />
+            <ref role="1k5W1q" node="5LeOc1$LXOc" resolve="Colon" />
+          </node>
+          <node concept="l2Vlx" id="2vJbluoJAgl" role="2iSdaV" />
         </node>
         <node concept="3EZMnI" id="5Xjenljcz2L" role="3EZMnx">
           <node concept="s8t4o" id="qKaVF7rlJ3" role="3EZMnx">
@@ -6174,205 +6311,244 @@
       <node concept="3F0ifn" id="1kyaHg5wZnd" role="3EZMnx">
         <property role="3F0ifm" value="Translations:" />
       </node>
-      <node concept="3EZMnI" id="3JnAoJLjzgS" role="3EZMnx">
-        <node concept="VPM3Z" id="3JnAoJLjzgU" role="3F10Kt" />
-        <node concept="3F0ifn" id="3JnAoJLjzhd" role="3EZMnx">
-          <property role="3F0ifm" value="Name:" />
-        </node>
-        <node concept="3F0A7n" id="3JnAoJLj$Xe" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:2ACGKFDhrgG" resolve="eName" />
-        </node>
-        <node concept="l2Vlx" id="3JnAoJLjzgX" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3JnAoJLjzhy" role="3EZMnx">
-        <node concept="VPM3Z" id="3JnAoJLjzh$" role="3F10Kt" />
-        <node concept="3F0ifn" id="3JnAoJLjzhA" role="3EZMnx">
-          <property role="3F0ifm" value="Function:" />
-        </node>
-        <node concept="3F0A7n" id="3JnAoJLj$Xl" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:2ACGKFDhrgI" resolve="eFunction" />
-        </node>
-        <node concept="l2Vlx" id="3JnAoJLjzhB" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3JnAoJLjzi9" role="3EZMnx">
-        <node concept="VPM3Z" id="3JnAoJLjzia" role="3F10Kt" />
-        <node concept="3F0ifn" id="3JnAoJLjzib" role="3EZMnx">
-          <property role="3F0ifm" value="References:" />
-        </node>
-        <node concept="3F0A7n" id="3JnAoJLj$Xs" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:2ACGKFDhrgL" resolve="eReferences" />
-        </node>
-        <node concept="l2Vlx" id="3JnAoJLjzic" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3JnAoJLjziN" role="3EZMnx">
-        <node concept="VPM3Z" id="3JnAoJLjziO" role="3F10Kt" />
-        <node concept="3F0ifn" id="3JnAoJLjziP" role="3EZMnx">
-          <property role="3F0ifm" value="Duty-Holder:" />
-        </node>
-        <node concept="3F0A7n" id="3JnAoJLj$XB" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:2ACGKFDhrF7" resolve="eDutyHolder" />
-        </node>
-        <node concept="l2Vlx" id="3JnAoJLjziQ" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3JnAoJLjzj9" role="3EZMnx">
-        <node concept="VPM3Z" id="3JnAoJLjzja" role="3F10Kt" />
-        <node concept="3F0ifn" id="3JnAoJLjzjb" role="3EZMnx">
-          <property role="3F0ifm" value="Claimant:" />
-        </node>
-        <node concept="3F0A7n" id="3JnAoJLj$XI" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:2ACGKFDhrFc" resolve="eClaimaint" />
-        </node>
-        <node concept="l2Vlx" id="3JnAoJLjzjc" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3JnAoJLjzjz" role="3EZMnx">
-        <node concept="VPM3Z" id="3JnAoJLjzj$" role="3F10Kt" />
-        <node concept="3F0ifn" id="3JnAoJLjzj_" role="3EZMnx">
-          <property role="3F0ifm" value="Create:" />
-        </node>
-        <node concept="3F0A7n" id="3JnAoJLj$XP" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:2ACGKFDhrFi" resolve="eCreate" />
-        </node>
-        <node concept="l2Vlx" id="3JnAoJLjzjA" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3JnAoJLjzk1" role="3EZMnx">
-        <node concept="VPM3Z" id="3JnAoJLjzk2" role="3F10Kt" />
-        <node concept="3F0ifn" id="3JnAoJLjzk3" role="3EZMnx">
-          <property role="3F0ifm" value="Terminate:" />
-        </node>
-        <node concept="3F0A7n" id="3JnAoJLj$XW" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:2ACGKFDhrFp" resolve="eTerminate" />
-        </node>
-        <node concept="l2Vlx" id="3JnAoJLjzk4" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3JnAoJLjzkz" role="3EZMnx">
-        <node concept="VPM3Z" id="3JnAoJLjzk$" role="3F10Kt" />
-        <node concept="3F0ifn" id="3JnAoJLjzk_" role="3EZMnx">
-          <property role="3F0ifm" value="Duty-Components:" />
-        </node>
-        <node concept="3F0A7n" id="3JnAoJLj$Y3" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:2ACGKFDhrFx" resolve="eDutyComponents" />
-        </node>
-        <node concept="l2Vlx" id="3JnAoJLjzkA" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3JnAoJLjzl9" role="3EZMnx">
-        <node concept="VPM3Z" id="3JnAoJLjzla" role="3F10Kt" />
-        <node concept="3F0ifn" id="3JnAoJLjzlb" role="3EZMnx">
-          <property role="3F0ifm" value="Explanaition:" />
-        </node>
-        <node concept="3F0A7n" id="3JnAoJLj$Ya" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:2ACGKFDhrFE" resolve="eExplanation" />
-        </node>
-        <node concept="l2Vlx" id="3JnAoJLjzlc" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3JnAoJLjzlN" role="3EZMnx">
-        <node concept="VPM3Z" id="3JnAoJLjzlO" role="3F10Kt" />
-        <node concept="3F0ifn" id="3JnAoJLjzlP" role="3EZMnx">
-          <property role="3F0ifm" value="Actor:" />
-        </node>
-        <node concept="3F0A7n" id="3JnAoJLj$Yh" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:2ACGKFDhrFO" resolve="eActor" />
-        </node>
-        <node concept="l2Vlx" id="3JnAoJLjzlQ" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3JnAoJLjzmx" role="3EZMnx">
-        <node concept="VPM3Z" id="3JnAoJLjzmy" role="3F10Kt" />
-        <node concept="3F0ifn" id="3JnAoJLjzmz" role="3EZMnx">
-          <property role="3F0ifm" value="Action:" />
-        </node>
-        <node concept="3F0A7n" id="3JnAoJLj$Yo" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:2ACGKFDhs69" resolve="eAction" />
-        </node>
-        <node concept="l2Vlx" id="3JnAoJLjzm$" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3JnAoJLjznj" role="3EZMnx">
-        <node concept="VPM3Z" id="3JnAoJLjznk" role="3F10Kt" />
-        <node concept="3F0ifn" id="3JnAoJLjznl" role="3EZMnx">
-          <property role="3F0ifm" value="Object:" />
-        </node>
-        <node concept="3F0A7n" id="3JnAoJLj$Yz" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:2ACGKFDhs6l" resolve="eObject" />
-        </node>
-        <node concept="l2Vlx" id="3JnAoJLjznm" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3JnAoJLjzo9" role="3EZMnx">
-        <node concept="VPM3Z" id="3JnAoJLjzoa" role="3F10Kt" />
-        <node concept="3F0ifn" id="3JnAoJLjzob" role="3EZMnx">
-          <property role="3F0ifm" value="Recipient:" />
-        </node>
-        <node concept="3F0A7n" id="3JnAoJLj$YE" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:2ACGKFDhs6y" resolve="eRecipient" />
-        </node>
-        <node concept="l2Vlx" id="3JnAoJLjzoc" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3JnAoJLjzp3" role="3EZMnx">
-        <node concept="VPM3Z" id="3JnAoJLjzp4" role="3F10Kt" />
-        <node concept="3F0ifn" id="3JnAoJLjzp5" role="3EZMnx">
-          <property role="3F0ifm" value="Preconditions:" />
-        </node>
-        <node concept="3F0A7n" id="3JnAoJLj$YL" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:2ACGKFDhs6K" resolve="ePreconditions" />
-        </node>
-        <node concept="l2Vlx" id="3JnAoJLjzp6" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="1kyaHg5wZlK" role="3EZMnx">
-        <node concept="VPM3Z" id="1kyaHg5wZlM" role="3F10Kt" />
-        <node concept="3F0ifn" id="1kyaHg5wZlO" role="3EZMnx">
-          <property role="3F0ifm" value="Language:" />
-        </node>
-        <node concept="3F0A7n" id="1kyaHg5wZn9" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:1kyaHg5wV$R" resolve="eLanguage" />
-        </node>
-        <node concept="l2Vlx" id="1kyaHg5wZlP" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="18WT3T5NslE" role="3EZMnx">
-        <node concept="VPM3Z" id="18WT3T5NslG" role="3F10Kt" />
-        <node concept="3F0ifn" id="18WT3T5NslI" role="3EZMnx">
-          <property role="3F0ifm" value="Sources:" />
-        </node>
-        <node concept="3F0A7n" id="18WT3T5Nsne" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:18WT3T5NnIH" resolve="eSources" />
-        </node>
-        <node concept="l2Vlx" id="18WT3T5NslJ" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="58KmcqBh2ah" role="3EZMnx">
-        <node concept="VPM3Z" id="58KmcqBh2aj" role="3F10Kt" />
-        <node concept="3F0ifn" id="58KmcqBh2al" role="3EZMnx">
-          <property role="3F0ifm" value="Text:" />
-        </node>
-        <node concept="3F0A7n" id="58KmcqBh2bQ" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:58KmcqBh1Rl" resolve="eText" />
-        </node>
-        <node concept="l2Vlx" id="58KmcqBh2am" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="58KmcqBnjlV" role="3EZMnx">
-        <node concept="VPM3Z" id="58KmcqBnjlX" role="3F10Kt" />
-        <node concept="3F0ifn" id="58KmcqBnjlZ" role="3EZMnx">
-          <property role="3F0ifm" value="Find line in source:" />
-        </node>
-        <node concept="3F0A7n" id="58KmcqBnogl" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:58KmcqBnjn_" resolve="eFindLineInSource" />
-        </node>
-        <node concept="l2Vlx" id="58KmcqBnjm0" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="58KmcqB_LZ1" role="3EZMnx">
-        <node concept="VPM3Z" id="58KmcqB_LZ3" role="3F10Kt" />
-        <node concept="3F0ifn" id="58KmcqB_LZ5" role="3EZMnx">
-          <property role="3F0ifm" value="ValidFrom:" />
-        </node>
-        <node concept="3F0A7n" id="58KmcqB_M5N" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:58KmcqB_LWP" resolve="eValidFrom" />
-        </node>
-        <node concept="l2Vlx" id="58KmcqB_LZ6" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="58KmcqB_M3W" role="3EZMnx">
-        <node concept="VPM3Z" id="58KmcqB_M3Y" role="3F10Kt" />
-        <node concept="3F0ifn" id="58KmcqB_M40" role="3EZMnx">
-          <property role="3F0ifm" value="ValidTo:" />
-        </node>
-        <node concept="3F0A7n" id="58KmcqB_M5Y" role="3EZMnx">
-          <ref role="1NtTu8" to="lnwe:58KmcqB_LX9" resolve="eValidTo" />
+      <node concept="3EZMnI" id="2vJbluozjnH" role="3EZMnx">
+        <node concept="3XFhqQ" id="2vJbluo$pce" role="3EZMnx" />
+        <node concept="l2Vlx" id="2vJbluozjnI" role="2iSdaV" />
+        <node concept="3EZMnI" id="2vJbluoydw2" role="3EZMnx">
+          <node concept="VPM3Z" id="2vJbluoydw4" role="3F10Kt" />
+          <node concept="3EZMnI" id="3JnAoJLjzgS" role="3EZMnx">
+            <node concept="VPM3Z" id="3JnAoJLjzgU" role="3F10Kt" />
+            <node concept="3F0ifn" id="3JnAoJLjzhd" role="3EZMnx">
+              <property role="3F0ifm" value="Name:" />
+            </node>
+            <node concept="3F0A7n" id="3JnAoJLj$Xe" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:2ACGKFDhrgG" resolve="eName" />
+            </node>
+            <node concept="l2Vlx" id="3JnAoJLjzgX" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="2vJbluoeqbV" role="3EZMnx">
+            <node concept="VPM3Z" id="2vJbluoeqbW" role="3F10Kt" />
+            <node concept="3F0ifn" id="2vJbluoeqbX" role="3EZMnx">
+              <property role="3F0ifm" value="Acts:" />
+            </node>
+            <node concept="3F0A7n" id="2vJbluoeqbY" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:2vJbluoeqmL" resolve="eActs" />
+            </node>
+            <node concept="l2Vlx" id="2vJbluoeqbZ" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="2vJbluoeqfo" role="3EZMnx">
+            <node concept="VPM3Z" id="2vJbluoeqfp" role="3F10Kt" />
+            <node concept="3F0ifn" id="2vJbluoeqfq" role="3EZMnx">
+              <property role="3F0ifm" value="Facts:" />
+            </node>
+            <node concept="3F0A7n" id="2vJbluoeqfr" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:2vJbluoeqn7" resolve="eFacts" />
+            </node>
+            <node concept="l2Vlx" id="2vJbluoeqfs" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="2vJbluoeqj1" role="3EZMnx">
+            <node concept="VPM3Z" id="2vJbluoeqj2" role="3F10Kt" />
+            <node concept="3F0ifn" id="2vJbluoeqj3" role="3EZMnx">
+              <property role="3F0ifm" value="Duties:" />
+            </node>
+            <node concept="3F0A7n" id="2vJbluoeqj4" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:2vJbluoeqnu" resolve="eDuties" />
+            </node>
+            <node concept="l2Vlx" id="2vJbluoeqj5" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3JnAoJLjzhy" role="3EZMnx">
+            <node concept="VPM3Z" id="3JnAoJLjzh$" role="3F10Kt" />
+            <node concept="3F0ifn" id="3JnAoJLjzhA" role="3EZMnx">
+              <property role="3F0ifm" value="Function:" />
+            </node>
+            <node concept="3F0A7n" id="3JnAoJLj$Xl" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:2ACGKFDhrgI" resolve="eFunction" />
+            </node>
+            <node concept="l2Vlx" id="3JnAoJLjzhB" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3JnAoJLjzi9" role="3EZMnx">
+            <node concept="VPM3Z" id="3JnAoJLjzia" role="3F10Kt" />
+            <node concept="3F0ifn" id="3JnAoJLjzib" role="3EZMnx">
+              <property role="3F0ifm" value="References:" />
+            </node>
+            <node concept="3F0A7n" id="3JnAoJLj$Xs" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:2ACGKFDhrgL" resolve="eReferences" />
+            </node>
+            <node concept="l2Vlx" id="3JnAoJLjzic" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3JnAoJLjziN" role="3EZMnx">
+            <node concept="VPM3Z" id="3JnAoJLjziO" role="3F10Kt" />
+            <node concept="3F0ifn" id="3JnAoJLjziP" role="3EZMnx">
+              <property role="3F0ifm" value="Duty-Holder:" />
+            </node>
+            <node concept="3F0A7n" id="3JnAoJLj$XB" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:2ACGKFDhrF7" resolve="eDutyHolder" />
+            </node>
+            <node concept="l2Vlx" id="3JnAoJLjziQ" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3JnAoJLjzj9" role="3EZMnx">
+            <node concept="VPM3Z" id="3JnAoJLjzja" role="3F10Kt" />
+            <node concept="3F0ifn" id="3JnAoJLjzjb" role="3EZMnx">
+              <property role="3F0ifm" value="Claimant:" />
+            </node>
+            <node concept="3F0A7n" id="3JnAoJLj$XI" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:2ACGKFDhrFc" resolve="eClaimaint" />
+            </node>
+            <node concept="l2Vlx" id="3JnAoJLjzjc" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3JnAoJLjzjz" role="3EZMnx">
+            <node concept="VPM3Z" id="3JnAoJLjzj$" role="3F10Kt" />
+            <node concept="3F0ifn" id="3JnAoJLjzj_" role="3EZMnx">
+              <property role="3F0ifm" value="Create:" />
+            </node>
+            <node concept="3F0A7n" id="3JnAoJLj$XP" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:2ACGKFDhrFi" resolve="eCreate" />
+            </node>
+            <node concept="l2Vlx" id="3JnAoJLjzjA" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3JnAoJLjzk1" role="3EZMnx">
+            <node concept="VPM3Z" id="3JnAoJLjzk2" role="3F10Kt" />
+            <node concept="3F0ifn" id="3JnAoJLjzk3" role="3EZMnx">
+              <property role="3F0ifm" value="Terminate:" />
+            </node>
+            <node concept="3F0A7n" id="3JnAoJLj$XW" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:2ACGKFDhrFp" resolve="eTerminate" />
+            </node>
+            <node concept="l2Vlx" id="3JnAoJLjzk4" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3JnAoJLjzkz" role="3EZMnx">
+            <node concept="VPM3Z" id="3JnAoJLjzk$" role="3F10Kt" />
+            <node concept="3F0ifn" id="3JnAoJLjzk_" role="3EZMnx">
+              <property role="3F0ifm" value="Duty-Components:" />
+            </node>
+            <node concept="3F0A7n" id="3JnAoJLj$Y3" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:2ACGKFDhrFx" resolve="eDutyComponents" />
+            </node>
+            <node concept="l2Vlx" id="3JnAoJLjzkA" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3JnAoJLjzl9" role="3EZMnx">
+            <node concept="VPM3Z" id="3JnAoJLjzla" role="3F10Kt" />
+            <node concept="3F0ifn" id="3JnAoJLjzlb" role="3EZMnx">
+              <property role="3F0ifm" value="Explanaition:" />
+            </node>
+            <node concept="3F0A7n" id="3JnAoJLj$Ya" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:2ACGKFDhrFE" resolve="eExplanation" />
+            </node>
+            <node concept="l2Vlx" id="3JnAoJLjzlc" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3JnAoJLjzlN" role="3EZMnx">
+            <node concept="VPM3Z" id="3JnAoJLjzlO" role="3F10Kt" />
+            <node concept="3F0ifn" id="3JnAoJLjzlP" role="3EZMnx">
+              <property role="3F0ifm" value="Actor:" />
+            </node>
+            <node concept="3F0A7n" id="3JnAoJLj$Yh" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:2ACGKFDhrFO" resolve="eActor" />
+            </node>
+            <node concept="l2Vlx" id="3JnAoJLjzlQ" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3JnAoJLjzmx" role="3EZMnx">
+            <node concept="VPM3Z" id="3JnAoJLjzmy" role="3F10Kt" />
+            <node concept="3F0ifn" id="3JnAoJLjzmz" role="3EZMnx">
+              <property role="3F0ifm" value="Action:" />
+            </node>
+            <node concept="3F0A7n" id="3JnAoJLj$Yo" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:2ACGKFDhs69" resolve="eAction" />
+            </node>
+            <node concept="l2Vlx" id="3JnAoJLjzm$" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3JnAoJLjznj" role="3EZMnx">
+            <node concept="VPM3Z" id="3JnAoJLjznk" role="3F10Kt" />
+            <node concept="3F0ifn" id="3JnAoJLjznl" role="3EZMnx">
+              <property role="3F0ifm" value="Object:" />
+            </node>
+            <node concept="3F0A7n" id="3JnAoJLj$Yz" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:2ACGKFDhs6l" resolve="eObject" />
+            </node>
+            <node concept="l2Vlx" id="3JnAoJLjznm" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3JnAoJLjzo9" role="3EZMnx">
+            <node concept="VPM3Z" id="3JnAoJLjzoa" role="3F10Kt" />
+            <node concept="3F0ifn" id="3JnAoJLjzob" role="3EZMnx">
+              <property role="3F0ifm" value="Recipient:" />
+            </node>
+            <node concept="3F0A7n" id="3JnAoJLj$YE" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:2ACGKFDhs6y" resolve="eRecipient" />
+            </node>
+            <node concept="l2Vlx" id="3JnAoJLjzoc" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3JnAoJLjzp3" role="3EZMnx">
+            <node concept="VPM3Z" id="3JnAoJLjzp4" role="3F10Kt" />
+            <node concept="3F0ifn" id="3JnAoJLjzp5" role="3EZMnx">
+              <property role="3F0ifm" value="Preconditions:" />
+            </node>
+            <node concept="3F0A7n" id="3JnAoJLj$YL" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:2ACGKFDhs6K" resolve="ePreconditions" />
+            </node>
+            <node concept="l2Vlx" id="3JnAoJLjzp6" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="1kyaHg5wZlK" role="3EZMnx">
+            <node concept="VPM3Z" id="1kyaHg5wZlM" role="3F10Kt" />
+            <node concept="3F0ifn" id="1kyaHg5wZlO" role="3EZMnx">
+              <property role="3F0ifm" value="Language:" />
+            </node>
+            <node concept="3F0A7n" id="1kyaHg5wZn9" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:1kyaHg5wV$R" resolve="eLanguage" />
+            </node>
+            <node concept="l2Vlx" id="1kyaHg5wZlP" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="18WT3T5NslE" role="3EZMnx">
+            <node concept="VPM3Z" id="18WT3T5NslG" role="3F10Kt" />
+            <node concept="3F0ifn" id="18WT3T5NslI" role="3EZMnx">
+              <property role="3F0ifm" value="Sources:" />
+            </node>
+            <node concept="3F0A7n" id="18WT3T5Nsne" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:18WT3T5NnIH" resolve="eSources" />
+            </node>
+            <node concept="l2Vlx" id="18WT3T5NslJ" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="58KmcqBh2ah" role="3EZMnx">
+            <node concept="VPM3Z" id="58KmcqBh2aj" role="3F10Kt" />
+            <node concept="3F0ifn" id="58KmcqBh2al" role="3EZMnx">
+              <property role="3F0ifm" value="Text:" />
+            </node>
+            <node concept="3F0A7n" id="58KmcqBh2bQ" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:58KmcqBh1Rl" resolve="eText" />
+            </node>
+            <node concept="l2Vlx" id="58KmcqBh2am" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="58KmcqBnjlV" role="3EZMnx">
+            <node concept="VPM3Z" id="58KmcqBnjlX" role="3F10Kt" />
+            <node concept="3F0ifn" id="58KmcqBnjlZ" role="3EZMnx">
+              <property role="3F0ifm" value="Find line in source:" />
+            </node>
+            <node concept="3F0A7n" id="58KmcqBnogl" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:58KmcqBnjn_" resolve="eFindLineInSource" />
+            </node>
+            <node concept="l2Vlx" id="58KmcqBnjm0" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="58KmcqB_LZ1" role="3EZMnx">
+            <node concept="VPM3Z" id="58KmcqB_LZ3" role="3F10Kt" />
+            <node concept="3F0ifn" id="58KmcqB_LZ5" role="3EZMnx">
+              <property role="3F0ifm" value="ValidFrom:" />
+            </node>
+            <node concept="3F0A7n" id="58KmcqB_M5N" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:58KmcqB_LWP" resolve="eValidFrom" />
+            </node>
+            <node concept="l2Vlx" id="58KmcqB_LZ6" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="58KmcqB_M3W" role="3EZMnx">
+            <node concept="VPM3Z" id="58KmcqB_M3Y" role="3F10Kt" />
+            <node concept="3F0ifn" id="58KmcqB_M40" role="3EZMnx">
+              <property role="3F0ifm" value="ValidTo:" />
+            </node>
+            <node concept="3F0A7n" id="58KmcqB_M5Y" role="3EZMnx">
+              <ref role="1NtTu8" to="lnwe:58KmcqB_LX9" resolve="eValidTo" />
+            </node>
+            <node concept="l2Vlx" id="58KmcqB_M41" role="2iSdaV" />
+          </node>
+          <node concept="3F0ifn" id="2vJbluoydw6" role="3EZMnx" />
+          <node concept="2iRkQZ" id="2vJbluoydw7" role="2iSdaV" />
         </node>
-        <node concept="l2Vlx" id="58KmcqB_M41" role="2iSdaV" />
       </node>
       <node concept="2iRkQZ" id="3JnAoJLjzgO" role="2iSdaV" />
     </node>
diff --git a/code/languages/Flint/models/Flint.languages.mps b/code/languages/Flint/models/Flint.languages.mps
index cc04c77..955ee84 100644
--- a/code/languages/Flint/models/Flint.languages.mps
+++ b/code/languages/Flint/models/Flint.languages.mps
@@ -11,6 +11,9 @@
     <language id="69940819-10c1-4a38-ac44-700b63f993ba" name="Flint">
       <concept id="3001846011087139046" name="Flint.structure.Language" flags="ng" index="30VgfG">
         <property id="1522826714118601015" name="eLanguage" index="gCpfz" />
+        <property id="2877568541152355806" name="eDuties" index="2ZPCy9" />
+        <property id="2877568541152355783" name="eFacts" index="2ZPCyg" />
+        <property id="2877568541152355761" name="eActs" index="2ZPCzA" />
         <property id="3001846011087139886" name="eFunction" index="30Vgs$" />
         <property id="3001846011087139884" name="eName" index="30VgsA" />
         <property id="3001846011087139889" name="eReferences" index="30VgsV" />
@@ -60,6 +63,9 @@
     <property role="3PrmOz" value="Vind lijn in Bron" />
     <property role="3PDOvN" value="geldig vanaf" />
     <property role="3PDOuf" value="geldig tot" />
+    <property role="2ZPCyg" value="feiten" />
+    <property role="2ZPCy9" value="plichten" />
+    <property role="2ZPCzA" value="daden" />
   </node>
   <node concept="30VgfG" id="4L0TsavKybn">
     <property role="TrG5h" value="English" />
@@ -83,6 +89,9 @@
     <property role="3PrmOz" value="Find line in Source" />
     <property role="3PDOvN" value="valid from" />
     <property role="3PDOuf" value="valid to" />
+    <property role="2ZPCzA" value="acts" />
+    <property role="2ZPCyg" value="facts" />
+    <property role="2ZPCy9" value="duties" />
   </node>
 </model>
 
diff --git a/code/languages/Flint/models/Flint.structure.mps b/code/languages/Flint/models/Flint.structure.mps
index b264ca8..2f56c85 100644
--- a/code/languages/Flint/models/Flint.structure.mps
+++ b/code/languages/Flint/models/Flint.structure.mps
@@ -75,6 +75,9 @@
     <node concept="PrWs8" id="74VLc6k_$J5" role="PzmwI">
       <ref role="PrY4T" node="74VLc6k_$IQ" resolve="IFlintModel" />
     </node>
+    <node concept="PrWs8" id="2vJbluoJwl6" role="PzmwI">
+      <ref role="PrY4T" node="wJ8RSAMhPl" resolve="IHasLanguage" />
+    </node>
     <node concept="1TJgyj" id="5XjenljaN20" role="1TKVEi">
       <property role="IQ2ns" value="6868897032739434624" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -1098,6 +1101,21 @@
       <property role="TrG5h" value="eName" />
       <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
     </node>
+    <node concept="1TJgyi" id="2vJbluoeqmL" role="1TKVEl">
+      <property role="IQ2nx" value="2877568541152355761" />
+      <property role="TrG5h" value="eActs" />
+      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
+    </node>
+    <node concept="1TJgyi" id="2vJbluoeqn7" role="1TKVEl">
+      <property role="IQ2nx" value="2877568541152355783" />
+      <property role="TrG5h" value="eFacts" />
+      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
+    </node>
+    <node concept="1TJgyi" id="2vJbluoeqnu" role="1TKVEl">
+      <property role="IQ2nx" value="2877568541152355806" />
+      <property role="TrG5h" value="eDuties" />
+      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
+    </node>
     <node concept="1TJgyi" id="2ACGKFDhrgI" role="1TKVEl">
       <property role="IQ2nx" value="3001846011087139886" />
       <property role="TrG5h" value="eFunction" />
diff --git a/code/solutions/Flint.test/models/Flint.test.mpstest.mps b/code/solutions/Flint.test/models/Flint.test.mpstest.mps
index af6d396..c6a0725 100644
--- a/code/solutions/Flint.test/models/Flint.test.mpstest.mps
+++ b/code/solutions/Flint.test/models/Flint.test.mpstest.mps
@@ -40,6 +40,8 @@
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="jov5" ref="r:9249307a-27f2-447e-8e8c-b4f939b97d5c(Flint.languages)" implicit="true" />
+    <import index="f4zo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.cells(MPS.Editor/)" implicit="true" />
+    <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" implicit="true" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@@ -469,6 +471,9 @@
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU">
+        <reference id="7400021826771268269" name="concept" index="2sp9C9" />
+      </concept>
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
@@ -3990,7 +3995,104 @@
       </node>
       <node concept="3cqZAl" id="222x$3yHovq" role="3clF45" />
     </node>
-    <node concept="2tJIrI" id="222x$3yHp63" role="jymVt" />
+    <node concept="2YIFZL" id="2vJbluoVUnt" role="jymVt">
+      <property role="TrG5h" value="nameHasCorrectLanguage" />
+      <node concept="3cqZAl" id="2vJbluoVUnv" role="3clF45" />
+      <node concept="3Tm1VV" id="2vJbluoVUnw" role="1B3o_S" />
+      <node concept="3clFbS" id="2vJbluoVUnx" role="3clF47">
+        <node concept="3cpWs8" id="2vJbluoVVP4" role="3cqZAp">
+          <node concept="3cpWsn" id="2vJbluoVVP5" role="3cpWs9">
+            <property role="TrG5h" value="eNameCell" />
+            <node concept="3uibUv" id="2vJbluoVVP6" role="1tU5fm">
+              <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
+            </node>
+            <node concept="AH0OO" id="2vJbluoVVP7" role="33vP2m">
+              <node concept="3cmrfG" id="2vJbluoVVP8" role="AHEQo">
+                <property role="3cmrfH" value="0" />
+              </node>
+              <node concept="2OqwBi" id="2vJbluoVVP9" role="AHHXb">
+                <node concept="1eOMI4" id="2vJbluoVVPa" role="2Oq$k0">
+                  <node concept="10QFUN" id="2vJbluoVVPb" role="1eOMHV">
+                    <node concept="3uibUv" id="2vJbluoVVPc" role="10QFUM">
+                      <ref role="3uigEE" to="g51k:~EditorCell_Collection" resolve="EditorCell_Collection" />
+                    </node>
+                    <node concept="37vLTw" id="2vJbluoVWQX" role="10QFUP">
+                      <ref role="3cqZAo" node="2vJbluoVW_A" resolve="queryCollection" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="2vJbluoVVPe" role="2OqNvi">
+                  <ref role="37wK5l" to="g51k:~EditorCell_Collection.getCells()" resolve="getCells" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2vJbluoVVPf" role="3cqZAp">
+          <node concept="3cpWsn" id="2vJbluoVVPg" role="3cpWs9">
+            <property role="TrG5h" value="correctString" />
+            <node concept="17QB3L" id="2vJbluoVVPh" role="1tU5fm" />
+            <node concept="2OqwBi" id="2vJbluoVVPi" role="33vP2m">
+              <node concept="2OqwBi" id="2vJbluoVVPj" role="2Oq$k0">
+                <node concept="Vyspw" id="2vJbluoVVPm" role="2OqNvi">
+                  <node concept="2OqwBi" id="2vJbluoVXLT" role="Vysub">
+                    <node concept="2OqwBi" id="2vJbluoVXmy" role="2Oq$k0">
+                      <node concept="37vLTw" id="2vJbluoVX5U" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2vJbluoVW_A" resolve="queryCollection" />
+                      </node>
+                      <node concept="liA8E" id="2vJbluoVXDT" role="2OqNvi">
+                        <ref role="37wK5l" to="f4zo:~EditorCell.getContext()" resolve="getContext" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="2vJbluoVY31" role="2OqNvi">
+                      <ref role="37wK5l" to="cj4x:~EditorContext.getRepository()" resolve="getRepository" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="2vJbluoVYNY" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2vJbluoVWUs" resolve="language" />
+                </node>
+              </node>
+              <node concept="3TrcHB" id="2vJbluoVVPs" role="2OqNvi">
+                <ref role="3TsBF5" to="lnwe:2ACGKFDhrgG" resolve="eName" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3vlDli" id="2vJbluoVVPt" role="3cqZAp">
+          <node concept="2OqwBi" id="2vJbluoVVPu" role="3tpDZB">
+            <node concept="1eOMI4" id="2vJbluoVVPv" role="2Oq$k0">
+              <node concept="10QFUN" id="2vJbluoVVPw" role="1eOMHV">
+                <node concept="3uibUv" id="2vJbluoVVPx" role="10QFUM">
+                  <ref role="3uigEE" to="g51k:~EditorCell_Property" resolve="EditorCell_Property" />
+                </node>
+                <node concept="37vLTw" id="2vJbluoVVPy" role="10QFUP">
+                  <ref role="3cqZAo" node="2vJbluoVVP5" resolve="eNameCell" />
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="2vJbluoVVPz" role="2OqNvi">
+              <ref role="37wK5l" to="g51k:~EditorCell_Label.getText()" resolve="getText" />
+            </node>
+          </node>
+          <node concept="37vLTw" id="2vJbluoVVP$" role="3tpDZA">
+            <ref role="3cqZAo" node="2vJbluoVVPg" resolve="correctString" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="2vJbluoVW_A" role="3clF46">
+        <property role="TrG5h" value="queryCollection" />
+        <node concept="3uibUv" id="2vJbluoVW__" role="1tU5fm">
+          <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2vJbluoVWUs" role="3clF46">
+        <property role="TrG5h" value="language" />
+        <node concept="2sp9CU" id="2vJbluoVYy5" role="1tU5fm">
+          <ref role="2sp9C9" to="lnwe:2ACGKFDB3mq" resolve="Language" />
+        </node>
+      </node>
+    </node>
     <node concept="3Tm1VV" id="222x$3yHosT" role="1B3o_S" />
   </node>
   <node concept="LiM7Y" id="m$6eIWcxa5">
@@ -4517,20 +4619,9 @@
             <ref role="37wK5l" to="lui2:~ModelAccess.runReadAction(java.lang.Runnable)" resolve="runReadAction" />
             <node concept="1bVj0M" id="65EbUSX8Z0f" role="37wK5m">
               <node concept="3clFbS" id="65EbUSX8Z0g" role="1bW5cS">
-                <node concept="3cpWs8" id="65EbUSX9o7L" role="3cqZAp">
-                  <node concept="3cpWsn" id="65EbUSX9o7O" role="3cpWs9">
-                    <property role="TrG5h" value="ref" />
-                    <node concept="3Tqbb2" id="65EbUSX9o7J" role="1tU5fm">
-                      <ref role="ehGHo" to="1z9r:I0eN_aLAQU" resolve="LanguageAct" />
-                    </node>
-                    <node concept="3xONca" id="mUS$m9r36Y" role="33vP2m">
-                      <ref role="3xOPvv" node="mUS$m9r36D" resolve="dAct" />
-                    </node>
-                  </node>
-                </node>
                 <node concept="3cpWs8" id="mUS$m9iJFH" role="3cqZAp">
                   <node concept="3cpWsn" id="mUS$m9iJFI" role="3cpWs9">
-                    <property role="TrG5h" value="mainCell" />
+                    <property role="TrG5h" value="queryCollection" />
                     <node concept="3uibUv" id="mUS$m9iJFJ" role="1tU5fm">
                       <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
                     </node>
@@ -4538,8 +4629,8 @@
                       <node concept="369mXd" id="mUS$m9iJHx" role="2Oq$k0" />
                       <node concept="liA8E" id="mUS$m9jWca" role="2OqNvi">
                         <ref role="37wK5l" to="exr9:~EditorComponent.findCellWithId(org.jetbrains.mps.openapi.model.SNode,java.lang.String)" resolve="findCellWithId" />
-                        <node concept="37vLTw" id="mUS$m9jWeL" role="37wK5m">
-                          <ref role="3cqZAo" node="65EbUSX9o7O" resolve="ref" />
+                        <node concept="3xONca" id="2vJbluoWjjJ" role="37wK5m">
+                          <ref role="3xOPvv" node="mUS$m9r36D" resolve="dAct" />
                         </node>
                         <node concept="Xl_RD" id="mUS$m9lY9S" role="37wK5m">
                           <property role="Xl_RC" value="QueryList_jfbt31_a0a" />
@@ -4548,85 +4639,20 @@
                     </node>
                   </node>
                 </node>
-                <node concept="3cpWs8" id="mUS$m9n5M4" role="3cqZAp">
-                  <node concept="3cpWsn" id="mUS$m9n5M5" role="3cpWs9">
-                    <property role="TrG5h" value="eNameCell" />
-                    <node concept="3uibUv" id="mUS$m9n7IZ" role="1tU5fm">
-                      <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
+                <node concept="3clFbF" id="2vJbluoW9k3" role="3cqZAp">
+                  <node concept="2YIFZM" id="2vJbluoW9mD" role="3clFbG">
+                    <ref role="37wK5l" node="2vJbluoVUnt" resolve="nameHasCorrectLanguage" />
+                    <ref role="1Pybhc" node="222x$3yHosS" resolve="TestUtils" />
+                    <node concept="37vLTw" id="2vJbluoW9oZ" role="37wK5m">
+                      <ref role="3cqZAo" node="mUS$m9iJFI" resolve="queryCollection" />
                     </node>
-                    <node concept="AH0OO" id="mUS$m9n6kF" role="33vP2m">
-                      <node concept="3cmrfG" id="mUS$m9n6qB" role="AHEQo">
-                        <property role="3cmrfH" value="0" />
-                      </node>
-                      <node concept="2OqwBi" id="mUS$m9n6al" role="AHHXb">
-                        <node concept="1eOMI4" id="mUS$m9n6am" role="2Oq$k0">
-                          <node concept="10QFUN" id="mUS$m9n6an" role="1eOMHV">
-                            <node concept="3uibUv" id="mUS$m9n6ao" role="10QFUM">
-                              <ref role="3uigEE" to="g51k:~EditorCell_Collection" resolve="EditorCell_Collection" />
-                            </node>
-                            <node concept="37vLTw" id="mUS$m9n6ap" role="10QFUP">
-                              <ref role="3cqZAo" node="mUS$m9iJFI" resolve="mainCell" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="mUS$m9n6aq" role="2OqNvi">
-                          <ref role="37wK5l" to="g51k:~EditorCell_Collection.getCells()" resolve="getCells" />
-                        </node>
+                    <node concept="2tJFMh" id="2vJbluoW9vw" role="37wK5m">
+                      <node concept="ZC_QK" id="2vJbluoW9zw" role="2tJFKM">
+                        <ref role="2aWVGs" to="jov5:4L0TsavKybn" resolve="English" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3cpWs8" id="mUS$m9o7H3" role="3cqZAp">
-                  <node concept="3cpWsn" id="mUS$m9o7H6" role="3cpWs9">
-                    <property role="TrG5h" value="eNameEnglish" />
-                    <node concept="17QB3L" id="mUS$m9o7H1" role="1tU5fm" />
-                    <node concept="2OqwBi" id="mUS$m9o8b6" role="33vP2m">
-                      <node concept="2OqwBi" id="mUS$m9o8b7" role="2Oq$k0">
-                        <node concept="2tJFMh" id="mUS$m9o8b8" role="2Oq$k0">
-                          <node concept="ZC_QK" id="mUS$m9o8ob" role="2tJFKM">
-                            <ref role="2aWVGs" to="jov5:4L0TsavKybn" resolve="English" />
-                          </node>
-                        </node>
-                        <node concept="Vyspw" id="mUS$m9o8ba" role="2OqNvi">
-                          <node concept="2OqwBi" id="mUS$m9o8bb" role="Vysub">
-                            <node concept="2OqwBi" id="mUS$m9o8bc" role="2Oq$k0">
-                              <node concept="369mXd" id="mUS$m9o8bd" role="2Oq$k0" />
-                              <node concept="liA8E" id="mUS$m9o8be" role="2OqNvi">
-                                <ref role="37wK5l" to="exr9:~EditorComponent.getEditorContext()" resolve="getEditorContext" />
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="mUS$m9o8bf" role="2OqNvi">
-                              <ref role="37wK5l" to="exr9:~EditorContext.getRepository()" resolve="getRepository" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3TrcHB" id="mUS$m9o8bg" role="2OqNvi">
-                        <ref role="3TsBF5" to="lnwe:2ACGKFDhrgG" resolve="eName" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3vlDli" id="mUS$m9nacg" role="3cqZAp">
-                  <node concept="2OqwBi" id="mUS$m9naou" role="3tpDZB">
-                    <node concept="1eOMI4" id="mUS$m9naov" role="2Oq$k0">
-                      <node concept="10QFUN" id="mUS$m9naow" role="1eOMHV">
-                        <node concept="3uibUv" id="mUS$m9naox" role="10QFUM">
-                          <ref role="3uigEE" to="g51k:~EditorCell_Property" resolve="EditorCell_Property" />
-                        </node>
-                        <node concept="37vLTw" id="mUS$m9naoy" role="10QFUP">
-                          <ref role="3cqZAo" node="mUS$m9n5M5" resolve="eNameCell" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="mUS$m9naoz" role="2OqNvi">
-                      <ref role="37wK5l" to="g51k:~EditorCell_Label.getText()" resolve="getText" />
-                    </node>
-                  </node>
-                  <node concept="37vLTw" id="mUS$m9o8tm" role="3tpDZA">
-                    <ref role="3cqZAo" node="mUS$m9o7H6" resolve="eNameEnglish" />
-                  </node>
-                </node>
               </node>
             </node>
           </node>
@@ -4657,115 +4683,39 @@
             <ref role="37wK5l" to="lui2:~ModelAccess.runReadAction(java.lang.Runnable)" resolve="runReadAction" />
             <node concept="1bVj0M" id="mUS$m9omsW" role="37wK5m">
               <node concept="3clFbS" id="mUS$m9omsX" role="1bW5cS">
-                <node concept="3cpWs8" id="mUS$m9omsY" role="3cqZAp">
-                  <node concept="3cpWsn" id="mUS$m9omsZ" role="3cpWs9">
-                    <property role="TrG5h" value="ref" />
-                    <node concept="3Tqbb2" id="mUS$m9omt0" role="1tU5fm">
-                      <ref role="ehGHo" to="1z9r:I0eN_aLAQU" resolve="LanguageAct" />
-                    </node>
-                    <node concept="3xONca" id="mUS$m9r3bA" role="33vP2m">
-                      <ref role="3xOPvv" node="mUS$m9r36D" resolve="dAct" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="mUS$m9omt2" role="3cqZAp">
-                  <node concept="3cpWsn" id="mUS$m9omt3" role="3cpWs9">
-                    <property role="TrG5h" value="mainCell" />
-                    <node concept="3uibUv" id="mUS$m9omt4" role="1tU5fm">
+                <node concept="3cpWs8" id="2vJbluoWt0v" role="3cqZAp">
+                  <node concept="3cpWsn" id="2vJbluoWt0w" role="3cpWs9">
+                    <property role="TrG5h" value="queryCollection" />
+                    <node concept="3uibUv" id="2vJbluoWt0x" role="1tU5fm">
                       <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
                     </node>
-                    <node concept="2OqwBi" id="mUS$m9omt5" role="33vP2m">
-                      <node concept="369mXd" id="mUS$m9omt6" role="2Oq$k0" />
-                      <node concept="liA8E" id="mUS$m9omt7" role="2OqNvi">
+                    <node concept="2OqwBi" id="2vJbluoWt0y" role="33vP2m">
+                      <node concept="369mXd" id="2vJbluoWt0z" role="2Oq$k0" />
+                      <node concept="liA8E" id="2vJbluoWt0$" role="2OqNvi">
                         <ref role="37wK5l" to="exr9:~EditorComponent.findCellWithId(org.jetbrains.mps.openapi.model.SNode,java.lang.String)" resolve="findCellWithId" />
-                        <node concept="37vLTw" id="mUS$m9omt8" role="37wK5m">
-                          <ref role="3cqZAo" node="mUS$m9omsZ" resolve="ref" />
+                        <node concept="3xONca" id="2vJbluoWt0_" role="37wK5m">
+                          <ref role="3xOPvv" node="mUS$m9r36D" resolve="dAct" />
                         </node>
-                        <node concept="Xl_RD" id="mUS$m9omt9" role="37wK5m">
+                        <node concept="Xl_RD" id="2vJbluoWt0A" role="37wK5m">
                           <property role="Xl_RC" value="QueryList_jfbt31_a0a" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3cpWs8" id="mUS$m9omta" role="3cqZAp">
-                  <node concept="3cpWsn" id="mUS$m9omtb" role="3cpWs9">
-                    <property role="TrG5h" value="eNameCell" />
-                    <node concept="3uibUv" id="mUS$m9omtc" role="1tU5fm">
-                      <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
+                <node concept="3clFbF" id="2vJbluoWt0B" role="3cqZAp">
+                  <node concept="2YIFZM" id="2vJbluoWt0C" role="3clFbG">
+                    <ref role="37wK5l" node="2vJbluoVUnt" resolve="nameHasCorrectLanguage" />
+                    <ref role="1Pybhc" node="222x$3yHosS" resolve="TestUtils" />
+                    <node concept="37vLTw" id="2vJbluoWt0D" role="37wK5m">
+                      <ref role="3cqZAo" node="2vJbluoWt0w" resolve="queryCollection" />
                     </node>
-                    <node concept="AH0OO" id="mUS$m9omtd" role="33vP2m">
-                      <node concept="3cmrfG" id="mUS$m9omte" role="AHEQo">
-                        <property role="3cmrfH" value="0" />
+                    <node concept="2tJFMh" id="2vJbluoWt0E" role="37wK5m">
+                      <node concept="ZC_QK" id="2vJbluoWt5m" role="2tJFKM">
+                        <ref role="2aWVGs" to="jov5:4L0TsavKqOy" resolve="Dutch" />
                       </node>
-                      <node concept="2OqwBi" id="mUS$m9omtf" role="AHHXb">
-                        <node concept="1eOMI4" id="mUS$m9omtg" role="2Oq$k0">
-                          <node concept="10QFUN" id="mUS$m9omth" role="1eOMHV">
-                            <node concept="3uibUv" id="mUS$m9omti" role="10QFUM">
-                              <ref role="3uigEE" to="g51k:~EditorCell_Collection" resolve="EditorCell_Collection" />
-                            </node>
-                            <node concept="37vLTw" id="mUS$m9omtj" role="10QFUP">
-                              <ref role="3cqZAo" node="mUS$m9omt3" resolve="mainCell" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="mUS$m9omtk" role="2OqNvi">
-                          <ref role="37wK5l" to="g51k:~EditorCell_Collection.getCells()" resolve="getCells" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="mUS$m9omtl" role="3cqZAp">
-                  <node concept="3cpWsn" id="mUS$m9omtm" role="3cpWs9">
-                    <property role="TrG5h" value="eNameDutch" />
-                    <node concept="17QB3L" id="mUS$m9omtn" role="1tU5fm" />
-                    <node concept="2OqwBi" id="mUS$m9omto" role="33vP2m">
-                      <node concept="2OqwBi" id="mUS$m9omtp" role="2Oq$k0">
-                        <node concept="2tJFMh" id="mUS$m9omtq" role="2Oq$k0">
-                          <node concept="ZC_QK" id="mUS$m9omtr" role="2tJFKM">
-                            <ref role="2aWVGs" to="jov5:4L0TsavKqOy" resolve="Dutch" />
-                          </node>
-                        </node>
-                        <node concept="Vyspw" id="mUS$m9omts" role="2OqNvi">
-                          <node concept="2OqwBi" id="mUS$m9omtt" role="Vysub">
-                            <node concept="2OqwBi" id="mUS$m9omtu" role="2Oq$k0">
-                              <node concept="369mXd" id="mUS$m9omtv" role="2Oq$k0" />
-                              <node concept="liA8E" id="mUS$m9omtw" role="2OqNvi">
-                                <ref role="37wK5l" to="exr9:~EditorComponent.getEditorContext()" resolve="getEditorContext" />
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="mUS$m9omtx" role="2OqNvi">
-                              <ref role="37wK5l" to="exr9:~EditorContext.getRepository()" resolve="getRepository" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3TrcHB" id="mUS$m9omty" role="2OqNvi">
-                        <ref role="3TsBF5" to="lnwe:2ACGKFDhrgG" resolve="eName" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3vlDli" id="mUS$m9omtU" role="3cqZAp">
-                  <node concept="2OqwBi" id="mUS$m9omtV" role="3tpDZB">
-                    <node concept="1eOMI4" id="mUS$m9omtW" role="2Oq$k0">
-                      <node concept="10QFUN" id="mUS$m9omtX" role="1eOMHV">
-                        <node concept="3uibUv" id="mUS$m9omtY" role="10QFUM">
-                          <ref role="3uigEE" to="g51k:~EditorCell_Property" resolve="EditorCell_Property" />
-                        </node>
-                        <node concept="37vLTw" id="mUS$m9omtZ" role="10QFUP">
-                          <ref role="3cqZAo" node="mUS$m9omtb" resolve="eNameCell" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="mUS$m9omu0" role="2OqNvi">
-                      <ref role="37wK5l" to="g51k:~EditorCell_Label.getText()" resolve="getText" />
                     </node>
                   </node>
-                  <node concept="37vLTw" id="mUS$m9omu1" role="3tpDZA">
-                    <ref role="3cqZAo" node="mUS$m9omtm" resolve="eNameDutch" />
-                  </node>
                 </node>
               </node>
             </node>
diff --git a/code/solutions/FlintView.plugin/models/FlintView.plugin.plugin.mps b/code/solutions/FlintView.plugin/models/FlintView.plugin.plugin.mps
index 5ba24c3..864738b 100644
--- a/code/solutions/FlintView.plugin/models/FlintView.plugin.plugin.mps
+++ b/code/solutions/FlintView.plugin/models/FlintView.plugin.plugin.mps
@@ -37,6 +37,7 @@
     <import index="buwx" ref="r:b2f3d5f9-b81e-4589-95e8-d5be28f6e48f(com.mbeddr.mpsutil.projectview.views.plugin)" />
     <import index="imq3" ref="r:744546b3-28d0-4d16-91c8-8f406ef84c6e(com.mbeddr.mpsutil.projectview.runtime)" />
     <import index="srlv" ref="r:baf0260d-4be1-4f28-be3e-85fc1a4fa21a(LawSource.structure)" />
+    <import index="3lmi" ref="r:a950900f-47ea-4287-adc8-88f839ab614a(Flint.behavior)" />
     <import index="uhdf" ref="r:30978237-741d-4b0b-ac0b-6600a1c5c14f(com.mbeddr.mpsutil.projectview.runtime.tree)" implicit="true" />
   </imports>
   <registry>
@@ -558,8 +559,17 @@
         </node>
         <node concept="3GX2aA" id="7xGQzaITLO6" role="2OqNvi" />
       </node>
-      <node concept="Xl_RD" id="7xGQzaITLPb" role="14a853">
-        <property role="Xl_RC" value="acts" />
+      <node concept="2OqwBi" id="2vJbluoVmtM" role="14a853">
+        <node concept="2YIFZM" id="2vJbluoVm4m" role="2Oq$k0">
+          <ref role="37wK5l" to="3lmi:2hEqZ8bb3vX" resolve="getActiveLanguage" />
+          <ref role="1Pybhc" to="3lmi:3oX$uxIyT1K" resolve="ModelUtils" />
+          <node concept="14b0Wr" id="2vJbluoVm9N" role="37wK5m">
+            <ref role="14b0Uw" node="7diJr$Rw$m0" resolve="model" />
+          </node>
+        </node>
+        <node concept="3TrcHB" id="2vJbluoVmQ0" role="2OqNvi">
+          <ref role="3TsBF5" to="lnwe:2vJbluoeqmL" resolve="eActs" />
+        </node>
       </node>
     </node>
     <node concept="14aYG3" id="19XK2GZZk2b" role="14aYEy">
@@ -595,8 +605,17 @@
         </node>
         <node concept="3GX2aA" id="7xGQzaITN3g" role="2OqNvi" />
       </node>
-      <node concept="Xl_RD" id="7xGQzaIUfnS" role="14a853">
-        <property role="Xl_RC" value="facts" />
+      <node concept="2OqwBi" id="2vJbluoVmWN" role="14a853">
+        <node concept="2YIFZM" id="2vJbluoVmWO" role="2Oq$k0">
+          <ref role="37wK5l" to="3lmi:2hEqZ8bb3vX" resolve="getActiveLanguage" />
+          <ref role="1Pybhc" to="3lmi:3oX$uxIyT1K" resolve="ModelUtils" />
+          <node concept="14b0Wr" id="2vJbluoVmWP" role="37wK5m">
+            <ref role="14b0Uw" node="7diJr$Rw$m0" resolve="model" />
+          </node>
+        </node>
+        <node concept="3TrcHB" id="2vJbluoVntu" role="2OqNvi">
+          <ref role="3TsBF5" to="lnwe:2vJbluoeqn7" resolve="eFacts" />
+        </node>
       </node>
     </node>
     <node concept="14aYG3" id="19XK2H03HbE" role="14aYEy">
@@ -632,8 +651,17 @@
         </node>
         <node concept="3GX2aA" id="7xGQzaITNHj" role="2OqNvi" />
       </node>
-      <node concept="Xl_RD" id="7xGQzaIUfrQ" role="14a853">
-        <property role="Xl_RC" value="duties" />
+      <node concept="2OqwBi" id="2vJbluoVnxq" role="14a853">
+        <node concept="2YIFZM" id="2vJbluoVnxr" role="2Oq$k0">
+          <ref role="37wK5l" to="3lmi:2hEqZ8bb3vX" resolve="getActiveLanguage" />
+          <ref role="1Pybhc" to="3lmi:3oX$uxIyT1K" resolve="ModelUtils" />
+          <node concept="14b0Wr" id="2vJbluoVnxs" role="37wK5m">
+            <ref role="14b0Uw" node="7diJr$Rw$m0" resolve="model" />
+          </node>
+        </node>
+        <node concept="3TrcHB" id="2vJbluoVo5k" role="2OqNvi">
+          <ref role="3TsBF5" to="lnwe:2vJbluoeqnu" resolve="eDuties" />
+        </node>
       </node>
     </node>
     <node concept="14aYG3" id="19XK2H03Hs9" role="14aYEy">
@@ -669,8 +697,17 @@
         </node>
         <node concept="3GX2aA" id="7xGQzaITOBJ" role="2OqNvi" />
       </node>
-      <node concept="Xl_RD" id="7xGQzaIUfvQ" role="14a853">
-        <property role="Xl_RC" value="sources" />
+      <node concept="2OqwBi" id="2vJbluoVo9e" role="14a853">
+        <node concept="2YIFZM" id="2vJbluoVo9f" role="2Oq$k0">
+          <ref role="37wK5l" to="3lmi:2hEqZ8bb3vX" resolve="getActiveLanguage" />
+          <ref role="1Pybhc" to="3lmi:3oX$uxIyT1K" resolve="ModelUtils" />
+          <node concept="14b0Wr" id="2vJbluoVo9g" role="37wK5m">
+            <ref role="14b0Uw" node="7diJr$Rw$m0" resolve="model" />
+          </node>
+        </node>
+        <node concept="3TrcHB" id="2vJbluoVoK5" role="2OqNvi">
+          <ref role="3TsBF5" to="lnwe:18WT3T5NnIH" resolve="eSources" />
+        </node>
       </node>
     </node>
     <node concept="14aYG3" id="19XK2H05Y2l" role="14aYEy">