diff --git a/build.gradle.kts b/build.gradle.kts
index a489844..d3e611d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,7 +17,7 @@ plugins {
 }
 
 group = "de.pes.MetaBNF"
-version = "2024.1.14"
+version = "2024.1.17"
 description = "MetaBNF provides MPS-based languages for working with Backus-Naur Form (BNF). It enables users to define, edit, and analyze BNF grammars directly in JetBrains MPS, facilitating language design, parsing, and formal grammar processing."
 
 val projectName = "MetaBNF"
diff --git a/code/languages/de.pes.metabnf.base/de.pes.metabnf.base.mpl b/code/languages/de.pes.metabnf.base/de.pes.metabnf.base.mpl
index c3ef8ce..c17c725 100644
--- a/code/languages/de.pes.metabnf.base/de.pes.metabnf.base.mpl
+++ b/code/languages/de.pes.metabnf.base/de.pes.metabnf.base.mpl
@@ -72,6 +72,7 @@
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor)</dependency>
+    <dependency reexport="false">4755f87e-2a4b-42d9-9618-31bc36f204af(de.pes.metabnf.utils)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -116,6 +117,7 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="fcef6129-077e-482d-b29d-d74df3291d94(de.pes.metabnf.base)" version="0" />
+    <module reference="4755f87e-2a4b-42d9-9618-31bc36f204af(de.pes.metabnf.utils)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
diff --git a/code/languages/de.pes.metabnf.base/models/de.pes.metabnf.base.behavior.mps b/code/languages/de.pes.metabnf.base/models/de.pes.metabnf.base.behavior.mps
index 9f8640e..cbe890f 100644
--- a/code/languages/de.pes.metabnf.base/models/de.pes.metabnf.base.behavior.mps
+++ b/code/languages/de.pes.metabnf.base/models/de.pes.metabnf.base.behavior.mps
@@ -16,6 +16,7 @@
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="ms2z" ref="r:7c1e4d57-6b67-4067-a64a-a79ded995e06(de.pes.metabnf.utils.utils)" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -34,6 +35,10 @@
       <concept id="1225194691553" name="jetbrains.mps.lang.behavior.structure.ThisNodeExpression" flags="nn" index="13iPFW" />
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -43,6 +48,9 @@
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
@@ -52,6 +60,7 @@
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
       <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
@@ -116,14 +125,23 @@
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
+      </concept>
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
+      <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
       </concept>
       <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
         <child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
       </concept>
+      <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
+        <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
+      </concept>
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -258,7 +276,6 @@
       <ref role="13i0hy" node="5SQJARStVOM" resolve="getEditorComponentReference" />
       <node concept="3Tm1VV" id="5SQJARSvGU4" role="1B3o_S" />
       <node concept="3clFbS" id="5SQJARSvGU7" role="3clF47">
-        <node concept="3clFbH" id="5SQJARSvHVa" role="3cqZAp" />
         <node concept="3cpWs8" id="5SQJARSw06R" role="3cqZAp">
           <node concept="3cpWsn" id="5SQJARSw06S" role="3cpWs9">
             <property role="TrG5h" value="node" />
@@ -388,6 +405,96 @@
         <ref role="ehGHo" to="yot6:5SQJARStVza" resolve="IEBNFCustomComponentOverride" />
       </node>
     </node>
+    <node concept="13i0hz" id="3BSsKSeXhsz" role="13h7CS">
+      <property role="TrG5h" value="getCellModel" />
+      <ref role="13i0hy" node="6mcP9nJg7VJ" resolve="getCellModel" />
+      <node concept="3Tm1VV" id="3BSsKSeXhs$" role="1B3o_S" />
+      <node concept="3clFbS" id="3BSsKSeXhsD" role="3clF47">
+        <node concept="3cpWs8" id="5SQJARQMk5V" role="3cqZAp">
+          <node concept="3cpWsn" id="5SQJARQMk5W" role="3cpWs9">
+            <property role="TrG5h" value="cmC" />
+            <node concept="3Tqbb2" id="5SQJARQMk0z" role="1tU5fm">
+              <ref role="ehGHo" to="tpc2:fGPMmym" resolve="CellModel_Component" />
+            </node>
+            <node concept="1PxgMI" id="5SQJARQWcqc" role="33vP2m">
+              <node concept="chp4Y" id="5SQJARQWcsl" role="3oSUPX">
+                <ref role="cht4Q" to="tpc2:fGPMmym" resolve="CellModel_Component" />
+              </node>
+              <node concept="2YIFZM" id="5SQJARQUb9_" role="1m5AlR">
+                <ref role="37wK5l" to="ms2z:5SQJARQTLaV" resolve="cloneEditorCellModel" />
+                <ref role="1Pybhc" to="ms2z:5SQJARQTKDn" resolve="BNFEditorCellModelHelper" />
+                <node concept="13iPFW" id="5SQJARQUbaQ" role="37wK5m" />
+                <node concept="35c_gC" id="5SQJARQWbwH" role="37wK5m">
+                  <ref role="35c_gD" to="tpc2:fGPMmym" resolve="CellModel_Component" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3BSsKSf7QFL" role="3cqZAp" />
+        <node concept="3cpWs8" id="3BSsKSf7xBj" role="3cqZAp">
+          <node concept="3cpWsn" id="3BSsKSf7xBk" role="3cpWs9">
+            <property role="TrG5h" value="editorComponentReference" />
+            <node concept="3Tqbb2" id="3BSsKSf7xtF" role="1tU5fm">
+              <ref role="ehGHo" to="tpc2:66t_lskdtZC" resolve="EditorComponentDeclarationReference" />
+            </node>
+            <node concept="BsUDl" id="3BSsKSf7xBl" role="33vP2m">
+              <ref role="37wK5l" node="5SQJARStVOM" resolve="getEditorComponentReference" />
+              <node concept="2OqwBi" id="3BSsKSf7xBm" role="37wK5m">
+                <node concept="37vLTw" id="3BSsKSf7xBn" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3BSsKSeXhsE" resolve="editor" />
+                </node>
+                <node concept="I4A8Y" id="3BSsKSf7xBo" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3BSsKSf7bxA" role="3cqZAp">
+          <node concept="37vLTI" id="3BSsKSf7d5n" role="3clFbG">
+            <node concept="2OqwBi" id="3BSsKSf7eG3" role="37vLTx">
+              <node concept="BsUDl" id="3BSsKSf7dnb" role="2Oq$k0">
+                <ref role="37wK5l" node="5SQJARStVOM" resolve="getEditorComponentReference" />
+                <node concept="2YIFZM" id="3BSsKSf8PEb" role="37wK5m">
+                  <ref role="37wK5l" to="ms2z:39om$43PEuz" resolve="getEditorModelFromModuleModel" />
+                  <ref role="1Pybhc" to="ms2z:7aaqmznbwEM" resolve="BNFUtils" />
+                  <node concept="2OqwBi" id="3BSsKSf8QNa" role="37wK5m">
+                    <node concept="37vLTw" id="3BSsKSf8QaT" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3BSsKSeXhsE" resolve="editor" />
+                    </node>
+                    <node concept="I4A8Y" id="3BSsKSf8RFg" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3TrEf2" id="3BSsKSf7f0m" role="2OqNvi">
+                <ref role="3Tt5mk" to="tpc2:66t_lskdu99" resolve="editorComponent" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="3BSsKSf7bQ_" role="37vLTJ">
+              <node concept="37vLTw" id="3BSsKSf7bx$" role="2Oq$k0">
+                <ref role="3cqZAo" node="5SQJARQMk5W" resolve="cmC" />
+              </node>
+              <node concept="3TrEf2" id="3BSsKSf7chY" role="2OqNvi">
+                <ref role="3Tt5mk" to="tpc2:fGPMmyn" resolve="editorComponent" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="6mcP9nJgksE" role="3cqZAp">
+          <node concept="37vLTw" id="5SQJARQM$Gu" role="3cqZAk">
+            <ref role="3cqZAo" node="5SQJARQMk5W" resolve="cmC" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="3BSsKSeXhsE" role="3clF46">
+        <property role="TrG5h" value="editor" />
+        <node concept="3Tqbb2" id="3BSsKSeXhsF" role="1tU5fm">
+          <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="3BSsKSeXhsG" role="3clF45">
+        <ref role="ehGHo" to="tpc2:fBEYTCT" resolve="EditorCellModel" />
+      </node>
+    </node>
   </node>
   <node concept="13h7C7" id="5SQJARQ1YXT">
     <property role="3GE5qa" value="Attributes" />
@@ -491,5 +598,28 @@
       <node concept="3clFbS" id="1UvZxkZLnel" role="2VODD2" />
     </node>
   </node>
+  <node concept="13h7C7" id="6mcP9nJg7Vs">
+    <property role="3GE5qa" value="Attributes.editor.custom" />
+    <ref role="13h7C2" to="yot6:6mcP9nJg7Vr" resolve="ICustomEditorRepresentation" />
+    <node concept="13i0hz" id="6mcP9nJg7VJ" role="13h7CS">
+      <property role="13i0iv" value="true" />
+      <property role="13i0it" value="true" />
+      <property role="TrG5h" value="getCellModel" />
+      <node concept="3Tm1VV" id="6mcP9nJg7VK" role="1B3o_S" />
+      <node concept="3Tqbb2" id="6mcP9nJg7W3" role="3clF45">
+        <ref role="ehGHo" to="tpc2:fBEYTCT" resolve="EditorCellModel" />
+      </node>
+      <node concept="3clFbS" id="6mcP9nJg7VM" role="3clF47" />
+      <node concept="37vLTG" id="5SQJARR1q77" role="3clF46">
+        <property role="TrG5h" value="editor" />
+        <node concept="3Tqbb2" id="5SQJARRvwTW" role="1tU5fm">
+          <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+        </node>
+      </node>
+    </node>
+    <node concept="13hLZK" id="6mcP9nJg7Vt" role="13h7CW">
+      <node concept="3clFbS" id="6mcP9nJg7Vu" role="2VODD2" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/de.pes.metabnf.base/models/de.pes.metabnf.base.constraints.mps b/code/languages/de.pes.metabnf.base/models/de.pes.metabnf.base.constraints.mps
index 4fe720b..2175794 100644
--- a/code/languages/de.pes.metabnf.base/models/de.pes.metabnf.base.constraints.mps
+++ b/code/languages/de.pes.metabnf.base/models/de.pes.metabnf.base.constraints.mps
@@ -13,7 +13,9 @@
     <use id="ad93155d-79b2-4759-b10c-55123e763903" name="jetbrains.mps.lang.messages" version="0" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
-  <imports />
+  <imports>
+    <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
+  </imports>
   <registry />
 </model>
 
diff --git a/code/languages/de.pes.metabnf.base/models/de.pes.metabnf.base.editor.mps b/code/languages/de.pes.metabnf.base/models/de.pes.metabnf.base.editor.mps
index 124b763..d426f7b 100644
--- a/code/languages/de.pes.metabnf.base/models/de.pes.metabnf.base.editor.mps
+++ b/code/languages/de.pes.metabnf.base/models/de.pes.metabnf.base.editor.mps
@@ -21,7 +21,9 @@
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="5991739802479784074" name="jetbrains.mps.lang.editor.structure.MenuTypeNamed" flags="ng" index="22hDWg" />
-      <concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi" />
+      <concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi">
+        <child id="1078153129734" name="inspectedCellModel" index="6VMZX" />
+      </concept>
       <concept id="1164052439493" name="jetbrains.mps.lang.editor.structure.CellMenuPart_AbstractGroup_MatchingText" flags="in" index="6VE3a" />
       <concept id="1164052588708" name="jetbrains.mps.lang.editor.structure.CellMenuPart_AbstractGroup_DescriptionText" flags="in" index="6WeAF" />
       <concept id="1597643335227097138" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_TransformationMenu_node" flags="ng" index="7Obwk" />
@@ -214,10 +216,21 @@
       <concept id="767145758118872830" name="jetbrains.mps.lang.actions.structure.NF_Link_SetNewChildOperation" flags="nn" index="2DeJnY" />
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
+        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
+      </concept>
+      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
+        <child id="1144104376918" name="parameter" index="1xVPHs" />
+      </concept>
       <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
+      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
+      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
+      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
+        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
+      </concept>
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </concept>
@@ -1030,6 +1043,28 @@
     <node concept="3EZMnI" id="5SQJARSxM5R" role="2wV5jI">
       <node concept="2iRfu4" id="5SQJARSxM5S" role="2iSdaV" />
       <node concept="3F0ifn" id="5SQJARSxM5T" role="3EZMnx">
+        <property role="3F0ifm" value="#" />
+        <node concept="pkWqt" id="3BSsKSfbRVx" role="pqm2j">
+          <node concept="3clFbS" id="3BSsKSfbRVy" role="2VODD2">
+            <node concept="3clFbF" id="3BSsKSfbSfe" role="3cqZAp">
+              <node concept="2OqwBi" id="3BSsKSfbU8C" role="3clFbG">
+                <node concept="2OqwBi" id="3BSsKSfbSJn" role="2Oq$k0">
+                  <node concept="pncrf" id="3BSsKSfbSfd" role="2Oq$k0" />
+                  <node concept="2Xjw5R" id="3BSsKSfbTqH" role="2OqNvi">
+                    <node concept="1xMEDy" id="3BSsKSfbTqJ" role="1xVPHs">
+                      <node concept="chp4Y" id="3BSsKSfbTEv" role="ri$Ld">
+                        <ref role="cht4Q" to="yot6:4yuOb1fd4PH" resolve="IBNFEditorDeclarationRef" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3x8VRR" id="3BSsKSfbUTm" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3F0ifn" id="3BSsKSfbRVs" role="3EZMnx">
         <property role="3F0ifm" value="{" />
       </node>
       <node concept="1iCGBv" id="1UvZxkXSzas" role="3EZMnx">
@@ -1038,9 +1073,34 @@
           <node concept="3SHvHV" id="1UvZxkXSzay" role="2wV5jI" />
         </node>
       </node>
-      <node concept="3F0ifn" id="5SQJARSxM5W" role="3EZMnx">
+      <node concept="3F0ifn" id="3BSsKSfbAjz" role="3EZMnx">
         <property role="3F0ifm" value="}" />
       </node>
+      <node concept="3F0ifn" id="3BSsKSfbRVv" role="3EZMnx">
+        <property role="3F0ifm" value="#" />
+        <node concept="pkWqt" id="3BSsKSfbVNu" role="pqm2j">
+          <node concept="3clFbS" id="3BSsKSfbVNv" role="2VODD2">
+            <node concept="3clFbF" id="3BSsKSfbW0Z" role="3cqZAp">
+              <node concept="2OqwBi" id="3BSsKSfbW10" role="3clFbG">
+                <node concept="2OqwBi" id="3BSsKSfbW11" role="2Oq$k0">
+                  <node concept="pncrf" id="3BSsKSfbW12" role="2Oq$k0" />
+                  <node concept="2Xjw5R" id="3BSsKSfbW13" role="2OqNvi">
+                    <node concept="1xMEDy" id="3BSsKSfbW14" role="1xVPHs">
+                      <node concept="chp4Y" id="3BSsKSfbW15" role="ri$Ld">
+                        <ref role="cht4Q" to="yot6:4yuOb1fd4PH" resolve="IBNFEditorDeclarationRef" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3x8VRR" id="3BSsKSfbW16" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="PMmxH" id="5SQJARQD$F4" role="6VMZX">
+      <ref role="PMmxG" to="tpc5:hF4ssnw" resolve="_CellModel_Common" />
     </node>
   </node>
 </model>
diff --git a/code/languages/de.pes.metabnf.base/models/de.pes.metabnf.base.structure.mps b/code/languages/de.pes.metabnf.base/models/de.pes.metabnf.base.structure.mps
index 6a10b89..2df6b87 100644
--- a/code/languages/de.pes.metabnf.base/models/de.pes.metabnf.base.structure.mps
+++ b/code/languages/de.pes.metabnf.base/models/de.pes.metabnf.base.structure.mps
@@ -242,19 +242,22 @@
     <property role="3GE5qa" value="Attributes.editor.custom" />
     <property role="TrG5h" value="EBNFCustomEditorDeclarationRef" />
     <property role="34LRSv" value="BNF Editor Component" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <ref role="1TJDcQ" to="tpc2:fBEYTCT" resolve="EditorCellModel" />
     <node concept="1TJgyj" id="5SQJARPL5HE" role="1TKVEi">
       <property role="IQ2ns" value="6788822867791600490" />
       <property role="20kJfa" value="ref" />
       <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="5SQJARQ1YXS" resolve="IBNFEditorCellModelBase" />
-    </node>
-    <node concept="PrWs8" id="5SQJARPRP4E" role="PzmwI">
-      <ref role="PrY4T" node="5SQJARQ1YXS" resolve="IBNFEditorCellModelBase" />
+      <ref role="20lvS9" node="4yuOb1fd4PH" resolve="IBNFEditorDeclarationRef" />
     </node>
     <node concept="PrWs8" id="5SQJARSvGKj" role="PzmwI">
       <ref role="PrY4T" node="5SQJARStVza" resolve="IEBNFCustomComponentOverride" />
     </node>
+    <node concept="PrWs8" id="4yuOb1fd2DP" role="PzmwI">
+      <ref role="PrY4T" node="5SQJARQ1YXS" resolve="IBNFEditorCellModelBase" />
+    </node>
+    <node concept="PrWs8" id="3BSsKSeXgxH" role="PzmwI">
+      <ref role="PrY4T" node="6mcP9nJg7Vr" resolve="ICustomEditorRepresentation" />
+    </node>
   </node>
   <node concept="PlHQZ" id="5SQJARQ1YXS">
     <property role="EcuMT" value="6788822867796029304" />
@@ -276,5 +279,18 @@
     <property role="3GE5qa" value="Attributes.editor.custom" />
     <property role="TrG5h" value="IBNFEditorComponentReferencedName" />
   </node>
+  <node concept="PlHQZ" id="4yuOb1fd4PH">
+    <property role="EcuMT" value="5232849272712744301" />
+    <property role="3GE5qa" value="Attributes" />
+    <property role="TrG5h" value="IBNFEditorDeclarationRef" />
+    <node concept="PrWs8" id="4yuOb1fd4PI" role="PrDN$">
+      <ref role="PrY4T" node="5SQJARQ1YXS" resolve="IBNFEditorCellModelBase" />
+    </node>
+  </node>
+  <node concept="PlHQZ" id="6mcP9nJg7Vr">
+    <property role="EcuMT" value="7317457234999410395" />
+    <property role="3GE5qa" value="Attributes.editor.custom" />
+    <property role="TrG5h" value="ICustomEditorRepresentation" />
+  </node>
 </model>
 
diff --git a/code/languages/de.pes.metabnf.extended.gen/models/de.pes.metabnf.extended.gen.behavior.mps b/code/languages/de.pes.metabnf.extended.gen/models/de.pes.metabnf.extended.gen.behavior.mps
index 8c67d0c..47801cb 100644
--- a/code/languages/de.pes.metabnf.extended.gen/models/de.pes.metabnf.extended.gen.behavior.mps
+++ b/code/languages/de.pes.metabnf.extended.gen/models/de.pes.metabnf.extended.gen.behavior.mps
@@ -21306,6 +21306,79 @@
                           </node>
                         </node>
                       </node>
+                      <node concept="3cpWs8" id="3BSsKSfey2K" role="3cqZAp">
+                        <node concept="3cpWsn" id="3BSsKSfey2L" role="3cpWs9">
+                          <property role="TrG5h" value="editorDecentens" />
+                          <node concept="2I9FWS" id="3BSsKSfenNS" role="1tU5fm">
+                            <ref role="2I9WkF" to="gm16:T845YrpKWW" resolve="EBNFAttributeBuildEditor" />
+                          </node>
+                          <node concept="2OqwBi" id="3BSsKSfey2M" role="33vP2m">
+                            <node concept="2OqwBi" id="3BSsKSfey2N" role="2Oq$k0">
+                              <node concept="37vLTw" id="3BSsKSfey2O" role="2Oq$k0">
+                                <ref role="3cqZAo" node="7aaqmzkc1$b" resolve="bnf" />
+                              </node>
+                              <node concept="3TrEf2" id="3BSsKSfey2P" role="2OqNvi">
+                                <ref role="3Tt5mk" to="p1cl:7egTi9LqCwC" resolve="expr" />
+                              </node>
+                            </node>
+                            <node concept="2Rf3mk" id="3BSsKSfey2Q" role="2OqNvi">
+                              <node concept="1xMEDy" id="3BSsKSfey2R" role="1xVPHs">
+                                <node concept="chp4Y" id="3BSsKSfey2S" role="ri$Ld">
+                                  <ref role="cht4Q" to="gm16:T845YrpKWW" resolve="EBNFAttributeBuildEditor" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="3BSsKSfe5R_" role="3cqZAp">
+                        <node concept="2OqwBi" id="3BSsKSfeMrD" role="3clFbG">
+                          <node concept="37vLTw" id="3BSsKSfey2T" role="2Oq$k0">
+                            <ref role="3cqZAo" node="3BSsKSfey2L" resolve="editorDecentens" />
+                          </node>
+                          <node concept="2es0OD" id="3BSsKSfeRFI" role="2OqNvi">
+                            <node concept="1bVj0M" id="3BSsKSfeRFK" role="23t8la">
+                              <node concept="3clFbS" id="3BSsKSfeRFL" role="1bW5cS">
+                                <node concept="3cpWs8" id="3BSsKSff6AC" role="3cqZAp">
+                                  <node concept="3cpWsn" id="3BSsKSff6AD" role="3cpWs9">
+                                    <property role="TrG5h" value="ancestor" />
+                                    <node concept="3Tqbb2" id="3BSsKSff5Ue" role="1tU5fm">
+                                      <ref role="ehGHo" to="p1cl:1nL_s$DdmcT" resolve="BNFDefinitionTermBase" />
+                                    </node>
+                                    <node concept="2OqwBi" id="3BSsKSff6AE" role="33vP2m">
+                                      <node concept="37vLTw" id="3BSsKSff6AF" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="3BSsKSfeRFM" resolve="it" />
+                                      </node>
+                                      <node concept="2Xjw5R" id="3BSsKSff6AG" role="2OqNvi">
+                                        <node concept="1xMEDy" id="3BSsKSff6AH" role="1xVPHs">
+                                          <node concept="chp4Y" id="3BSsKSff6AI" role="ri$Ld">
+                                            <ref role="cht4Q" to="p1cl:1nL_s$DdmcT" resolve="BNFDefinitionTermBase" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbF" id="3BSsKSffd0i" role="3cqZAp">
+                                  <node concept="1rXfSq" id="3BSsKSffd0g" role="3clFbG">
+                                    <ref role="37wK5l" node="5SQJAROyyAs" resolve="createCustomEditorDeclaration" />
+                                    <node concept="37vLTw" id="3BSsKSffejH" role="37wK5m">
+                                      <ref role="3cqZAo" node="3BSsKSff6AD" resolve="ancestor" />
+                                    </node>
+                                    <node concept="37vLTw" id="3BSsKSffjmk" role="37wK5m">
+                                      <ref role="3cqZAo" node="3BSsKSfeRFM" resolve="it" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="gl6BB" id="3BSsKSfeRFM" role="1bW2Oz">
+                                <property role="TrG5h" value="it" />
+                                <node concept="2jxLKc" id="3BSsKSfeRFN" role="1tU5fm" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                       <node concept="3clFbF" id="5SQJAROyWIO" role="3cqZAp">
                         <node concept="1rXfSq" id="5SQJAROyWIM" role="3clFbG">
                           <ref role="37wK5l" node="5SQJAROyyAs" resolve="createCustomEditorDeclaration" />
@@ -21325,6 +21398,7 @@
                           </node>
                         </node>
                       </node>
+                      <node concept="3clFbH" id="3BSsKSfe4BP" role="3cqZAp" />
                     </node>
                     <node concept="17R0WA" id="7aaqmzkfefa" role="3eO9$A">
                       <node concept="2OqwBi" id="7aaqmzkfefb" role="3uHU7w">
diff --git a/code/languages/de.pes.metabnf.extended/models/de.pes.metabnf.extended.behavior.mps b/code/languages/de.pes.metabnf.extended/models/de.pes.metabnf.extended.behavior.mps
index 895254b..43d929a 100644
--- a/code/languages/de.pes.metabnf.extended/models/de.pes.metabnf.extended.behavior.mps
+++ b/code/languages/de.pes.metabnf.extended/models/de.pes.metabnf.extended.behavior.mps
@@ -22,6 +22,7 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="1i04" ref="r:3270011d-8b2d-4938-8dff-d256a759e017(jetbrains.mps.lang.behavior.structure)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
+    <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -177,11 +178,6 @@
         <child id="8182547171709752112" name="expression" index="36biLW" />
       </concept>
     </language>
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
-      <concept id="6332851714983831325" name="jetbrains.mps.baseLanguage.logging.structure.MsgStatement" flags="ng" index="2xdQw9">
-        <child id="5721587534047265374" name="message" index="9lYJi" />
-      </concept>
-    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
@@ -193,7 +189,6 @@
       <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
-      <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -3310,6 +3305,27 @@
         <ref role="ehGHo" to="tpc2:fBEZMkn" resolve="CellModel_Collection" />
       </node>
     </node>
+    <node concept="13i0hz" id="6hE5InXIsO8" role="13h7CS">
+      <property role="TrG5h" value="getTarget" />
+      <ref role="13i0hy" to="10gk:T845Ys479Z" resolve="getTarget" />
+      <node concept="3Tm1VV" id="6hE5InXIsO9" role="1B3o_S" />
+      <node concept="3clFbS" id="6hE5InXIsOc" role="3clF47">
+        <node concept="3clFbF" id="6hE5InXIujL" role="3cqZAp">
+          <node concept="2OqwBi" id="6hE5InXIvvw" role="3clFbG">
+            <node concept="2OqwBi" id="6hE5InXIu$B" role="2Oq$k0">
+              <node concept="13iPFW" id="6hE5InXIujK" role="2Oq$k0" />
+              <node concept="3TrEf2" id="6hE5InXIuUr" role="2OqNvi">
+                <ref role="3Tt5mk" to="gm16:7egTi9LFblj" resolve="concept" />
+              </node>
+            </node>
+            <node concept="3TrEf2" id="6hE5InXIvMg" role="2OqNvi">
+              <ref role="3Tt5mk" to="tp25:2iMJRNxweHl" resolve="conceptDeclaration" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="6hE5InXIsOd" role="3clF45" />
+    </node>
   </node>
   <node concept="13h7C7" id="r82NTOimNO">
     <property role="3GE5qa" value="Attributes.extend" />
@@ -3454,28 +3470,26 @@
     <node concept="13hLZK" id="r82NTOimNP" role="13h7CW">
       <node concept="3clFbS" id="r82NTOimNQ" role="2VODD2" />
     </node>
-  </node>
-  <node concept="13h7C7" id="6mcP9nJg7Vs">
-    <property role="3GE5qa" value="Attributes.editor.custom" />
-    <ref role="13h7C2" to="gm16:6mcP9nJg7Vr" resolve="ICustomEditorRepresentation" />
-    <node concept="13i0hz" id="6mcP9nJg7VJ" role="13h7CS">
-      <property role="13i0iv" value="true" />
-      <property role="13i0it" value="true" />
-      <property role="TrG5h" value="getCellModel" />
-      <node concept="3Tm1VV" id="6mcP9nJg7VK" role="1B3o_S" />
-      <node concept="3Tqbb2" id="6mcP9nJg7W3" role="3clF45">
-        <ref role="ehGHo" to="tpc2:fBEYTCT" resolve="EditorCellModel" />
-      </node>
-      <node concept="3clFbS" id="6mcP9nJg7VM" role="3clF47" />
-      <node concept="37vLTG" id="5SQJARR1q77" role="3clF46">
-        <property role="TrG5h" value="editor" />
-        <node concept="3Tqbb2" id="5SQJARRvwTW" role="1tU5fm">
-          <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+    <node concept="13i0hz" id="6hE5InXEGga" role="13h7CS">
+      <property role="TrG5h" value="getTarget" />
+      <ref role="13i0hy" to="10gk:T845Ys479Z" resolve="getTarget" />
+      <node concept="3Tm1VV" id="6hE5InXEGgb" role="1B3o_S" />
+      <node concept="3clFbS" id="6hE5InXEGge" role="3clF47">
+        <node concept="3clFbF" id="6hE5InXEGs_" role="3cqZAp">
+          <node concept="2OqwBi" id="6hE5InXEJ0N" role="3clFbG">
+            <node concept="2OqwBi" id="6hE5InXEGI$" role="2Oq$k0">
+              <node concept="13iPFW" id="6hE5InXEGs$" role="2Oq$k0" />
+              <node concept="3TrEf2" id="6hE5InXEIJM" role="2OqNvi">
+                <ref role="3Tt5mk" to="gm16:7egTi9LFblj" resolve="concept" />
+              </node>
+            </node>
+            <node concept="3TrEf2" id="6hE5InXEJgj" role="2OqNvi">
+              <ref role="3Tt5mk" to="tp25:2iMJRNxweHl" resolve="conceptDeclaration" />
+            </node>
+          </node>
         </node>
       </node>
-    </node>
-    <node concept="13hLZK" id="6mcP9nJg7Vt" role="13h7CW">
-      <node concept="3clFbS" id="6mcP9nJg7Vu" role="2VODD2" />
+      <node concept="3Tqbb2" id="6hE5InXEGgf" role="3clF45" />
     </node>
   </node>
   <node concept="13h7C7" id="6mcP9nJg7Xm">
@@ -3486,7 +3500,7 @@
     </node>
     <node concept="13i0hz" id="6mcP9nJgks2" role="13h7CS">
       <property role="TrG5h" value="getCellModel" />
-      <ref role="13i0hy" node="6mcP9nJg7VJ" resolve="getCellModel" />
+      <ref role="13i0hy" to="10gk:6mcP9nJg7VJ" resolve="getCellModel" />
       <node concept="3Tm1VV" id="6mcP9nJgks3" role="1B3o_S" />
       <node concept="3clFbS" id="6mcP9nJgks6" role="3clF47">
         <node concept="3clFbH" id="5SQJARQMjRr" role="3cqZAp" />
@@ -3585,32 +3599,6 @@
       <ref role="13i0hy" to="10gk:5SQJARQ1YYc" resolve="getCustomCellModel" />
       <node concept="3Tm1VV" id="5SQJARQ44a8" role="1B3o_S" />
       <node concept="3clFbS" id="5SQJARQ44ab" role="3clF47">
-        <node concept="2xdQw9" id="1UvZxl0bKr8" role="3cqZAp">
-          <node concept="3cpWs3" id="1UvZxl0bOlJ" role="9lYJi">
-            <node concept="2OqwBi" id="1UvZxl0bOXO" role="3uHU7w">
-              <node concept="13iPFW" id="1UvZxl0bOqL" role="2Oq$k0" />
-              <node concept="3TrEf2" id="1UvZxl0bPiT" role="2OqNvi">
-                <ref role="3Tt5mk" to="gm16:5SQJARPEhO2" resolve="editor" />
-              </node>
-            </node>
-            <node concept="3cpWs3" id="1UvZxl0bMBk" role="3uHU7B">
-              <node concept="3cpWs3" id="1UvZxl0bM0c" role="3uHU7B">
-                <node concept="Xl_RD" id="1UvZxl0bKra" role="3uHU7B">
-                  <property role="Xl_RC" value="***GetCustomCell: " />
-                </node>
-                <node concept="2OqwBi" id="1UvZxl0hJ3A" role="3uHU7w">
-                  <node concept="37vLTw" id="1UvZxl0bM4V" role="2Oq$k0">
-                    <ref role="3cqZAo" node="5SQJARR3OYH" resolve="concept" />
-                  </node>
-                  <node concept="2yIwOk" id="1UvZxl0j_zO" role="2OqNvi" />
-                </node>
-              </node>
-              <node concept="Xl_RD" id="1UvZxl0bMBn" role="3uHU7w">
-                <property role="Xl_RC" value=" | " />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbH" id="1UvZxl0hIfM" role="3cqZAp" />
         <node concept="3clFbJ" id="5SQJARQ44zj" role="3cqZAp">
           <node concept="1Wc70l" id="5SQJARSXIEh" role="3clFbw">
@@ -3662,7 +3650,7 @@
                   <node concept="2Rf3mk" id="5SQJARQ45pF" role="2OqNvi">
                     <node concept="1xMEDy" id="5SQJARQ45pG" role="1xVPHs">
                       <node concept="chp4Y" id="5SQJARQ45pH" role="ri$Ld">
-                        <ref role="cht4Q" to="gm16:6mcP9nJg7Vr" resolve="ICustomEditorRepresentation" />
+                        <ref role="cht4Q" to="yot6:6mcP9nJg7Vr" resolve="ICustomEditorRepresentation" />
                       </node>
                     </node>
                   </node>
@@ -3681,7 +3669,7 @@
                                 <ref role="3cqZAo" node="5SQJARQ45pS" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="5SQJARQ45pR" role="2OqNvi">
-                                <ref role="37wK5l" node="6mcP9nJg7VJ" resolve="getCellModel" />
+                                <ref role="37wK5l" to="10gk:6mcP9nJg7VJ" resolve="getCellModel" />
                                 <node concept="37vLTw" id="5SQJARR3PhT" role="37wK5m">
                                   <ref role="3cqZAo" node="5SQJARR3OYH" resolve="concept" />
                                 </node>
@@ -3756,11 +3744,14 @@
       <node concept="3Tm1VV" id="1UvZxkYqbHe" role="1B3o_S" />
       <node concept="3clFbS" id="1UvZxkYqbHh" role="3clF47">
         <node concept="3cpWs6" id="1UvZxkYqbNP" role="3cqZAp">
-          <node concept="2OqwBi" id="1UvZxkYqc0c" role="3cqZAk">
-            <node concept="13iPFW" id="1UvZxkYqbO3" role="2Oq$k0" />
-            <node concept="3TrEf2" id="1UvZxkYqceX" role="2OqNvi">
-              <ref role="3Tt5mk" to="gm16:5SQJARSqssf" resolve="overrides" />
+          <node concept="2OqwBi" id="3BSsKSf9Jv_" role="3cqZAk">
+            <node concept="2OqwBi" id="1UvZxkYqc0c" role="2Oq$k0">
+              <node concept="13iPFW" id="1UvZxkYqbO3" role="2Oq$k0" />
+              <node concept="3TrEf2" id="1UvZxkYqceX" role="2OqNvi">
+                <ref role="3Tt5mk" to="gm16:5SQJARSqssf" resolve="overrides" />
+              </node>
             </node>
+            <node concept="1$rogu" id="3BSsKSf9JJa" role="2OqNvi" />
           </node>
         </node>
       </node>
@@ -3777,7 +3768,7 @@
     </node>
     <node concept="13i0hz" id="5SQJARRmze0" role="13h7CS">
       <property role="TrG5h" value="getCellModel" />
-      <ref role="13i0hy" node="6mcP9nJg7VJ" resolve="getCellModel" />
+      <ref role="13i0hy" to="10gk:6mcP9nJg7VJ" resolve="getCellModel" />
       <node concept="3Tm1VV" id="5SQJARRmze1" role="1B3o_S" />
       <node concept="3clFbS" id="5SQJARRmze6" role="3clF47">
         <node concept="3cpWs8" id="5SQJARRvfQs" role="3cqZAp">
@@ -3912,13 +3903,13 @@
   </node>
   <node concept="13h7C7" id="5SQJARTsX6q">
     <property role="3GE5qa" value="Attributes.editor.custom" />
-    <ref role="13h7C2" to="gm16:5SQJARTsWl$" resolve="EBNFCustomCellModel_List" />
+    <ref role="13h7C2" to="gm16:5SQJARTsWl$" resolve="EBNFCustomCellModel_ListRef" />
     <node concept="13hLZK" id="5SQJARTsX6r" role="13h7CW">
       <node concept="3clFbS" id="5SQJARTsX6s" role="2VODD2" />
     </node>
     <node concept="13i0hz" id="5SQJARTsX6H" role="13h7CS">
       <property role="TrG5h" value="getCellModel" />
-      <ref role="13i0hy" node="6mcP9nJg7VJ" resolve="getCellModel" />
+      <ref role="13i0hy" to="10gk:6mcP9nJg7VJ" resolve="getCellModel" />
       <node concept="3Tm1VV" id="5SQJARTsX6I" role="1B3o_S" />
       <node concept="3clFbS" id="5SQJARTsX6N" role="3clF47">
         <node concept="3clFbH" id="1UvZxkYAEfN" role="3cqZAp" />
@@ -4193,5 +4184,165 @@
       <node concept="3clFbS" id="1vpfjfMQCDC" role="2VODD2" />
     </node>
   </node>
+  <node concept="13h7C7" id="4yuOb1eJDGX">
+    <property role="3GE5qa" value="Attributes.editor.custom" />
+    <ref role="13h7C2" to="gm16:4yuOb1eJDGV" resolve="EBNFCustomCellModel_Ref" />
+    <node concept="13hLZK" id="4yuOb1eJDGY" role="13h7CW">
+      <node concept="3clFbS" id="4yuOb1eJDGZ" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="4yuOb1eJDHg" role="13h7CS">
+      <property role="TrG5h" value="getCellModel" />
+      <ref role="13i0hy" to="10gk:6mcP9nJg7VJ" resolve="getCellModel" />
+      <node concept="3Tm1VV" id="4yuOb1eJDHh" role="1B3o_S" />
+      <node concept="3clFbS" id="4yuOb1eJDHm" role="3clF47">
+        <node concept="3clFbH" id="4yuOb1eK2iZ" role="3cqZAp" />
+        <node concept="3cpWs8" id="4yuOb1eK2jp" role="3cqZAp">
+          <node concept="3cpWsn" id="4yuOb1eK2jq" role="3cpWs9">
+            <property role="TrG5h" value="rnl" />
+            <node concept="3Tqbb2" id="4yuOb1eK2jr" role="1tU5fm">
+              <ref role="ehGHo" to="tpc2:fBF1sR7" resolve="CellModel_RefNode" />
+            </node>
+            <node concept="1PxgMI" id="4yuOb1eK2js" role="33vP2m">
+              <node concept="chp4Y" id="4yuOb1eK2jt" role="3oSUPX">
+                <ref role="cht4Q" to="tpc2:fBF1sR7" resolve="CellModel_RefNode" />
+              </node>
+              <node concept="2YIFZM" id="4yuOb1eK2Lx" role="1m5AlR">
+                <ref role="37wK5l" to="ms2z:5SQJARSgwrL" resolve="cloneEditorCellModel_WithRole" />
+                <ref role="1Pybhc" to="ms2z:5SQJARQTKDn" resolve="BNFEditorCellModelHelper" />
+                <node concept="13iPFW" id="4yuOb1eK2Ly" role="37wK5m" />
+                <node concept="35c_gC" id="4yuOb1eK2Lz" role="37wK5m">
+                  <ref role="35c_gD" to="tpc2:fBF1sR7" resolve="CellModel_RefNode" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4yuOb1eKcYd" role="3cqZAp" />
+        <node concept="3clFbF" id="4yuOb1eK5ev" role="3cqZAp">
+          <node concept="37vLTI" id="4yuOb1eKc27" role="3clFbG">
+            <node concept="2OqwBi" id="4yuOb1eKco_" role="37vLTx">
+              <node concept="13iPFW" id="4yuOb1eKc8E" role="2Oq$k0" />
+              <node concept="3TrcHB" id="4yuOb1eKcTP" role="2OqNvi">
+                <ref role="3TsBF5" to="gm16:Ujlmrg18k" resolve="customizeEmptyCell" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="4yuOb1eK5OZ" role="37vLTJ">
+              <node concept="37vLTw" id="4yuOb1eK5et" role="2Oq$k0">
+                <ref role="3cqZAo" node="4yuOb1eK2jq" resolve="rnl" />
+              </node>
+              <node concept="3TrcHB" id="4yuOb1eKaAo" role="2OqNvi">
+                <ref role="3TsBF5" to="tpc2:Ujlmrg18k" resolve="customizeEmptyCell" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4yuOb1eKdgj" role="3cqZAp">
+          <node concept="37vLTI" id="4yuOb1eKen8" role="3clFbG">
+            <node concept="2OqwBi" id="4yuOb1eKeJ6" role="37vLTx">
+              <node concept="13iPFW" id="4yuOb1eKeu9" role="2Oq$k0" />
+              <node concept="3TrEf2" id="4yuOb1eKfKm" role="2OqNvi">
+                <ref role="3Tt5mk" to="gm16:55my_QKP5Sf" resolve="addHints" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="4yuOb1eKdMc" role="37vLTJ">
+              <node concept="37vLTw" id="4yuOb1eKdgh" role="2Oq$k0">
+                <ref role="3cqZAo" node="4yuOb1eK2jq" resolve="rnl" />
+              </node>
+              <node concept="3TrEf2" id="4yuOb1eKdWA" role="2OqNvi">
+                <ref role="3Tt5mk" to="tpc2:55my_QKP5Sf" resolve="addHints" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4yuOb1eKg2X" role="3cqZAp">
+          <node concept="37vLTI" id="4yuOb1eKgXW" role="3clFbG">
+            <node concept="2OqwBi" id="4yuOb1eKhov" role="37vLTx">
+              <node concept="13iPFW" id="4yuOb1eKh0r" role="2Oq$k0" />
+              <node concept="3TrEf2" id="4yuOb1eKikm" role="2OqNvi">
+                <ref role="3Tt5mk" to="gm16:55my_QKP5Sg" resolve="removeHints" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="4yuOb1eKgqf" role="37vLTJ">
+              <node concept="37vLTw" id="4yuOb1eKg2V" role="2Oq$k0">
+                <ref role="3cqZAo" node="4yuOb1eK2jq" resolve="rnl" />
+              </node>
+              <node concept="3TrEf2" id="4yuOb1eKgz0" role="2OqNvi">
+                <ref role="3Tt5mk" to="tpc2:55my_QKP5Sg" resolve="removeHints" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4yuOb1eKiBL" role="3cqZAp">
+          <node concept="37vLTI" id="4yuOb1eKjmB" role="3clFbG">
+            <node concept="2OqwBi" id="4yuOb1eKjLI" role="37vLTx">
+              <node concept="13iPFW" id="4yuOb1eKjpw" role="2Oq$k0" />
+              <node concept="3TrEf2" id="4yuOb1eKknG" role="2OqNvi">
+                <ref role="3Tt5mk" to="gm16:UjlmrgInb" resolve="emptyCellModel" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="4yuOb1eKiKX" role="37vLTJ">
+              <node concept="37vLTw" id="4yuOb1eKiBJ" role="2Oq$k0">
+                <ref role="3cqZAo" node="4yuOb1eK2jq" resolve="rnl" />
+              </node>
+              <node concept="3TrEf2" id="4yuOb1eKiTa" role="2OqNvi">
+                <ref role="3Tt5mk" to="tpc2:UjlmrgInb" resolve="emptyCellModel" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4yuOb1eKkqz" role="3cqZAp" />
+        <node concept="3clFbF" id="4yuOb1eKlyR" role="3cqZAp">
+          <node concept="37vLTI" id="4yuOb1eKoxA" role="3clFbG">
+            <node concept="2OqwBi" id="4yuOb1eKm4J" role="37vLTJ">
+              <node concept="37vLTw" id="4yuOb1eKlyP" role="2Oq$k0">
+                <ref role="3cqZAo" node="4yuOb1eK2jq" resolve="rnl" />
+              </node>
+              <node concept="3TrEf2" id="4yuOb1eKn8p" role="2OqNvi">
+                <ref role="3Tt5mk" to="tpc2:fBF1sR8" resolve="linkDeclaration" />
+              </node>
+            </node>
+            <node concept="2YIFZM" id="4yuOb1eKpGm" role="37vLTx">
+              <ref role="37wK5l" to="vx0f:5SQJARUkLjA" resolve="getLinkDeclarationFromConcept" />
+              <ref role="1Pybhc" to="vx0f:7aaqmzlgUpO" resolve="BNFEditorHelper" />
+              <node concept="37vLTw" id="4yuOb1eKpGn" role="37wK5m">
+                <ref role="3cqZAo" node="4yuOb1eJDHn" resolve="concept" />
+              </node>
+              <node concept="2OqwBi" id="4yuOb1eKpGo" role="37wK5m">
+                <node concept="2qgKlT" id="4yuOb1eKpGq" role="2OqNvi">
+                  <ref role="37wK5l" to="yrpt:1EU0USSpIAN" resolve="getName" />
+                </node>
+                <node concept="1PxgMI" id="4yuOb1eKtJL" role="2Oq$k0">
+                  <node concept="chp4Y" id="4yuOb1eKu3o" role="3oSUPX">
+                    <ref role="cht4Q" to="p1cl:T845YsR94I" resolve="IHaveOptionalName" />
+                  </node>
+                  <node concept="2OqwBi" id="4yuOb1eKsq3" role="1m5AlR">
+                    <node concept="13iPFW" id="4yuOb1eKs5A" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="4yuOb1eKsYU" role="2OqNvi">
+                      <ref role="3Tt5mk" to="gm16:4yuOb1eJHku" resolve="ref" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4yuOb1eK2j0" role="3cqZAp" />
+        <node concept="3cpWs6" id="4yuOb1eKvSY" role="3cqZAp">
+          <node concept="37vLTw" id="4yuOb1eKvYn" role="3cqZAk">
+            <ref role="3cqZAo" node="4yuOb1eK2jq" resolve="rnl" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="4yuOb1eJDHn" role="3clF46">
+        <property role="TrG5h" value="concept" />
+        <node concept="3Tqbb2" id="4yuOb1eJDHo" role="1tU5fm">
+          <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="4yuOb1eJDHp" role="3clF45">
+        <ref role="ehGHo" to="tpc2:fBEYTCT" resolve="EditorCellModel" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/de.pes.metabnf.extended/models/de.pes.metabnf.extended.constraints.mps b/code/languages/de.pes.metabnf.extended/models/de.pes.metabnf.extended.constraints.mps
index 69f0b57..21790c4 100644
--- a/code/languages/de.pes.metabnf.extended/models/de.pes.metabnf.extended.constraints.mps
+++ b/code/languages/de.pes.metabnf.extended/models/de.pes.metabnf.extended.constraints.mps
@@ -1253,7 +1253,7 @@
   </node>
   <node concept="1M2fIO" id="5SQJARTwMix">
     <property role="3GE5qa" value="Attributes.editor.custom" />
-    <ref role="1M2myG" to="gm16:5SQJARTsWl$" resolve="EBNFCustomCellModel_List" />
+    <ref role="1M2myG" to="gm16:5SQJARTsWl$" resolve="EBNFCustomCellModel_ListRef" />
     <node concept="1N5Pfh" id="5SQJARTwMiy" role="1Mr941">
       <ref role="1N5Vy1" to="yot6:5SQJARTsWlE" />
       <node concept="3dgokm" id="5SQJARTwMot" role="1N6uqs">
@@ -1468,5 +1468,223 @@
       </node>
     </node>
   </node>
+  <node concept="1M2fIO" id="4yuOb1eMMhP">
+    <property role="3GE5qa" value="Attributes.editor.custom" />
+    <ref role="1M2myG" to="gm16:4yuOb1eJDGV" resolve="EBNFCustomCellModel_Ref" />
+    <node concept="1N5Pfh" id="4yuOb1eMMhQ" role="1Mr941">
+      <ref role="1N5Vy1" to="gm16:4yuOb1eJHku" resolve="ref" />
+      <node concept="3dgokm" id="4yuOb1eMMnR" role="1N6uqs">
+        <node concept="3clFbS" id="4yuOb1eMMnS" role="2VODD2">
+          <node concept="3cpWs8" id="4yuOb1eMMZj" role="3cqZAp">
+            <node concept="3cpWsn" id="4yuOb1eMMZm" role="3cpWs9">
+              <property role="TrG5h" value="rootEditor" />
+              <node concept="3Tqbb2" id="4yuOb1eMMZn" role="1tU5fm">
+                <ref role="ehGHo" to="gm16:5SQJARPwye9" resolve="EBNFCustomEditorDeclaration" />
+              </node>
+              <node concept="2OqwBi" id="4yuOb1eMMZo" role="33vP2m">
+                <node concept="2rP1CM" id="4yuOb1eMMZp" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="4yuOb1eMMZq" role="2OqNvi">
+                  <node concept="1xMEDy" id="4yuOb1eMMZr" role="1xVPHs">
+                    <node concept="chp4Y" id="4yuOb1eMMZs" role="ri$Ld">
+                      <ref role="cht4Q" to="gm16:5SQJARPwye9" resolve="EBNFCustomEditorDeclaration" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="4yuOb1eMNea" role="3cqZAp">
+            <node concept="3cpWsn" id="4yuOb1eMNeb" role="3cpWs9">
+              <property role="TrG5h" value="results" />
+              <node concept="2I9FWS" id="4yuOb1eMNec" role="1tU5fm">
+                <ref role="2I9WkF" to="tpck:gw2VY9q" resolve="BaseConcept" />
+              </node>
+              <node concept="2ShNRf" id="4yuOb1eMNed" role="33vP2m">
+                <node concept="2T8Vx0" id="4yuOb1eMNee" role="2ShVmc">
+                  <node concept="2I9FWS" id="4yuOb1eMNef" role="2T96Bj">
+                    <ref role="2I9WkF" to="tpck:gw2VY9q" resolve="BaseConcept" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="4yuOb1eMMtv" role="3cqZAp" />
+          <node concept="Jncv_" id="4yuOb1eMNBr" role="3cqZAp">
+            <ref role="JncvD" to="p1cl:7egTi9LqCwB" resolve="IBNFBaseStatementConcept" />
+            <node concept="2OqwBi" id="4yuOb1eMNBs" role="JncvB">
+              <node concept="2OqwBi" id="4yuOb1eMNBt" role="2Oq$k0">
+                <node concept="37vLTw" id="4yuOb1eMNBu" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4yuOb1eMMZm" resolve="rootEditor" />
+                </node>
+                <node concept="3TrEf2" id="4yuOb1eMNBv" role="2OqNvi">
+                  <ref role="3Tt5mk" to="gm16:5SQJARPOws_" />
+                </node>
+              </node>
+              <node concept="2qgKlT" id="4yuOb1eMNBw" role="2OqNvi">
+                <ref role="37wK5l" to="10gk:1UvZxkZLnfl" resolve="getTarget" />
+              </node>
+            </node>
+            <node concept="3clFbS" id="4yuOb1eMNBx" role="Jncv$">
+              <node concept="3cpWs8" id="4yuOb1eMNBy" role="3cqZAp">
+                <node concept="3cpWsn" id="4yuOb1eMNBz" role="3cpWs9">
+                  <property role="TrG5h" value="listTerms" />
+                  <node concept="2I9FWS" id="4yuOb1eMNB$" role="1tU5fm">
+                    <ref role="2I9WkF" to="p1cl:fbptcjfjEY" resolve="OptionalTermRef" />
+                  </node>
+                  <node concept="2OqwBi" id="4yuOb1eMNB_" role="33vP2m">
+                    <node concept="2OqwBi" id="4yuOb1eMNBA" role="2Oq$k0">
+                      <node concept="Jnkvi" id="4yuOb1eMNBB" role="2Oq$k0">
+                        <ref role="1M0zk5" node="4yuOb1eMNCw" resolve="bnfTerm" />
+                      </node>
+                      <node concept="3TrEf2" id="4yuOb1eMNBC" role="2OqNvi">
+                        <ref role="3Tt5mk" to="p1cl:7egTi9LqCwC" />
+                      </node>
+                    </node>
+                    <node concept="2Rf3mk" id="4yuOb1eMNBD" role="2OqNvi">
+                      <node concept="1xMEDy" id="4yuOb1eMNBE" role="1xVPHs">
+                        <node concept="chp4Y" id="4yuOb1eMNBF" role="ri$Ld">
+                          <ref role="cht4Q" to="p1cl:fbptcjfjEY" resolve="OptionalTermRef" />
+                        </node>
+                      </node>
+                      <node concept="1xIGOp" id="4yuOb1eMNBG" role="1xVPHs" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="4yuOb1eOJlY" role="3cqZAp" />
+              <node concept="3clFbF" id="4yuOb1eMNBI" role="3cqZAp">
+                <node concept="2OqwBi" id="4yuOb1eMNBJ" role="3clFbG">
+                  <node concept="37vLTw" id="4yuOb1eMNBK" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4yuOb1eMNBz" resolve="listTerms" />
+                  </node>
+                  <node concept="2es0OD" id="4yuOb1eMNBL" role="2OqNvi">
+                    <node concept="1bVj0M" id="4yuOb1eMNBM" role="23t8la">
+                      <node concept="3clFbS" id="4yuOb1eMNBN" role="1bW5cS">
+                        <node concept="3cpWs8" id="4yuOb1eMNBO" role="3cqZAp">
+                          <node concept="3cpWsn" id="4yuOb1eMNBP" role="3cpWs9">
+                            <property role="TrG5h" value="listDec" />
+                            <node concept="2I9FWS" id="4yuOb1eMNBQ" role="1tU5fm">
+                              <ref role="2I9WkF" to="p1cl:fbptcj2IO2" resolve="BNFDefinitionTermRef" />
+                            </node>
+                            <node concept="2OqwBi" id="4yuOb1eMNBR" role="33vP2m">
+                              <node concept="2OqwBi" id="4yuOb1eMNBS" role="2Oq$k0">
+                                <node concept="37vLTw" id="4yuOb1eMNBT" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="4yuOb1eMNCu" resolve="it" />
+                                </node>
+                                <node concept="3TrEf2" id="4yuOb1eMNBU" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="p1cl:2$KK347jeUk" />
+                                </node>
+                              </node>
+                              <node concept="2Rf3mk" id="4yuOb1eMNBV" role="2OqNvi">
+                                <node concept="1xMEDy" id="4yuOb1eMNBW" role="1xVPHs">
+                                  <node concept="chp4Y" id="4yuOb1eMNBX" role="ri$Ld">
+                                    <ref role="cht4Q" to="p1cl:fbptcj2IO2" resolve="BNFDefinitionTermRef" />
+                                  </node>
+                                </node>
+                                <node concept="1xIGOp" id="4yuOb1eMNBY" role="1xVPHs" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbJ" id="4yuOb1eMNBZ" role="3cqZAp">
+                          <node concept="3clFbS" id="4yuOb1eMNC0" role="3clFbx">
+                            <node concept="3clFbF" id="4yuOb1eMNC1" role="3cqZAp">
+                              <node concept="2OqwBi" id="4yuOb1eMNC2" role="3clFbG">
+                                <node concept="37vLTw" id="4yuOb1eMNC3" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="4yuOb1eMNeb" resolve="results" />
+                                </node>
+                                <node concept="X8dFx" id="4yuOb1eMNC4" role="2OqNvi">
+                                  <node concept="37vLTw" id="4yuOb1eMNC5" role="25WWJ7">
+                                    <ref role="3cqZAo" node="4yuOb1eMNBP" resolve="listDec" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="4yuOb1eMNC6" role="3clFbw">
+                            <node concept="37vLTw" id="4yuOb1eMNC7" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4yuOb1eMNBP" resolve="listDec" />
+                            </node>
+                            <node concept="3GX2aA" id="4yuOb1eMNC8" role="2OqNvi" />
+                          </node>
+                        </node>
+                        <node concept="3cpWs8" id="4yuOb1eMNC9" role="3cqZAp">
+                          <node concept="3cpWsn" id="4yuOb1eMNCa" role="3cpWs9">
+                            <property role="TrG5h" value="l2" />
+                            <node concept="2I9FWS" id="4yuOb1eMNCb" role="1tU5fm">
+                              <ref role="2I9WkF" to="gm16:4novjIaNn1X" resolve="EBNFIFaceDefinitionTermRef" />
+                            </node>
+                            <node concept="2OqwBi" id="4yuOb1eMNCc" role="33vP2m">
+                              <node concept="2OqwBi" id="4yuOb1eMNCd" role="2Oq$k0">
+                                <node concept="37vLTw" id="4yuOb1eMNCe" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="4yuOb1eMNCu" resolve="it" />
+                                </node>
+                                <node concept="3TrEf2" id="4yuOb1eMNCf" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="p1cl:2$KK347jeUk" />
+                                </node>
+                              </node>
+                              <node concept="2Rf3mk" id="4yuOb1eMNCg" role="2OqNvi">
+                                <node concept="1xMEDy" id="4yuOb1eMNCh" role="1xVPHs">
+                                  <node concept="chp4Y" id="4yuOb1eMNCi" role="ri$Ld">
+                                    <ref role="cht4Q" to="gm16:4novjIaNn1X" resolve="EBNFIFaceDefinitionTermRef" />
+                                  </node>
+                                </node>
+                                <node concept="1xIGOp" id="4yuOb1eMNCj" role="1xVPHs" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbJ" id="4yuOb1eMNCk" role="3cqZAp">
+                          <node concept="3clFbS" id="4yuOb1eMNCl" role="3clFbx">
+                            <node concept="3clFbF" id="4yuOb1eMNCm" role="3cqZAp">
+                              <node concept="2OqwBi" id="4yuOb1eMNCn" role="3clFbG">
+                                <node concept="37vLTw" id="4yuOb1eMNCo" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="4yuOb1eMNeb" resolve="results" />
+                                </node>
+                                <node concept="X8dFx" id="4yuOb1eMNCp" role="2OqNvi">
+                                  <node concept="37vLTw" id="4yuOb1eMNCq" role="25WWJ7">
+                                    <ref role="3cqZAo" node="4yuOb1eMNCa" resolve="l2" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="4yuOb1eMNCr" role="3clFbw">
+                            <node concept="37vLTw" id="4yuOb1eMNCs" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4yuOb1eMNCa" resolve="l2" />
+                            </node>
+                            <node concept="3GX2aA" id="4yuOb1eMNCt" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="gl6BB" id="4yuOb1eMNCu" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="4yuOb1eMNCv" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="JncvC" id="4yuOb1eMNCw" role="JncvA">
+              <property role="TrG5h" value="bnfTerm" />
+              <node concept="2jxLKc" id="4yuOb1eMNCx" role="1tU5fm" />
+            </node>
+          </node>
+          <node concept="3clFbH" id="4yuOb1eMMHP" role="3cqZAp" />
+          <node concept="3clFbH" id="4yuOb1eMMHR" role="3cqZAp" />
+          <node concept="3cpWs6" id="4yuOb1eMMwY" role="3cqZAp">
+            <node concept="2YIFZM" id="4yuOb1eMMEX" role="3cqZAk">
+              <ref role="37wK5l" to="o8zo:4IP40Bi3eAf" resolve="forNamedElements" />
+              <ref role="1Pybhc" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
+              <node concept="37vLTw" id="4yuOb1eSCVO" role="37wK5m">
+                <ref role="3cqZAo" node="4yuOb1eMNeb" resolve="results" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/de.pes.metabnf.extended/models/de.pes.metabnf.extended.editor.mps b/code/languages/de.pes.metabnf.extended/models/de.pes.metabnf.extended.editor.mps
index db22d04..72b12c5 100644
--- a/code/languages/de.pes.metabnf.extended/models/de.pes.metabnf.extended.editor.mps
+++ b/code/languages/de.pes.metabnf.extended/models/de.pes.metabnf.extended.editor.mps
@@ -31,9 +31,9 @@
     <import index="5ueo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.style(MPS.Editor/)" />
     <import index="hox0" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.style(MPS.Editor/)" />
     <import index="ef3c" ref="r:d64a503a-863b-4d41-8cda-133bebcc02a8(de.pes.metabnf.base.editor)" />
+    <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="yrpt" ref="r:15d1b130-f395-476f-b866-5377702ecef9(de.pes.metabnf.basic.behavior)" implicit="true" />
-    <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="yot6" ref="r:fa98198a-d052-48c6-a067-71419b7c2317(de.pes.metabnf.base.structure)" implicit="true" />
   </imports>
@@ -58,6 +58,7 @@
         <child id="1080736633877" name="cellModel" index="2wV5jI" />
       </concept>
       <concept id="8383079901754291618" name="jetbrains.mps.lang.editor.structure.CellModel_NextEditor" flags="ng" index="B$lHz" />
+      <concept id="1239814640496" name="jetbrains.mps.lang.editor.structure.CellLayout_VerticalGrid" flags="nn" index="2EHx9g" />
       <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" />
@@ -78,6 +79,7 @@
       </concept>
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
+      <concept id="1186414976055" name="jetbrains.mps.lang.editor.structure.DrawBorderStyleClassItem" flags="ln" index="VPXOz" />
       <concept id="1186414999511" name="jetbrains.mps.lang.editor.structure.UnderlinedStyleClassItem" flags="ln" index="VQ3r3">
         <property id="1214316229833" name="underlined" index="2USNnj" />
       </concept>
@@ -85,6 +87,8 @@
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
+      <concept id="1214406454886" name="jetbrains.mps.lang.editor.structure.TextBackgroundColorStyleClassItem" flags="ln" index="30gYXW" />
+      <concept id="1214406466686" name="jetbrains.mps.lang.editor.structure.TextBackgroundColorSelectedStyleClassItem" flags="ln" index="30h1P$" />
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
       <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
       <concept id="3383245079137382180" name="jetbrains.mps.lang.editor.structure.StyleClass" flags="ig" index="14StLt" />
@@ -109,6 +113,7 @@
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
       <concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
+        <reference id="1139959269582" name="actionMap" index="1ERwB7" />
         <child id="1142887637401" name="renderingCondition" index="pqm2j" />
         <child id="4323500428121274054" name="id" index="2SqHTX" />
       </concept>
@@ -294,6 +299,7 @@
       </concept>
       <concept id="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
       <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
       </concept>
@@ -2520,7 +2526,7 @@
   </node>
   <node concept="24kQdi" id="5SQJARTsX7I">
     <property role="3GE5qa" value="Attributes.editor.custom" />
-    <ref role="1XX52x" to="gm16:5SQJARTsWl$" resolve="EBNFCustomCellModel_List" />
+    <ref role="1XX52x" to="gm16:5SQJARTsWl$" resolve="EBNFCustomCellModel_ListRef" />
     <node concept="3EZMnI" id="5SQJARTt2EI" role="2wV5jI">
       <node concept="3F0ifn" id="5SQJARTt2F0" role="3EZMnx">
         <property role="3F0ifm" value="(" />
@@ -2557,7 +2563,7 @@
   </node>
   <node concept="22mcaB" id="5SQJARTIRo5">
     <property role="3GE5qa" value="Attributes.editor.custom" />
-    <ref role="aqKnT" to="gm16:5SQJARTsWl$" resolve="EBNFCustomCellModel_List" />
+    <ref role="aqKnT" to="gm16:5SQJARTsWl$" resolve="EBNFCustomCellModel_ListRef" />
     <node concept="22hDWj" id="5SQJARTISf4" role="22hAXT" />
     <node concept="3XHNnq" id="5SQJARTISf5" role="3ft7WO">
       <ref role="3XGfJA" to="yot6:5SQJARTsWlE" />
@@ -2685,5 +2691,308 @@
       </node>
     </node>
   </node>
+  <node concept="24kQdi" id="4yuOb1eJHkj">
+    <property role="3GE5qa" value="Attributes.editor.custom" />
+    <ref role="1XX52x" to="gm16:4yuOb1eJDGV" resolve="EBNFCustomCellModel_Ref" />
+    <node concept="3EZMnI" id="4yuOb1eJHkl" role="2wV5jI">
+      <node concept="3F0ifn" id="4yuOb1eJHkr" role="3EZMnx">
+        <property role="3F0ifm" value="RefNode:" />
+      </node>
+      <node concept="1iCGBv" id="4yuOb1eJJHG" role="3EZMnx">
+        <ref role="1NtTu8" to="gm16:4yuOb1eJHku" resolve="ref" />
+        <node concept="1sVBvm" id="4yuOb1eJJHI" role="1sWHZn">
+          <node concept="3SHvHV" id="4yuOb1eJJHM" role="2wV5jI" />
+        </node>
+      </node>
+      <node concept="2iRfu4" id="4yuOb1eJHko" role="2iSdaV" />
+    </node>
+    <node concept="3EZMnI" id="4yuOb1eJJHO" role="6VMZX">
+      <node concept="PMmxH" id="4yuOb1eJJHP" role="3EZMnx">
+        <ref role="PMmxG" to="tpc5:hF4ssnw" resolve="_CellModel_Common" />
+      </node>
+      <node concept="3F0ifn" id="4yuOb1eJJHQ" role="3EZMnx">
+        <node concept="VPM3Z" id="4yuOb1eJJHR" role="3F10Kt" />
+      </node>
+      <node concept="3F0ifn" id="fIAC36D" role="3EZMnx">
+        <property role="3F0ifm" value="Ref.node cell:" />
+        <ref role="1k5W1q" to="tpc5:hF4yUZ8" resolve="header" />
+      </node>
+      <node concept="3EZMnI" id="hF4wIvO" role="3EZMnx">
+        <node concept="3EZMnI" id="hF4xb4b" role="3EZMnx">
+          <node concept="3F0ifn" id="hF4xb4c" role="3EZMnx">
+            <property role="3F0ifm" value="text*" />
+            <ref role="1k5W1q" to="tpc5:hF4H1c8" resolve="property" />
+          </node>
+          <node concept="3F0A7n" id="hF4xb4f" role="3EZMnx">
+            <property role="1O74Pk" value="true" />
+            <property role="1$x2rV" value="&lt;none&gt;" />
+            <ref role="1NtTu8" to="yot6:g_$x2vM" resolve="noTargetText" />
+            <node concept="VPXOz" id="hF4xb4g" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+            <node concept="30gYXW" id="hF4xb4h" role="3F10Kt">
+              <property role="Vb096" value="fLwANPq/yellow" />
+            </node>
+            <node concept="30h1P$" id="hF4xb4i" role="3F10Kt">
+              <property role="Vb096" value="fLwANPt/cyan" />
+            </node>
+          </node>
+          <node concept="VPM3Z" id="hF4xb4j" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="VPXOz" id="hF4xb4k" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="2iRfu4" id="i2IxuN4" role="2iSdaV" />
+          <node concept="pkWqt" id="2GeWSWLWq7Q" role="pqm2j">
+            <node concept="3clFbS" id="2GeWSWLWq7R" role="2VODD2">
+              <node concept="3clFbF" id="2GeWSWLWq8x" role="3cqZAp">
+                <node concept="3fqX7Q" id="2GeWSWLWq8z" role="3clFbG">
+                  <node concept="2OqwBi" id="2GeWSWLWq8$" role="3fr31v">
+                    <node concept="pncrf" id="2GeWSWLWq8_" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="2GeWSWLWq8A" role="2OqNvi">
+                      <ref role="3TsBF5" to="gm16:Ujlmrg18k" resolve="customizeEmptyCell" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3EZMnI" id="hF9sT4c" role="3EZMnx">
+          <node concept="3F0ifn" id="hF9sT4d" role="3EZMnx">
+            <property role="3F0ifm" value="empty text*" />
+            <ref role="1k5W1q" to="tpc5:hF4H1c8" resolve="property" />
+          </node>
+          <node concept="3F0A7n" id="hF9sT4e" role="3EZMnx">
+            <property role="1O74Pk" value="true" />
+            <property role="1$x2rV" value="&lt;none&gt;" />
+            <ref role="1NtTu8" to="yot6:hF9s7y1" resolve="emptyNoTargetText" />
+            <node concept="VPXOz" id="hF9sT4f" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+            <node concept="30gYXW" id="hF9sT4g" role="3F10Kt">
+              <property role="Vb096" value="fLwANPq/yellow" />
+            </node>
+            <node concept="30h1P$" id="hF9sT4h" role="3F10Kt">
+              <property role="Vb096" value="fLwANPt/cyan" />
+            </node>
+          </node>
+          <node concept="VPM3Z" id="hF9sT4i" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="VPXOz" id="hF9sT4j" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="pkWqt" id="hF9sT4k" role="pqm2j">
+            <node concept="3clFbS" id="hF9sT4l" role="2VODD2">
+              <node concept="3clFbF" id="hF9sT4m" role="3cqZAp">
+                <node concept="1Wc70l" id="2GeWSWLWpgk" role="3clFbG">
+                  <node concept="3fqX7Q" id="2GeWSWLWpju" role="3uHU7B">
+                    <node concept="2OqwBi" id="2GeWSWLWpvE" role="3fr31v">
+                      <node concept="pncrf" id="2GeWSWLWppz" role="2Oq$k0" />
+                      <node concept="3TrcHB" id="2GeWSWLWpSQ" role="2OqNvi">
+                        <ref role="3TsBF5" to="gm16:Ujlmrg18k" resolve="customizeEmptyCell" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbC" id="hF9sT4n" role="3uHU7w">
+                    <node concept="10Nm6u" id="hF9sT4o" role="3uHU7w" />
+                    <node concept="2OqwBi" id="hF9sT4p" role="3uHU7B">
+                      <node concept="pncrf" id="hF9sT4q" role="2Oq$k0" />
+                      <node concept="3TrcHB" id="hF9sT4r" role="2OqNvi">
+                        <ref role="3TsBF5" to="yot6:g_$x2vM" resolve="noTargetText" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2iRfu4" id="i2IxuSg" role="2iSdaV" />
+        </node>
+        <node concept="3EZMnI" id="Ujlmrg3Aa" role="3EZMnx">
+          <node concept="3F0ifn" id="Ujlmrg3Ab" role="3EZMnx">
+            <property role="3F0ifm" value="customize empty cell*" />
+            <ref role="1k5W1q" to="tpc5:hF4H1c8" resolve="property" />
+          </node>
+          <node concept="3F0A7n" id="Ujlmrg3Ac" role="3EZMnx">
+            <property role="1O74Pk" value="true" />
+            <property role="1$x2rV" value="&lt;none&gt;" />
+            <ref role="1NtTu8" to="gm16:Ujlmrg18k" resolve="customizeEmptyCell" />
+            <node concept="VPXOz" id="Ujlmrg3Ad" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+            <node concept="30gYXW" id="Ujlmrg3Ae" role="3F10Kt">
+              <property role="Vb096" value="fLwANPq/yellow" />
+            </node>
+            <node concept="30h1P$" id="Ujlmrg3Af" role="3F10Kt">
+              <property role="Vb096" value="fLwANPt/cyan" />
+            </node>
+          </node>
+          <node concept="VPM3Z" id="Ujlmrg3Ag" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="VPXOz" id="Ujlmrg3Ah" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="2iRfu4" id="Ujlmrg3Aq" role="2iSdaV" />
+        </node>
+        <node concept="3EZMnI" id="55my_QKPih4" role="3EZMnx">
+          <node concept="VPM3Z" id="55my_QKPih5" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="VPXOz" id="55my_QKPih6" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="3F0ifn" id="55my_QKPih7" role="3EZMnx">
+            <property role="3F0ifm" value="add context hints" />
+            <ref role="1k5W1q" to="tpc5:hF4H1c8" resolve="property" />
+          </node>
+          <node concept="3F1sOY" id="55my_QKPih8" role="3EZMnx">
+            <ref role="1ERwB7" to="tpc5:55my_QKP_mV" resolve="CellModel_RefNode_AddHint_Actions" />
+            <ref role="1NtTu8" to="gm16:55my_QKP5Sf" />
+          </node>
+          <node concept="2iRfu4" id="55my_QKPih9" role="2iSdaV" />
+        </node>
+        <node concept="3EZMnI" id="55my_QKPiha" role="3EZMnx">
+          <node concept="VPM3Z" id="55my_QKPihb" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="VPXOz" id="55my_QKPihc" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="3F0ifn" id="55my_QKPihd" role="3EZMnx">
+            <property role="3F0ifm" value="remove context hints" />
+            <ref role="1k5W1q" to="tpc5:hF4H1c8" resolve="property" />
+          </node>
+          <node concept="3F1sOY" id="55my_QKPihe" role="3EZMnx">
+            <ref role="1ERwB7" to="tpc5:55my_QKPFFX" resolve="CellModel_RefNode_RemoveHint_Actions" />
+            <ref role="1NtTu8" to="gm16:55my_QKP5Sg" />
+          </node>
+          <node concept="2iRfu4" id="55my_QKPihf" role="2iSdaV" />
+        </node>
+        <node concept="VPXOz" id="hF4$63F" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="2EHx9g" id="i2IxuUh" role="2iSdaV" />
+      </node>
+      <node concept="3F0ifn" id="4yuOb1eJJI3" role="3EZMnx" />
+      <node concept="VPM3Z" id="4yuOb1eJJHT" role="3F10Kt">
+        <property role="VOm3f" value="false" />
+      </node>
+      <node concept="2iRkQZ" id="4yuOb1eJJHU" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="22mcaB" id="4yuOb1eW$wZ">
+    <property role="3GE5qa" value="Attributes.editor.custom" />
+    <ref role="aqKnT" to="gm16:4yuOb1eJDGV" resolve="EBNFCustomCellModel_Ref" />
+    <node concept="22hDWj" id="4yuOb1eW$x0" role="22hAXT" />
+    <node concept="3XHNnq" id="4yuOb1eW$x1" role="3ft7WO">
+      <ref role="3XGfJA" to="gm16:4yuOb1eJHku" />
+      <node concept="1WAQ3h" id="4yuOb1eW$x2" role="3PHfNJ">
+        <node concept="3clFbS" id="4yuOb1eW$x3" role="2VODD2">
+          <node concept="3clFbJ" id="4yuOb1eW$LH" role="3cqZAp">
+            <node concept="2OqwBi" id="4yuOb1eW$LI" role="3clFbw">
+              <node concept="1WAUZh" id="4yuOb1eW$LJ" role="2Oq$k0" />
+              <node concept="1mIQ4w" id="4yuOb1eWB$T" role="2OqNvi">
+                <node concept="chp4Y" id="4yuOb1eWClE" role="cj9EA">
+                  <ref role="cht4Q" to="p1cl:fbptcj2IO2" resolve="BNFDefinitionTermRef" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="4yuOb1eW$LM" role="3clFbx">
+              <node concept="3cpWs6" id="4yuOb1eW$LN" role="3cqZAp">
+                <node concept="2OqwBi" id="4yuOb1eW$LO" role="3cqZAk">
+                  <node concept="2OqwBi" id="4yuOb1eW$LP" role="2Oq$k0">
+                    <node concept="1PxgMI" id="4yuOb1eW$LQ" role="2Oq$k0">
+                      <node concept="chp4Y" id="4yuOb1eW$LR" role="3oSUPX">
+                        <ref role="cht4Q" to="p1cl:fbptcj2IO2" resolve="BNFDefinitionTermRef" />
+                      </node>
+                      <node concept="1WAUZh" id="4yuOb1eW$LS" role="1m5AlR" />
+                    </node>
+                    <node concept="3TrEf2" id="4yuOb1eW$LT" role="2OqNvi">
+                      <ref role="3Tt5mk" to="p1cl:fbptcj2IO3" />
+                    </node>
+                  </node>
+                  <node concept="3TrcHB" id="4yuOb1eW$LU" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbJ" id="4yuOb1eW$LV" role="3cqZAp">
+            <node concept="3clFbS" id="4yuOb1eW$LW" role="3clFbx">
+              <node concept="3cpWs6" id="4yuOb1eW$LX" role="3cqZAp">
+                <node concept="2OqwBi" id="4yuOb1eW$LY" role="3cqZAk">
+                  <node concept="2OqwBi" id="4yuOb1eW$LZ" role="2Oq$k0">
+                    <node concept="1PxgMI" id="4yuOb1eW$M0" role="2Oq$k0">
+                      <node concept="chp4Y" id="4yuOb1eW$M1" role="3oSUPX">
+                        <ref role="cht4Q" to="gm16:4novjIaNn1X" resolve="EBNFIFaceDefinitionTermRef" />
+                      </node>
+                      <node concept="1WAUZh" id="4yuOb1eW$M2" role="1m5AlR" />
+                    </node>
+                    <node concept="3TrEf2" id="4yuOb1eW$M3" role="2OqNvi">
+                      <ref role="3Tt5mk" to="gm16:4novjIaNn1Y" />
+                    </node>
+                  </node>
+                  <node concept="3TrcHB" id="4yuOb1eW$M4" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="4yuOb1eW$M5" role="3clFbw">
+              <node concept="1WAUZh" id="4yuOb1eW$M6" role="2Oq$k0" />
+              <node concept="1mIQ4w" id="4yuOb1eW$M7" role="2OqNvi">
+                <node concept="chp4Y" id="4yuOb1eW$M8" role="cj9EA">
+                  <ref role="cht4Q" to="gm16:4novjIaNn1X" resolve="EBNFIFaceDefinitionTermRef" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbJ" id="4yuOb1eW$M9" role="3cqZAp">
+            <node concept="3clFbS" id="4yuOb1eW$Ma" role="3clFbx">
+              <node concept="3cpWs6" id="4yuOb1eW$Mb" role="3cqZAp">
+                <node concept="2OqwBi" id="4yuOb1eW$Mc" role="3cqZAk">
+                  <node concept="2OqwBi" id="4yuOb1eW$Md" role="2Oq$k0">
+                    <node concept="1PxgMI" id="4yuOb1eW$Me" role="2Oq$k0">
+                      <node concept="chp4Y" id="4yuOb1eW$Mf" role="3oSUPX">
+                        <ref role="cht4Q" to="gm16:7egTi9KR_xZ" resolve="EBNFAbstractDefinitionTermRef" />
+                      </node>
+                      <node concept="1WAUZh" id="4yuOb1eW$Mg" role="1m5AlR" />
+                    </node>
+                    <node concept="3TrEf2" id="4yuOb1eW$Mh" role="2OqNvi">
+                      <ref role="3Tt5mk" to="gm16:7egTi9KR_y0" />
+                    </node>
+                  </node>
+                  <node concept="3TrcHB" id="4yuOb1eW$Mi" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="4yuOb1eW$Mj" role="3clFbw">
+              <node concept="1WAUZh" id="4yuOb1eW$Mk" role="2Oq$k0" />
+              <node concept="1mIQ4w" id="4yuOb1eW$Ml" role="2OqNvi">
+                <node concept="chp4Y" id="4yuOb1eW$Mm" role="cj9EA">
+                  <ref role="cht4Q" to="gm16:7egTi9KR_xZ" resolve="EBNFAbstractDefinitionTermRef" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs6" id="4yuOb1eW$Mn" role="3cqZAp">
+            <node concept="2OqwBi" id="4yuOb1eW$Mo" role="3cqZAk">
+              <node concept="1WAUZh" id="4yuOb1eW$Mp" role="2Oq$k0" />
+              <node concept="2qgKlT" id="4yuOb1eW$Mq" role="2OqNvi">
+                <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/de.pes.metabnf.extended/models/de.pes.metabnf.extended.structure.mps b/code/languages/de.pes.metabnf.extended/models/de.pes.metabnf.extended.structure.mps
index a7ca922..80c1646 100644
--- a/code/languages/de.pes.metabnf.extended/models/de.pes.metabnf.extended.structure.mps
+++ b/code/languages/de.pes.metabnf.extended/models/de.pes.metabnf.extended.structure.mps
@@ -406,6 +406,9 @@
     <node concept="PrWs8" id="r82NTOeiHi" role="PzmwI">
       <ref role="PrY4T" to="p1cl:7aaqmzlmc9L" resolve="IBNFEditorReprensentation" />
     </node>
+    <node concept="PrWs8" id="6hE5InXIrbh" role="PzmwI">
+      <ref role="PrY4T" to="yot6:T845Ys479E" resolve="IBNFExpressionReference" />
+    </node>
   </node>
   <node concept="1TIwiD" id="T845YrpKWW">
     <property role="EcuMT" value="1029090517669318460" />
@@ -554,6 +557,9 @@
     <node concept="PrWs8" id="r82NTOipuI" role="PzmwI">
       <ref role="PrY4T" to="p1cl:7aaqmzlmc9L" resolve="IBNFEditorReprensentation" />
     </node>
+    <node concept="PrWs8" id="6hE5InXEEDT" role="PzmwI">
+      <ref role="PrY4T" to="yot6:T845Ys479E" resolve="IBNFExpressionReference" />
+    </node>
   </node>
   <node concept="1TIwiD" id="7egTi9L2p85">
     <property role="EcuMT" value="8327407647096148485" />
@@ -762,17 +768,12 @@
       <ref role="20lvS9" to="tpc2:66t_lskdtZC" resolve="EditorComponentDeclarationReference" />
     </node>
     <node concept="PrWs8" id="6mcP9nJg7Xl" role="PzmwI">
-      <ref role="PrY4T" node="6mcP9nJg7Vr" resolve="ICustomEditorRepresentation" />
+      <ref role="PrY4T" to="yot6:6mcP9nJg7Vr" resolve="ICustomEditorRepresentation" />
     </node>
     <node concept="PrWs8" id="5SQJARStVRJ" role="PzmwI">
       <ref role="PrY4T" to="yot6:5SQJARStVza" resolve="IEBNFCustomComponentOverride" />
     </node>
   </node>
-  <node concept="PlHQZ" id="6mcP9nJg7Vr">
-    <property role="EcuMT" value="7317457234999410395" />
-    <property role="3GE5qa" value="Attributes.editor.custom" />
-    <property role="TrG5h" value="ICustomEditorRepresentation" />
-  </node>
   <node concept="1TIwiD" id="5SQJARPwye9">
     <property role="EcuMT" value="6788822867787260809" />
     <property role="TrG5h" value="EBNFCustomEditorDeclaration" />
@@ -803,7 +804,7 @@
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
     <node concept="PrWs8" id="5SQJARPRP5m" role="PzmwI">
-      <ref role="PrY4T" to="yot6:5SQJARQ1YXS" resolve="IBNFEditorCellModelBase" />
+      <ref role="PrY4T" to="yot6:4yuOb1fd4PH" resolve="IBNFEditorDeclarationRef" />
     </node>
     <node concept="1irR5M" id="5SQJARUW90N" role="rwd14">
       <property role="2$rrk2" value="1" />
@@ -827,7 +828,7 @@
     <property role="34LRSv" value="BNF Property Link" />
     <ref role="1TJDcQ" to="yot6:5SQJARTsWlF" resolve="EBNFCustomCellModel_WithRole" />
     <node concept="PrWs8" id="5SQJARRmzdG" role="PzmwI">
-      <ref role="PrY4T" node="6mcP9nJg7Vr" resolve="ICustomEditorRepresentation" />
+      <ref role="PrY4T" to="yot6:6mcP9nJg7Vr" resolve="ICustomEditorRepresentation" />
     </node>
     <node concept="1TJgyj" id="5SQJARRogth" role="1TKVEi">
       <property role="IQ2ns" value="6788822867818645329" />
@@ -839,11 +840,50 @@
   <node concept="1TIwiD" id="5SQJARTsWl$">
     <property role="EcuMT" value="6788822867853428068" />
     <property role="3GE5qa" value="Attributes.editor.custom" />
-    <property role="TrG5h" value="EBNFCustomCellModel_List" />
+    <property role="TrG5h" value="EBNFCustomCellModel_ListRef" />
     <property role="34LRSv" value="BNF List Node" />
     <ref role="1TJDcQ" to="yot6:1UvZxkXxQif" resolve="EBNFCustomCellModel_ListBase" />
     <node concept="PrWs8" id="5SQJARTsWlD" role="PzmwI">
-      <ref role="PrY4T" node="6mcP9nJg7Vr" resolve="ICustomEditorRepresentation" />
+      <ref role="PrY4T" to="yot6:6mcP9nJg7Vr" resolve="ICustomEditorRepresentation" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="4yuOb1eJDGV">
+    <property role="EcuMT" value="5232849272705030971" />
+    <property role="3GE5qa" value="Attributes.editor.custom" />
+    <property role="TrG5h" value="EBNFCustomCellModel_Ref" />
+    <property role="34LRSv" value="BNF List Ref" />
+    <ref role="1TJDcQ" to="yot6:5SQJARTsWlF" resolve="EBNFCustomCellModel_WithRole" />
+    <node concept="1TJgyj" id="55my_QKP5Sf" role="1TKVEi">
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="addHints" />
+      <property role="IQ2ns" value="5861024100072578575" />
+      <ref role="20lvS9" to="tpc2:42lfqf__buC" resolve="ContextHintsSpecification" />
+    </node>
+    <node concept="1TJgyj" id="55my_QKP5Sg" role="1TKVEi">
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="removeHints" />
+      <property role="IQ2ns" value="5861024100072578576" />
+      <ref role="20lvS9" to="tpc2:42lfqf__buC" resolve="ContextHintsSpecification" />
+    </node>
+    <node concept="1TJgyj" id="UjlmrgInb" role="1TKVEi">
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="emptyCellModel" />
+      <property role="IQ2ns" value="16410578721629643" />
+      <ref role="20lvS9" to="tpc2:fBEYTCT" resolve="EditorCellModel" />
+    </node>
+    <node concept="1TJgyi" id="Ujlmrg18k" role="1TKVEl">
+      <property role="TrG5h" value="customizeEmptyCell" />
+      <property role="IQ2nx" value="16410578721444372" />
+      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
+    </node>
+    <node concept="PrWs8" id="4yuOb1eJDGW" role="PzmwI">
+      <ref role="PrY4T" to="yot6:6mcP9nJg7Vr" resolve="ICustomEditorRepresentation" />
+    </node>
+    <node concept="1TJgyj" id="4yuOb1eJHku" role="1TKVEi">
+      <property role="IQ2ns" value="5232849272705045790" />
+      <property role="20kJfa" value="ref" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" to="tpck:gw2VY9q" resolve="BaseConcept" />
     </node>
   </node>
 </model>
diff --git a/code/languages/de.pes.metabnf.sandbox.editors/models/de.pes.metabnf.sandbox.editors.editor.mps b/code/languages/de.pes.metabnf.sandbox.editors/models/de.pes.metabnf.sandbox.editors.editor.mps
index 4861d4c..260f0c5 100644
--- a/code/languages/de.pes.metabnf.sandbox.editors/models/de.pes.metabnf.sandbox.editors.editor.mps
+++ b/code/languages/de.pes.metabnf.sandbox.editors/models/de.pes.metabnf.sandbox.editors.editor.mps
@@ -10,14 +10,14 @@
     <import index="37g0" ref="r:414259ad-74f6-41b7-ae29-947f52c56a15(de.pes.metabnf.base.utils)" />
     <import index="ksqi" ref="r:b8e55c48-e32b-4f3d-ad4a-ff8d123ef182(de.pes.metabnf.sandbox.editors.structure)" implicit="true" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi" />
+      <concept id="7418278005949660372" name="jetbrains.mps.lang.editor.structure.FontFamilyStyleClassItem" flags="ln" index="2biZxu" />
       <concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
       <concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
-      <concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
-      <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
         <child id="1080736633877" name="cellModel" index="2wV5jI" />
       </concept>
@@ -25,12 +25,13 @@
       <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="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
+      <concept id="7228435049763093185" name="jetbrains.mps.lang.editor.structure.FontFamilyContainer" flags="ngI" index="1rj3mw">
+        <property id="7228435049763093186" name="family" index="1rj3mz" />
+      </concept>
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
-      <concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
-        <child id="1142887637401" name="renderingCondition" index="pqm2j" />
-      </concept>
       <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
         <child id="1106270802874" name="cellLayout" index="2iSdaV" />
         <child id="1073389446424" name="childCellModel" index="3EZMnx" />
@@ -39,33 +40,15 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
+        <child id="1219418656006" name="styleItem" index="3F10Kt" />
+      </concept>
+      <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
-      <concept id="1198256887712" name="jetbrains.mps.lang.editor.structure.CellModel_Indent" flags="ng" index="3XFhqQ" />
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
         <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
       </concept>
     </language>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
-        <child id="1137022507850" name="body" index="2VODD2" />
-      </concept>
-      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
-        <property id="1070475926801" name="value" index="Xl_RC" />
-      </concept>
-      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
-        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
-        <child id="1068581517676" name="expression" index="3cqZAk" />
-      </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-    </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
@@ -75,123 +58,143 @@
       </concept>
     </language>
   </registry>
-  <node concept="24kQdi" id="1UvZxl0p94N">
+  <node concept="24kQdi" id="3BSsKSfjYNr">
     <property role="3GE5qa" value="editor samples" />
-    <property role="TrG5h" value="ConceptWithCustomEditor" />
-    <ref role="1XX52x" to="ksqi:5SQJAROnbEK" resolve="ConceptWithCustomEditor" />
-    <node concept="3EZMnI" id="1UvZxl0p95H" role="2wV5jI">
-      <node concept="2iRfu4" id="1UvZxl0p95I" role="2iSdaV" />
-      <node concept="PMmxH" id="1UvZxl0p95J" role="3EZMnx">
-        <ref role="PMmxG" node="1UvZxl0p95y" resolve="ConceptWithCustomEditor_EditorComponent" />
+    <property role="TrG5h" value="InterfaceWithList" />
+    <ref role="1XX52x" to="ksqi:1UvZxl05AQr" resolve="InterfaceWithList" />
+    <node concept="3EZMnI" id="6hE5InXKq4s" role="2wV5jI">
+      <node concept="2iRfu4" id="6hE5InXKq4t" role="2iSdaV" />
+      <node concept="PMmxH" id="6hE5InXKq4u" role="3EZMnx">
+        <ref role="PMmxG" node="3BSsKSfjYNE" resolve="InterfaceWithList_EditorComponent" />
       </node>
     </node>
   </node>
-  <node concept="PKFIW" id="1UvZxl0p94Y">
-    <property role="TrG5h" value="CWCE_List" />
+  <node concept="PKFIW" id="3BSsKSfjYNw">
+    <property role="TrG5h" value="ILIist" />
     <property role="3GE5qa" value="editor samples" />
-    <ref role="1XX52x" to="ksqi:5SQJAROnbEK" resolve="ConceptWithCustomEditor" />
-    <node concept="3EZMnI" id="1UvZxl0p951" role="2wV5jI">
-      <node concept="2iRfu4" id="1UvZxl0p952" role="2iSdaV" />
-      <node concept="3F2HdR" id="1UvZxl0p954" role="3EZMnx">
-        <ref role="1NtTu8" to="ksqi:5SQJARTsWlv" resolve="listElement" />
+    <ref role="1XX52x" to="ksqi:1UvZxl05AQr" resolve="InterfaceWithList" />
+    <node concept="3EZMnI" id="6hE5InXKq4h" role="2wV5jI">
+      <node concept="2iRfu4" id="6hE5InXKq4i" role="2iSdaV" />
+      <node concept="3F2HdR" id="6hE5InXKq4k" role="3EZMnx">
+        <ref role="1NtTu8" to="ksqi:1UvZxl05AQv" resolve="IListElements" />
       </node>
     </node>
   </node>
-  <node concept="PKFIW" id="1UvZxl0p95y">
-    <property role="TrG5h" value="ConceptWithCustomEditor_EditorComponent" />
+  <node concept="PKFIW" id="3BSsKSfjYNE">
+    <property role="TrG5h" value="InterfaceWithList_EditorComponent" />
     <property role="3GE5qa" value="editor samples" />
-    <ref role="1XX52x" to="ksqi:5SQJAROnbEK" resolve="ConceptWithCustomEditor" />
-    <node concept="3EZMnI" id="1UvZxl0p95_" role="2wV5jI">
-      <node concept="2iRkQZ" id="1UvZxl0p95A" role="2iSdaV" />
-      <node concept="3EZMnI" id="1UvZxl0p95D" role="3EZMnx">
-        <node concept="2iRfu4" id="1UvZxl0p95E" role="2iSdaV" />
-        <node concept="PMmxH" id="1UvZxl0p95F" role="3EZMnx">
-          <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        </node>
-      </node>
-      <node concept="3EZMnI" id="1UvZxl0p95B" role="3EZMnx">
-        <node concept="2iRfu4" id="1UvZxl0p95C" role="2iSdaV" />
-        <node concept="3XFhqQ" id="1UvZxl0p95G" role="3EZMnx" />
-        <node concept="3EZMnI" id="1UvZxl0p94Q" role="3EZMnx">
-          <node concept="2iRkQZ" id="1UvZxl0p94R" role="2iSdaV" />
-          <node concept="3EZMnI" id="1UvZxl0p94S" role="3EZMnx">
-            <node concept="2iRkQZ" id="1UvZxl0p94T" role="2iSdaV" />
-            <node concept="3EZMnI" id="1UvZxl0p94U" role="3EZMnx">
-              <node concept="2iRfu4" id="1UvZxl0p94V" role="2iSdaV" />
-              <node concept="3F0ifn" id="1UvZxl0p94W" role="3EZMnx">
-                <property role="3F0ifm" value="name" />
-              </node>
-              <node concept="3F0A7n" id="1UvZxl0p94X" role="3EZMnx">
-                <ref role="1NtTu8" to="ksqi:5SQJARRvgjY" resolve="name" />
-              </node>
-            </node>
-            <node concept="3EZMnI" id="1UvZxl0p955" role="3EZMnx">
-              <node concept="2iRfu4" id="1UvZxl0p956" role="2iSdaV" />
-              <node concept="PMmxH" id="1UvZxl0p957" role="3EZMnx">
-                <ref role="PMmxG" node="1UvZxl0p94Y" resolve="CWCE_List" />
-              </node>
-              <node concept="pkWqt" id="1UvZxl0p95e" role="pqm2j">
-                <node concept="3clFbS" id="1UvZxl0p958" role="2VODD2">
-                  <node concept="3cpWs6" id="1UvZxl0p95d" role="3cqZAp">
-                    <node concept="2YIFZM" id="1UvZxl0p959" role="3cqZAk">
-                      <ref role="1Pybhc" to="37g0:7LcVVIPsDBl" />
-                      <ref role="37wK5l" to="37g0:7LcVVIO1bRG" />
-                      <node concept="pncrf" id="1UvZxl0p95a" role="37wK5m" />
-                      <node concept="Xl_RD" id="1UvZxl0p95b" role="37wK5m">
-                        <property role="Xl_RC" value="ConceptWithCustomEditor_listElement" />
-                      </node>
-                      <node concept="Xl_RD" id="1UvZxl0p95c" role="37wK5m">
-                        <property role="Xl_RC" value="listElement" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
+    <ref role="1XX52x" to="ksqi:1UvZxl05AQr" resolve="InterfaceWithList" />
+    <node concept="3EZMnI" id="6hE5InXKq4o" role="2wV5jI">
+      <node concept="2iRkQZ" id="6hE5InXKq4p" role="2iSdaV" />
+      <node concept="3EZMnI" id="6hE5InXKq4q" role="3EZMnx">
+        <node concept="2iRfu4" id="6hE5InXKq4r" role="2iSdaV" />
+        <node concept="3EZMnI" id="6hE5InXKq4f" role="3EZMnx">
+          <node concept="2iRkQZ" id="6hE5InXKq4g" role="2iSdaV" />
+          <node concept="3EZMnI" id="6hE5InXKq4l" role="3EZMnx">
+            <node concept="2iRfu4" id="6hE5InXKq4m" role="2iSdaV" />
+            <node concept="PMmxH" id="6hE5InXKq4n" role="3EZMnx">
+              <ref role="PMmxG" node="3BSsKSfjYNw" resolve="ILIist" />
             </node>
           </node>
         </node>
       </node>
     </node>
   </node>
-  <node concept="24kQdi" id="1UvZxl0p95K">
+  <node concept="PKFIW" id="3BSsKSfjYNO">
+    <property role="TrG5h" value="CWCE" />
     <property role="3GE5qa" value="editor samples" />
-    <property role="TrG5h" value="InterfaceWithList" />
-    <ref role="1XX52x" to="ksqi:1UvZxl05AQr" resolve="InterfaceWithList" />
-    <node concept="3EZMnI" id="1UvZxl0p966" role="2wV5jI">
-      <node concept="2iRfu4" id="1UvZxl0p967" role="2iSdaV" />
-      <node concept="PMmxH" id="1UvZxl0p968" role="3EZMnx">
-        <ref role="PMmxG" node="1UvZxl0p95Z" resolve="InterfaceWithList_EditorComponent" />
+    <ref role="1XX52x" to="ksqi:5SQJAROnbEK" resolve="ConceptWithCustomEditor" />
+    <node concept="3EZMnI" id="6hE5InXKq3D" role="2wV5jI">
+      <node concept="3EZMnI" id="6hE5InXKq3E" role="3EZMnx">
+        <node concept="VPM3Z" id="6hE5InXKq3F" role="3F10Kt" />
+        <node concept="3F0ifn" id="6hE5InXKq3G" role="3EZMnx">
+          <property role="3F0ifm" value="Name:" />
+        </node>
+        <node concept="PMmxH" id="6hE5InXKq48" role="3EZMnx">
+          <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+          <node concept="2biZxu" id="6hE5InXKq3J" role="3F10Kt">
+            <property role="1rj3mz" value="Bitstream Charter" />
+          </node>
+        </node>
+        <node concept="2iRfu4" id="6hE5InXKq3K" role="2iSdaV" />
+      </node>
+      <node concept="3EZMnI" id="6hE5InXKq3L" role="3EZMnx">
+        <node concept="VPM3Z" id="6hE5InXKq3M" role="3F10Kt" />
+        <node concept="3F0ifn" id="6hE5InXKq3N" role="3EZMnx">
+          <property role="3F0ifm" value="Prop:" />
+        </node>
+        <node concept="3F0A7n" id="6hE5InXKq49" role="3EZMnx">
+          <ref role="1NtTu8" to="ksqi:6hE5InXKq3y" resolve="nameTag" />
+          <node concept="2biZxu" id="6hE5InXKq3P" role="3F10Kt">
+            <property role="1rj3mz" value="Arial" />
+          </node>
+        </node>
+        <node concept="2iRfu4" id="6hE5InXKq3Q" role="2iSdaV" />
+      </node>
+      <node concept="3EZMnI" id="6hE5InXKq3R" role="3EZMnx">
+        <node concept="VPM3Z" id="6hE5InXKq3S" role="3F10Kt" />
+        <node concept="3F0ifn" id="6hE5InXKq3T" role="3EZMnx">
+          <property role="3F0ifm" value="Impl:" />
+        </node>
+        <node concept="3F0A7n" id="6hE5InXKq4a" role="3EZMnx">
+          <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+        </node>
+        <node concept="2iRfu4" id="6hE5InXKq3V" role="2iSdaV" />
+      </node>
+      <node concept="3EZMnI" id="6hE5InXKq3W" role="3EZMnx">
+        <node concept="VPM3Z" id="6hE5InXKq3X" role="3F10Kt" />
+        <node concept="3F0ifn" id="6hE5InXKq3Y" role="3EZMnx">
+          <property role="3F0ifm" value="CExt:" />
+        </node>
+        <node concept="3F0A7n" id="6hE5InXKq4b" role="3EZMnx">
+          <ref role="1NtTu8" to="tpck:hnGE5uv" resolve="virtualPackage" />
+        </node>
+        <node concept="2iRfu4" id="6hE5InXKq40" role="2iSdaV" />
+      </node>
+      <node concept="3EZMnI" id="6hE5InXKq41" role="3EZMnx">
+        <node concept="VPM3Z" id="6hE5InXKq42" role="3F10Kt" />
+        <node concept="3F0ifn" id="6hE5InXKq43" role="3EZMnx">
+          <property role="3F0ifm" value="Opti:" />
+        </node>
+        <node concept="3F1sOY" id="6hE5InXKq4c" role="3EZMnx">
+          <ref role="1NtTu8" to="ksqi:4yuOb1eJHlv" resolve="IListElements" />
+        </node>
+        <node concept="2iRfu4" id="6hE5InXKq45" role="2iSdaV" />
+      </node>
+      <node concept="PMmxH" id="6hE5InXKq4d" role="3EZMnx">
+        <ref role="PMmxG" node="3BSsKSfmhWb" resolve="CWCE_List" />
       </node>
+      <node concept="2iRkQZ" id="6hE5InXKq47" role="2iSdaV" />
     </node>
   </node>
-  <node concept="PKFIW" id="1UvZxl0p95P">
-    <property role="TrG5h" value="ILIist" />
+  <node concept="24kQdi" id="3BSsKSfjYNR">
     <property role="3GE5qa" value="editor samples" />
-    <ref role="1XX52x" to="ksqi:1UvZxl05AQr" resolve="InterfaceWithList" />
-    <node concept="3EZMnI" id="1UvZxl0p95S" role="2wV5jI">
-      <node concept="2iRfu4" id="1UvZxl0p95T" role="2iSdaV" />
-      <node concept="3F2HdR" id="1UvZxl0p95V" role="3EZMnx">
-        <ref role="1NtTu8" to="ksqi:1UvZxl05AQv" resolve="IListElements" />
+    <property role="TrG5h" value="ConceptWithCustomEditor" />
+    <ref role="1XX52x" to="ksqi:5SQJAROnbEK" resolve="ConceptWithCustomEditor" />
+    <node concept="3EZMnI" id="3BSsKSfjYNS" role="2wV5jI">
+      <node concept="2iRkQZ" id="3BSsKSfjYNT" role="2iSdaV" />
+      <node concept="3EZMnI" id="3BSsKSfjYNU" role="3EZMnx">
+        <node concept="2iRfu4" id="3BSsKSfjYNV" role="2iSdaV" />
+        <node concept="PMmxH" id="3BSsKSfjYNW" role="3EZMnx">
+          <ref role="PMmxG" node="3BSsKSfjYNO" resolve="CWCE" />
+        </node>
+      </node>
+      <node concept="3EZMnI" id="3BSsKSfmhWe" role="3EZMnx">
+        <node concept="2iRfu4" id="3BSsKSfmhWf" role="2iSdaV" />
+        <node concept="PMmxH" id="3BSsKSfmhWg" role="3EZMnx">
+          <ref role="PMmxG" node="3BSsKSfmhWb" resolve="CWCE_List" />
+        </node>
       </node>
     </node>
   </node>
-  <node concept="PKFIW" id="1UvZxl0p95Z">
-    <property role="TrG5h" value="InterfaceWithList_EditorComponent" />
+  <node concept="PKFIW" id="3BSsKSfmhWb">
+    <property role="TrG5h" value="CWCE_List" />
     <property role="3GE5qa" value="editor samples" />
-    <ref role="1XX52x" to="ksqi:1UvZxl05AQr" resolve="InterfaceWithList" />
-    <node concept="3EZMnI" id="1UvZxl0p962" role="2wV5jI">
-      <node concept="2iRkQZ" id="1UvZxl0p963" role="2iSdaV" />
-      <node concept="3EZMnI" id="1UvZxl0p964" role="3EZMnx">
-        <node concept="2iRfu4" id="1UvZxl0p965" role="2iSdaV" />
-        <node concept="3EZMnI" id="1UvZxl0p95N" role="3EZMnx">
-          <node concept="2iRkQZ" id="1UvZxl0p95O" role="2iSdaV" />
-          <node concept="3EZMnI" id="1UvZxl0p95W" role="3EZMnx">
-            <node concept="2iRfu4" id="1UvZxl0p95X" role="2iSdaV" />
-            <node concept="PMmxH" id="1UvZxl0p95Y" role="3EZMnx">
-              <ref role="PMmxG" node="1UvZxl0p95P" resolve="ILIist" />
-            </node>
-          </node>
-        </node>
+    <ref role="1XX52x" to="ksqi:5SQJAROnbEK" resolve="ConceptWithCustomEditor" />
+    <node concept="3EZMnI" id="6hE5InXKq3_" role="2wV5jI">
+      <node concept="2iRfu4" id="6hE5InXKq3A" role="2iSdaV" />
+      <node concept="3F2HdR" id="6hE5InXKq3C" role="3EZMnx">
+        <ref role="1NtTu8" to="ksqi:5SQJARTsWlv" resolve="listElement" />
       </node>
     </node>
   </node>
diff --git a/code/languages/de.pes.metabnf.sandbox.editors/models/de.pes.metabnf.sandbox.editors.intentions.mps b/code/languages/de.pes.metabnf.sandbox.editors/models/de.pes.metabnf.sandbox.editors.intentions.mps
index 577de0f..6894323 100644
--- a/code/languages/de.pes.metabnf.sandbox.editors/models/de.pes.metabnf.sandbox.editors.intentions.mps
+++ b/code/languages/de.pes.metabnf.sandbox.editors/models/de.pes.metabnf.sandbox.editors.intentions.mps
@@ -3,6 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="1" />
+    <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/code/languages/de.pes.metabnf.sandbox.editors/models/de.pes.metabnf.sandbox.editors.structure.mps b/code/languages/de.pes.metabnf.sandbox.editors/models/de.pes.metabnf.sandbox.editors.structure.mps
index 5077023..bc8bcd0 100644
--- a/code/languages/de.pes.metabnf.sandbox.editors/models/de.pes.metabnf.sandbox.editors.structure.mps
+++ b/code/languages/de.pes.metabnf.sandbox.editors/models/de.pes.metabnf.sandbox.editors.structure.mps
@@ -22,8 +22,12 @@
         <child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
       </concept>
       <concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ" />
+      <concept id="1169127622168" name="jetbrains.mps.lang.structure.structure.InterfaceConceptReference" flags="ig" index="PrWs8">
+        <reference id="1169127628841" name="intfc" index="PrY4T" />
+      </concept>
       <concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
         <reference id="1071489389519" name="extends" index="1TJDcQ" />
+        <child id="1169129564478" name="implements" index="PzmwI" />
       </concept>
       <concept id="1071489288299" name="jetbrains.mps.lang.structure.structure.PropertyDeclaration" flags="ig" index="1TJgyi">
         <property id="241647608299431129" name="propertyId" index="IQ2nx" />
@@ -57,11 +61,6 @@
       <property role="TrG5h" value="de.pes.metabnf.sandbox.sandbox_editor:ConceptWithCustomEditor" />
       <property role="2ZG9b7" value="http://127.0.0.1:63320/node?ref=r%3Aa27b50bb-e121-4cb4-b675-799ff4629efc%28de.pes.metabnf.sandbox.sandbox_editor%29%2F6788822867768031901" />
     </node>
-    <node concept="1TJgyi" id="5SQJARRvgjY" role="1TKVEl">
-      <property role="TrG5h" value="name" />
-      <property role="IQ2nx" value="6788822867820479742" />
-      <ref role="AX2Wp" to="tpck:fKAOsGN" />
-    </node>
     <node concept="1TJgyj" id="5SQJARTsWlv" role="1TKVEi">
       <property role="TrG5h" value="listElement" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -70,6 +69,21 @@
       <property role="IQ2ns" value="6788822867853428063" />
       <ref role="20lvS9" node="5SQJARTsWlq" resolve="listElement" />
     </node>
+    <node concept="1TJgyj" id="4yuOb1eJHlv" role="1TKVEi">
+      <property role="TrG5h" value="IListElements" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="IListElements" />
+      <property role="IQ2ns" value="5232849272705045855" />
+      <ref role="20lvS9" node="1UvZxl05AQp" resolve="IListElements" />
+    </node>
+    <node concept="PrWs8" id="6hE5InXKq3x" role="PzmwI">
+      <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
+    </node>
+    <node concept="1TJgyi" id="6hE5InXKq3y" role="1TKVEl">
+      <property role="TrG5h" value="nameTag" />
+      <property role="IQ2nx" value="7235620928384770274" />
+      <ref role="AX2Wp" to="tpck:fKAOsGN" />
+    </node>
   </node>
   <node concept="1TIwiD" id="5SQJARTsWlq">
     <property role="TrG5h" value="listElement" />
diff --git a/code/solutions/de.pes.MetaBNF.build/models/de.pes.MetaBNF.build.mps b/code/solutions/de.pes.MetaBNF.build/models/de.pes.MetaBNF.build.mps
index 727e613..95ee3f7 100644
--- a/code/solutions/de.pes.MetaBNF.build/models/de.pes.MetaBNF.build.mps
+++ b/code/solutions/de.pes.MetaBNF.build/models/de.pes.MetaBNF.build.mps
@@ -415,11 +415,6 @@
             <ref role="1Busuk" node="7LcVVIPHnaA" resolve="de.pes.metabnf.base" />
           </node>
         </node>
-        <node concept="1SiIV0" id="1vpfjfLSit4" role="3bR37C">
-          <node concept="3bR9La" id="1vpfjfLSit5" role="1SiIV1">
-            <ref role="3bR37D" node="7vSfl_Uu_xf" resolve="de.pes.metabnf.extended" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtD" id="7vSfl_Uu_xf" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -904,6 +899,11 @@
             <ref role="1Busuk" to="ffeo:7Kfy9QB6L4X" resolve="jetbrains.mps.lang.editor" />
           </node>
         </node>
+        <node concept="1SiIV0" id="3BSsKSfcMMn" role="3bR37C">
+          <node concept="3bR9La" id="3BSsKSfcMMo" role="1SiIV1">
+            <ref role="3bR37D" node="7hex6wUv$mQ" resolve="de.pes.metabnf.utils" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="m$_wf" id="7LoZJl0udGv" role="3989C9">
diff --git a/code/solutions/de.pes.metabnf.sandbox/models/de.pes.metabnf.sandbox.sandbox_editor.mps b/code/solutions/de.pes.metabnf.sandbox/models/de.pes.metabnf.sandbox.sandbox_editor.mps
index 470344a..1c0252a 100644
--- a/code/solutions/de.pes.metabnf.sandbox/models/de.pes.metabnf.sandbox.sandbox_editor.mps
+++ b/code/solutions/de.pes.metabnf.sandbox/models/de.pes.metabnf.sandbox.sandbox_editor.mps
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:a27b50bb-e121-4cb4-b675-799ff4629efc(de.pes.metabnf.sandbox.sandbox_editor)">
   <persistence version="9" />
+  <attribute name="doNotGenerate" value="true" />
   <languages>
     <use id="303ca9b8-0d32-4b0f-bc34-d1ebf972bfac" name="de.pes.metabnf.extended" version="2" />
     <use id="926d63aa-027c-47a4-939e-98f42e63df1a" name="de.pes.metabnf.basic" version="0" />
@@ -9,6 +10,7 @@
   </languages>
   <imports>
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -37,14 +39,12 @@
       <concept id="8327407647102502951" name="de.pes.metabnf.basic.structure.IBNFBaseStatementConcept" flags="ngI" index="2YAO5">
         <child id="8327407647102502952" name="expr" index="2YAOa" />
       </concept>
+      <concept id="273424159621746662" name="de.pes.metabnf.basic.structure.MultiLineDefinitionTerm" flags="ng" index="gyeCP">
+        <child id="273424159621746663" name="content" index="gyeCO" />
+      </concept>
       <concept id="273424159618034946" name="de.pes.metabnf.basic.structure.BNFDefinitionTermRef" flags="ng" index="gKozh">
         <reference id="273424159618034947" name="ref" index="gKozg" />
       </concept>
-      <concept id="273424159617961299" name="de.pes.metabnf.basic.structure.BNFBinaryExpression" flags="ng" index="gKEy0">
-        <child id="273424159617961307" name="rvalue" index="gKEy8" />
-        <child id="273424159617961306" name="lvalue" index="gKEy9" />
-      </concept>
-      <concept id="273424159617961297" name="de.pes.metabnf.basic.structure.CommaExpression" flags="ng" index="gKEy2" />
       <concept id="273424159617857978" name="de.pes.metabnf.basic.structure.BNFStringLiteral" flags="ng" index="gKPLD">
         <property id="273424159617857979" name="value" index="gKPLC" />
       </concept>
@@ -53,6 +53,7 @@
       <concept id="273424159617697539" name="de.pes.metabnf.basic.structure.BNFWorkbook" flags="ng" index="gNEbg">
         <child id="273424159617715918" name="content" index="gNmGt" />
       </concept>
+      <concept id="273424159621331646" name="de.pes.metabnf.basic.structure.OptionalTermRef" flags="ng" index="gX_XH" />
       <concept id="273424159621376538" name="de.pes.metabnf.basic.structure.ListTermDefinitions" flags="ng" index="gXCZ9" />
       <concept id="1925855837437753080" name="de.pes.metabnf.basic.structure.IBNFGroupElements" flags="ngI" index="HFflm">
         <child id="2968083471245569684" name="expr" index="Iv2U_" />
@@ -88,6 +89,9 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
+        <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
+      </concept>
       <concept id="1863527487546129879" name="jetbrains.mps.lang.smodel.structure.ModelPointerExpression" flags="ng" index="1Xw6AR">
         <child id="1863527487546132519" name="modelRef" index="1XwpL7" />
       </concept>
@@ -98,6 +102,14 @@
       </concept>
     </language>
     <language id="303ca9b8-0d32-4b0f-bc34-d1ebf972bfac" name="de.pes.metabnf.extended">
+      <concept id="8327407647117082945" name="de.pes.metabnf.extended.structure.ExternalImplements" flags="ng" index="1Quhz" />
+      <concept id="8327407647106837872" name="de.pes.metabnf.extended.structure.IImplementsExternalConcepts" flags="ngI" index="2f4xi">
+        <child id="8327407647106839891" name="concept" index="2f51L" />
+      </concept>
+      <concept id="8327407647106839958" name="de.pes.metabnf.extended.structure.ImplementsExternalConcepts" flags="ng" index="2f52O" />
+      <concept id="5232849272705030971" name="de.pes.metabnf.extended.structure.EBNFCustomCellModel_Ref" flags="ng" index="684Ib">
+        <reference id="5232849272705045790" name="ref" index="680mI" />
+      </concept>
       <concept id="7317457234998573074" name="de.pes.metabnf.extended.structure.EBNFCustomCellModel_Component" flags="ng" index="2aJQM7">
         <child id="7317457234998574756" name="component" index="2aJQCL" />
       </concept>
@@ -105,7 +117,7 @@
         <property id="1029090517669318473" name="buildEditor" index="2lbLWm" />
         <child id="6788822867791600511" name="bnfEComponent" index="2FWIki" />
       </concept>
-      <concept id="6788822867853428068" name="de.pes.metabnf.extended.structure.EBNFCustomCellModel_List" flags="ng" index="2BhnG9" />
+      <concept id="6788822867853428068" name="de.pes.metabnf.extended.structure.EBNFCustomCellModel_ListRef" flags="ng" index="2BhnG9" />
       <concept id="6788822867818197866" name="de.pes.metabnf.extended.structure.EBNFCustomCellModel_Property" flags="ng" index="2Dr8O7">
         <reference id="6788822867818645329" name="ref" index="2DlV$W" />
       </concept>
@@ -121,6 +133,9 @@
   </registry>
   <node concept="gNEbg" id="5SQJAROnbEr">
     <property role="TrG5h" value="editor samples" />
+    <node concept="3f4ZRK" id="1UvZxkZb$Hy" role="gNmGt">
+      <property role="TrG5h" value="IListElements" />
+    </node>
     <node concept="gNmGs" id="5SQJAROnbEu" role="gNmGt" />
     <node concept="gNqHd" id="5SQJARTsWl2" role="gNmGt">
       <property role="TrG5h" value="listElement" />
@@ -131,19 +146,31 @@
     <node concept="gNqHd" id="5SQJAROnbEt" role="gNmGt">
       <property role="TrG5h" value="ConceptWithCustomEditor" />
       <node concept="2lbLXz" id="1UvZxkY_9$n" role="3f5NQZ">
-        <property role="2lbLWm" value="7aaqmzkcjlp/default" />
+        <property role="2lbLWm" value="7aaqmzkcjlr/custom" />
+        <node concept="2FWIk4" id="4yuOb1fcM6z" role="2FWIki">
+          <ref role="2FWIk7" node="1vpfjfMgZ30" resolve="CWCE" />
+        </node>
+      </node>
+      <node concept="2f52O" id="6hE5InXIrb7" role="3f5NQZ">
+        <node concept="35c_gC" id="6hE5InXIrb9" role="2f51L">
+          <ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
+        </node>
       </node>
-      <node concept="3f5NQU" id="1UvZxkZb$Iv" role="3f5NQZ" />
-      <node concept="gKEy2" id="5SQJARTsWl4" role="2YAOa">
-        <node concept="gKPLD" id="5SQJARR1pQ0" role="gKEy9">
-          <property role="gKPLC" value="name" />
+      <node concept="1Quhz" id="6hE5InXEx1w" role="3f5NQZ">
+        <node concept="35c_gC" id="6hE5InXEx1y" role="2f51L">
+          <ref role="35c_gD" to="tpck:h0TrEE$" resolve="INamedConcept" />
         </node>
-        <node concept="gXCZ9" id="5SQJARTsWl8" role="gKEy8">
+      </node>
+      <node concept="gyeCP" id="4yuOb1eJ_C5" role="2YAOa">
+        <node concept="gKPLD" id="5SQJARR1pQ0" role="gyeCO">
+          <property role="gKPLC" value="nameTag" />
+        </node>
+        <node concept="gXCZ9" id="5SQJARTsWl8" role="gyeCO">
           <node concept="gKozh" id="5SQJARTsWlc" role="Iv2U_">
             <ref role="gKozg" node="5SQJARTsWl2" resolve="listElement" />
             <node concept="2lbLXz" id="1UvZxkYAuYH" role="3f5NQZ">
               <property role="2lbLWm" value="7aaqmzkcjlr/custom" />
-              <node concept="2FWIk4" id="1UvZxl021mV" role="2FWIki">
+              <node concept="2FWIk4" id="4yuOb1fcuLO" role="2FWIki">
                 <ref role="2FWIk7" node="1vpfjfMgZ3N" resolve="CWCE_List" />
               </node>
             </node>
@@ -153,12 +180,14 @@
             </node>
           </node>
         </node>
+        <node concept="gX_XH" id="4yuOb1eJ_BM" role="gyeCO">
+          <node concept="3f5gP6" id="4yuOb1eJ_C3" role="Iv2U_">
+            <ref role="3f5gP5" node="1UvZxkZb$Hy" resolve="IListElements" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="gNmGs" id="1UvZxkZb$Hw" role="gNmGt" />
-    <node concept="3f4ZRK" id="1UvZxkZb$Hy" role="gNmGt">
-      <property role="TrG5h" value="IListElements" />
-    </node>
     <node concept="3f4ZRK" id="1UvZxkZb$H_" role="gNmGt">
       <property role="TrG5h" value="InterfaceWithList" />
       <node concept="gXCZ9" id="1UvZxkZb$HC" role="2YAOa">
@@ -232,6 +261,39 @@
         </node>
         <node concept="2iRfu4" id="1vpfjfMgZ3w" role="2iSdaV" />
       </node>
+      <node concept="3EZMnI" id="6hE5InXEe7T" role="3EZMnx">
+        <node concept="VPM3Z" id="6hE5InXEe7U" role="3F10Kt" />
+        <node concept="3F0ifn" id="6hE5InXEe7V" role="3EZMnx">
+          <property role="3F0ifm" value="Impl:" />
+        </node>
+        <node concept="2Dr8O7" id="6hE5InXGDqU" role="3EZMnx">
+          <ref role="2DlV$W" to="tpck:h0TrG11" resolve="name" />
+        </node>
+        <node concept="2iRfu4" id="6hE5InXEe7Y" role="2iSdaV" />
+      </node>
+      <node concept="3EZMnI" id="6hE5InXKjwE" role="3EZMnx">
+        <node concept="VPM3Z" id="6hE5InXKjwF" role="3F10Kt" />
+        <node concept="3F0ifn" id="6hE5InXKjwG" role="3EZMnx">
+          <property role="3F0ifm" value="CExt:" />
+        </node>
+        <node concept="2Dr8O7" id="6hE5InXKjwN" role="3EZMnx">
+          <ref role="2DlV$W" to="tpck:hnGE5uv" resolve="virtualPackage" />
+        </node>
+        <node concept="2iRfu4" id="6hE5InXKjwI" role="2iSdaV" />
+      </node>
+      <node concept="3EZMnI" id="4yuOb1eJ_BT" role="3EZMnx">
+        <node concept="VPM3Z" id="4yuOb1eJ_BV" role="3F10Kt" />
+        <node concept="3F0ifn" id="4yuOb1eJ_BZ" role="3EZMnx">
+          <property role="3F0ifm" value="Opti:" />
+        </node>
+        <node concept="684Ib" id="4yuOb1eYuwx" role="3EZMnx">
+          <ref role="680mI" node="4yuOb1eJ_C3" />
+        </node>
+        <node concept="2iRfu4" id="4yuOb1eJ_BY" role="2iSdaV" />
+      </node>
+      <node concept="2FWIk4" id="4yuOb1fhKx0" role="3EZMnx">
+        <ref role="2FWIk7" node="1vpfjfMgZ3N" resolve="CWCE_List" />
+      </node>
       <node concept="2iRkQZ" id="1vpfjfMgZ3b" role="2iSdaV" />
     </node>
   </node>
diff --git a/code/solutions/de.pes.metabnf.utils/models/de.pes.metabnf.utils.utils.mps b/code/solutions/de.pes.metabnf.utils/models/de.pes.metabnf.utils.utils.mps
index b583935..8772299 100644
--- a/code/solutions/de.pes.metabnf.utils/models/de.pes.metabnf.utils.utils.mps
+++ b/code/solutions/de.pes.metabnf.utils/models/de.pes.metabnf.utils.utils.mps
@@ -363,7 +363,7 @@
           </node>
         </node>
       </node>
-      <node concept="3Tm6S6" id="39om$43d_uY" role="1B3o_S" />
+      <node concept="3Tm1VV" id="3BSsKSf8L1J" role="1B3o_S" />
       <node concept="H_c77" id="39om$43dAnB" role="3clF45" />
       <node concept="37vLTG" id="39om$43dBWY" role="3clF46">
         <property role="TrG5h" value="model" />
@@ -386,7 +386,7 @@
           </node>
         </node>
       </node>
-      <node concept="3Tm6S6" id="39om$43PEuD" role="1B3o_S" />
+      <node concept="3Tm1VV" id="3BSsKSf8Ime" role="1B3o_S" />
       <node concept="H_c77" id="39om$43PEuE" role="3clF45" />
       <node concept="37vLTG" id="39om$43PEuF" role="3clF46">
         <property role="TrG5h" value="model" />
@@ -409,7 +409,7 @@
           </node>
         </node>
       </node>
-      <node concept="3Tm6S6" id="7LcVVIPNYBN" role="1B3o_S" />
+      <node concept="3Tm1VV" id="3BSsKSf8NHg" role="1B3o_S" />
       <node concept="H_c77" id="7LcVVIPNnn$" role="3clF45" />
       <node concept="37vLTG" id="7LcVVIPNnn_" role="3clF46">
         <property role="TrG5h" value="model" />