diff --git a/code/celllayout/languages/de.itemis.mps.editor.celllayout/generator/template/main@generator.mps b/code/celllayout/languages/de.itemis.mps.editor.celllayout/generator/template/main@generator.mps
index edfd49fe0e..5f144c2b23 100644
--- a/code/celllayout/languages/de.itemis.mps.editor.celllayout/generator/template/main@generator.mps
+++ b/code/celllayout/languages/de.itemis.mps.editor.celllayout/generator/template/main@generator.mps
@@ -19,6 +19,7 @@
     <import index="xggr" ref="r:12584d60-2d80-4ca9-9c6e-b79d499da0cf(de.itemis.mps.editor.celllayout.layout)" />
     <import index="qxi4" ref="r:45c19b6d-dd9a-4f15-973f-0267c5e76303(de.itemis.mps.editor.celllayout.runtime)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="nivk" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.descriptor(MPS.Editor/)" />
     <import index="pvux" ref="r:bb8c05bc-4758-44fe-b1ab-f9faa5a73d31(de.itemis.mps.editor.celllayout.structure)" implicit="true" />
     <import index="hy9h" ref="r:131747d1-61c1-40bf-8a0d-f19908d3d142(de.itemis.mps.editor.celllayout.behavior)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
@@ -59,7 +60,10 @@
         <child id="1070534934091" name="type" index="10QFUM" />
         <child id="1070534934092" name="expression" index="10QFUP" />
       </concept>
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
+        <child id="1095933932569" name="implementedInterface" index="EKbjA" />
+      </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -93,7 +97,6 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
-      <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
@@ -550,11 +553,8 @@
     <ref role="3gUMe" to="pvux:43ViAfTrykj" resolve="HorizontalLineCell" />
     <node concept="312cEu" id="fXNkb_1" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
-      <node concept="3clFbW" id="3NbAIGiCiyP" role="jymVt">
-        <node concept="3cqZAl" id="3NbAIGiCiyQ" role="3clF45" />
-        <node concept="3Tm1VV" id="3NbAIGiCiyR" role="1B3o_S" />
-        <node concept="3clFbS" id="3NbAIGiCiyS" role="3clF47" />
-      </node>
+      <property role="1sVAO0" value="true" />
+      <node concept="2tJIrI" id="3AHmCKdDKt9" role="jymVt" />
       <node concept="3clFb_" id="fXNkb_2" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5Hr2i_R0JJb" role="3clF45">
@@ -567,11 +567,11 @@
               <node concept="2ShNRf" id="hDIBphp" role="33vP2m">
                 <node concept="1pGfFk" id="hDIBphr" role="2ShVmc">
                   <ref role="37wK5l" to="mc8f:4U82Y3yZF0a" resolve="HorizontalLineCell" />
-                  <node concept="37vLTw" id="2BHiRxgm72F" role="37wK5m">
-                    <ref role="3cqZAo" node="fXNkb_a" resolve="editorContext" />
+                  <node concept="1rXfSq" id="3AHmCKdDNf6" role="37wK5m">
+                    <ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getEditorContext()" resolve="getEditorContext" />
                   </node>
-                  <node concept="37vLTw" id="2BHiRxgm6mP" role="37wK5m">
-                    <ref role="3cqZAo" node="fXNkb_c" resolve="node" />
+                  <node concept="1rXfSq" id="3AHmCKdDNss" role="37wK5m">
+                    <ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getNode()" resolve="getNode" />
                   </node>
                 </node>
               </node>
@@ -609,20 +609,10 @@
             </node>
           </node>
         </node>
-        <node concept="37vLTG" id="fXNkb_a" role="3clF46">
-          <property role="TrG5h" value="editorContext" />
-          <node concept="3uibUv" id="3aDel7vYG3y" role="1tU5fm">
-            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-          </node>
-        </node>
         <node concept="raruj" id="fXNkb_Q" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3Tm6S6" id="1y7DiaVv2W6" role="1B3o_S" />
-        <node concept="37vLTG" id="fXNkb_c" role="3clF46">
-          <property role="TrG5h" value="node" />
-          <node concept="3Tqbb2" id="i2nPOD4" role="1tU5fm" />
-        </node>
         <node concept="17Uvod" id="fXNkb_R" role="lGtFl">
           <property role="2qtEX9" value="name" />
           <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -641,22 +631,7 @@
           </node>
         </node>
       </node>
-      <node concept="3clFb_" id="5KDKp$lLLi0" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
-        <node concept="3uibUv" id="5KDKp$lLLi1" role="3clF45">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-        <node concept="3clFbS" id="5KDKp$lLLi2" role="3clF47">
-          <node concept="3cpWs6" id="5KDKp$lLLi3" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLi4" role="3cqZAk" />
-          </node>
-        </node>
-        <node concept="raruj" id="5KDKp$lLLi5" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLi6" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
-        </node>
-        <node concept="3Tm6S6" id="5KDKp$lLLi7" role="1B3o_S" />
-      </node>
+      <node concept="2tJIrI" id="3AHmCKdDJXh" role="jymVt" />
       <node concept="2tJIrI" id="43ViAfTsPYC" role="jymVt">
         <node concept="raruj" id="43ViAfTsQ3d" role="lGtFl" />
         <node concept="5jKBG" id="43ViAfTsQ3o" role="lGtFl">
@@ -684,6 +659,9 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="h9B3Lp5" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKdDMzw" role="EKbjA">
+        <ref role="3uigEE" to="nivk:~EditorBuilderEnvironment" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
   <node concept="jVnub" id="43ViAfTumJT">
@@ -740,11 +718,8 @@
     <ref role="3gUMe" to="pvux:7d0q5VH9fgO" resolve="VerticalLineCell" />
     <node concept="312cEu" id="7d0q5VH9hy_" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
-      <node concept="3clFbW" id="7d0q5VH9hyA" role="jymVt">
-        <node concept="3cqZAl" id="7d0q5VH9hyB" role="3clF45" />
-        <node concept="3Tm1VV" id="7d0q5VH9hyC" role="1B3o_S" />
-        <node concept="3clFbS" id="7d0q5VH9hyD" role="3clF47" />
-      </node>
+      <property role="1sVAO0" value="true" />
+      <node concept="2tJIrI" id="3AHmCKdDXCw" role="jymVt" />
       <node concept="3clFb_" id="7d0q5VH9hyE" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="7d0q5VH9hyF" role="3clF45">
@@ -757,11 +732,11 @@
               <node concept="2ShNRf" id="7d0q5VH9hyJ" role="33vP2m">
                 <node concept="1pGfFk" id="7d0q5VH9hyK" role="2ShVmc">
                   <ref role="37wK5l" to="mc8f:7d0q5VH9zQ8" resolve="VerticalLineCell" />
-                  <node concept="37vLTw" id="7d0q5VH9hyL" role="37wK5m">
-                    <ref role="3cqZAo" node="7d0q5VH9hz0" resolve="editorContext" />
+                  <node concept="1rXfSq" id="3AHmCKdDWE2" role="37wK5m">
+                    <ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getEditorContext()" resolve="getEditorContext" />
                   </node>
-                  <node concept="37vLTw" id="7d0q5VH9hyM" role="37wK5m">
-                    <ref role="3cqZAo" node="7d0q5VH9hz4" resolve="node" />
+                  <node concept="1rXfSq" id="3AHmCKdDWPw" role="37wK5m">
+                    <ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getNode()" resolve="getNode" />
                   </node>
                 </node>
               </node>
@@ -799,20 +774,10 @@
             </node>
           </node>
         </node>
-        <node concept="37vLTG" id="7d0q5VH9hz0" role="3clF46">
-          <property role="TrG5h" value="editorContext" />
-          <node concept="3uibUv" id="7d0q5VH9hz1" role="1tU5fm">
-            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-          </node>
-        </node>
         <node concept="raruj" id="7d0q5VH9hz2" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3Tm6S6" id="7d0q5VH9hz3" role="1B3o_S" />
-        <node concept="37vLTG" id="7d0q5VH9hz4" role="3clF46">
-          <property role="TrG5h" value="node" />
-          <node concept="3Tqbb2" id="7d0q5VH9hz5" role="1tU5fm" />
-        </node>
         <node concept="17Uvod" id="7d0q5VH9hz6" role="lGtFl">
           <property role="2qtEX9" value="name" />
           <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -831,22 +796,6 @@
           </node>
         </node>
       </node>
-      <node concept="3clFb_" id="7d0q5VH9hze" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
-        <node concept="3uibUv" id="7d0q5VH9hzf" role="3clF45">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-        <node concept="3clFbS" id="7d0q5VH9hzg" role="3clF47">
-          <node concept="3cpWs6" id="7d0q5VH9hzh" role="3cqZAp">
-            <node concept="10Nm6u" id="7d0q5VH9hzi" role="3cqZAk" />
-          </node>
-        </node>
-        <node concept="raruj" id="7d0q5VH9hzj" role="lGtFl" />
-        <node concept="5jKBG" id="7d0q5VH9hzk" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
-        </node>
-        <node concept="3Tm6S6" id="7d0q5VH9hzl" role="1B3o_S" />
-      </node>
       <node concept="2tJIrI" id="7d0q5VH9hzm" role="jymVt">
         <node concept="raruj" id="7d0q5VH9hzn" role="lGtFl" />
         <node concept="5jKBG" id="7d0q5VH9hzo" role="lGtFl">
@@ -874,6 +823,9 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="7d0q5VH9hzz" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKdDVTm" role="EKbjA">
+        <ref role="3uigEE" to="nivk:~EditorBuilderEnvironment" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
   <node concept="jVnub" id="3ATi8gIpzuu">
@@ -901,11 +853,8 @@
     <ref role="3gUMe" to="pvux:3ATi8gIrB$_" resolve="TopDownLayoutCell" />
     <node concept="312cEu" id="fXNKQOH" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
-      <node concept="3clFbW" id="3NbAIGiCjbF" role="jymVt">
-        <node concept="3cqZAl" id="3NbAIGiCjbG" role="3clF45" />
-        <node concept="3Tm1VV" id="3NbAIGiCjbH" role="1B3o_S" />
-        <node concept="3clFbS" id="3NbAIGiCjbI" role="3clF47" />
-      </node>
+      <property role="1sVAO0" value="true" />
+      <node concept="2tJIrI" id="3AHmCKdDPxn" role="jymVt" />
       <node concept="3clFb_" id="fXNLFfO" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_CustomFactory" />
         <node concept="3uibUv" id="5Hr2i_R0Q0J" role="3clF45">
@@ -1107,25 +1056,47 @@
           <property role="3TUv4t" value="true" />
           <node concept="3Tqbb2" id="i2nPOFr" role="1tU5fm" />
         </node>
-        <node concept="raruj" id="fXNLFgK" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
+        <node concept="raruj" id="fXNLFgK" role="lGtFl" />
       </node>
       <node concept="3clFb_" id="5KDKp$lLLk8" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
+        <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5KDKp$lLLk9" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="3clFbS" id="5KDKp$lLLka" role="3clF47">
           <node concept="3cpWs6" id="5KDKp$lLLkb" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLkc" role="3cqZAk" />
+            <node concept="1rXfSq" id="3AHmCKdDTnf" role="3cqZAk">
+              <ref role="37wK5l" node="fXNLFfO" resolve="_cell_factory_method_CustomFactory" />
+              <node concept="1rXfSq" id="3AHmCKdDTDj" role="37wK5m">
+                <ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getEditorContext()" resolve="getEditorContext" />
+              </node>
+              <node concept="1rXfSq" id="3AHmCKdDUcI" role="37wK5m">
+                <ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getNode()" resolve="getNode" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="raruj" id="5KDKp$lLLkd" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLke" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
+        <node concept="raruj" id="5KDKp$lLLkd" role="lGtFl">
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3Tm6S6" id="5KDKp$lLLkf" role="1B3o_S" />
+        <node concept="17Uvod" id="3AHmCKdDSCH" role="lGtFl">
+          <property role="2qtEX9" value="name" />
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <node concept="3zFVjK" id="3AHmCKdDSCI" role="3zH0cK">
+            <node concept="3clFbS" id="3AHmCKdDSCJ" role="2VODD2">
+              <node concept="3clFbF" id="3AHmCKdDSQh" role="3cqZAp">
+                <node concept="2OqwBi" id="3AHmCKdDSQi" role="3clFbG">
+                  <node concept="2qgKlT" id="3AHmCKdDSQj" role="2OqNvi">
+                    <ref role="37wK5l" to="tpcb:hHfE2BD" resolve="getFactoryMethodName" />
+                    <node concept="1iwH7S" id="3AHmCKdDSQk" role="37wK5m" />
+                  </node>
+                  <node concept="30H73N" id="3AHmCKdDSQl" role="2Oq$k0" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="3clFb_" id="2af7$rtsxxN" role="jymVt">
         <property role="TrG5h" value="createChildCell" />
@@ -1161,6 +1132,9 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="h9B3Loo" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKdDQeC" role="EKbjA">
+        <ref role="3uigEE" to="nivk:~EditorBuilderEnvironment" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/generator/template/main@generator.mps b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/generator/template/main@generator.mps
index 087135fe73..aad7bfb32d 100644
--- a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/generator/template/main@generator.mps
+++ b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/generator/template/main@generator.mps
@@ -105,13 +105,11 @@
       <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="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
       <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="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
-      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
         <child id="1070534934091" name="type" index="10QFUM" />
         <child id="1070534934092" name="expression" index="10QFUP" />
@@ -1021,28 +1019,14 @@
     <ref role="3gUMe" to="91fu:59YMGDNPSQ9" resolve="PriorityInfoCell" />
     <node concept="312cEu" id="fXMA9bG" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
-      <node concept="3clFbW" id="3NbAIGiCiyi" role="jymVt">
-        <node concept="3Tm1VV" id="3NbAIGiCiyk" role="1B3o_S" />
-        <node concept="3clFbS" id="3NbAIGiCiyl" role="3clF47" />
-        <node concept="3cqZAl" id="3NbAIGiCiyj" role="3clF45" />
-      </node>
+      <node concept="2tJIrI" id="3AHmCKdDEfH" role="jymVt" />
       <node concept="3clFb_" id="fXMA9bH" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="7E4vrCMjDFs" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="raruj" id="fXMA9cx" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
-        <node concept="37vLTG" id="fXMA9bP" role="3clF46">
-          <property role="TrG5h" value="editorContext" />
-          <node concept="3uibUv" id="3aDel7vYG0Q" role="1tU5fm">
-            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="fXMA9bR" role="3clF46">
-          <property role="TrG5h" value="node" />
-          <node concept="3Tqbb2" id="i2nPOrq" role="1tU5fm" />
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3clFbS" id="fXMA9bI" role="3clF47">
           <node concept="3cpWs8" id="g0oKn6H" role="3cqZAp">
@@ -1119,22 +1103,6 @@
           </node>
         </node>
       </node>
-      <node concept="3clFb_" id="5KDKp$lLLj8" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
-        <node concept="3uibUv" id="5KDKp$lLLj9" role="3clF45">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-        <node concept="3clFbS" id="5KDKp$lLLja" role="3clF47">
-          <node concept="3cpWs6" id="5KDKp$lLLjb" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLjc" role="3cqZAk" />
-          </node>
-        </node>
-        <node concept="raruj" id="5KDKp$lLLjd" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLje" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
-        </node>
-        <node concept="3Tm6S6" id="5KDKp$lLLjf" role="1B3o_S" />
-      </node>
       <node concept="3clFb_" id="59YMGDNQu$A" role="jymVt">
         <property role="TrG5h" value="child" />
         <node concept="3uibUv" id="59YMGDNQv$4" role="3clF45">
@@ -1162,26 +1130,6 @@
           </node>
         </node>
       </node>
-      <node concept="2YIFZL" id="gFe8HAw" role="jymVt">
-        <property role="TrG5h" value="_condition_" />
-        <node concept="3Tm1VV" id="h9AO$Li" role="1B3o_S" />
-        <node concept="10P_77" id="gFe8HAx" role="3clF45" />
-        <node concept="3clFbS" id="gFe8HAy" role="3clF47">
-          <node concept="3cpWs6" id="gWJCgRB" role="3cqZAp">
-            <node concept="3clFbT" id="gWJCi0E" role="3cqZAk" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="gFe8HAz" role="3clF46">
-          <property role="TrG5h" value="node" />
-          <node concept="3Tqbb2" id="i2nPOq6" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="heimf_H" role="3clF46">
-          <property role="TrG5h" value="editorContext" />
-          <node concept="3uibUv" id="3aDel7vYG0u" role="1tU5fm">
-            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-          </node>
-        </node>
-      </node>
       <node concept="3Tm1VV" id="h9B3LmE" role="1B3o_S" />
     </node>
   </node>
@@ -1285,28 +1233,14 @@
     <ref role="3gUMe" to="91fu:1CDgnklDKZ7" resolve="DummyWrapperCell" />
     <node concept="312cEu" id="1CDgnklDLqb" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
-      <node concept="3clFbW" id="1CDgnklDLqc" role="jymVt">
-        <node concept="3Tm1VV" id="1CDgnklDLqd" role="1B3o_S" />
-        <node concept="3clFbS" id="1CDgnklDLqe" role="3clF47" />
-        <node concept="3cqZAl" id="1CDgnklDLqf" role="3clF45" />
-      </node>
+      <node concept="2tJIrI" id="3AHmCKdDHzg" role="jymVt" />
       <node concept="3clFb_" id="1CDgnklDLqg" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="1CDgnklDLqh" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="raruj" id="1CDgnklDLqi" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
-        <node concept="37vLTG" id="1CDgnklDLqj" role="3clF46">
-          <property role="TrG5h" value="editorContext" />
-          <node concept="3uibUv" id="1CDgnklDLqk" role="1tU5fm">
-            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="1CDgnklDLql" role="3clF46">
-          <property role="TrG5h" value="node" />
-          <node concept="3Tqbb2" id="1CDgnklDLqm" role="1tU5fm" />
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3clFbS" id="1CDgnklDLqn" role="3clF47">
           <node concept="3cpWs8" id="1CDgnklDLqo" role="3cqZAp">
@@ -1401,22 +1335,6 @@
           </node>
         </node>
       </node>
-      <node concept="3clFb_" id="5KDKp$lLLjg" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
-        <node concept="3uibUv" id="5KDKp$lLLjh" role="3clF45">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-        <node concept="3clFbS" id="5KDKp$lLLji" role="3clF47">
-          <node concept="3cpWs6" id="5KDKp$lLLjj" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLjk" role="3cqZAk" />
-          </node>
-        </node>
-        <node concept="raruj" id="5KDKp$lLLjl" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLjm" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
-        </node>
-        <node concept="3Tm6S6" id="5KDKp$lLLjn" role="1B3o_S" />
-      </node>
       <node concept="3clFb_" id="1CDgnklFh$Q" role="jymVt">
         <property role="TrG5h" value="child" />
         <node concept="3uibUv" id="1CDgnklFh$R" role="3clF45">
diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
index e1e4025393..2fc0161479 100644
--- a/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
+++ b/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
@@ -5059,6 +5059,7 @@
     <ref role="3gUMe" to="2qld:XBYj286mvh" resolve="CellModel_Diagram" />
     <node concept="312cEu" id="fXNkb_1" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
+      <property role="1sVAO0" value="true" />
       <node concept="312cEg" id="7L7aZ7jMxm0" role="jymVt">
         <property role="TrG5h" value="style" />
         <node concept="3uibUv" id="7L7aZ7jMvzm" role="1tU5fm">
@@ -5066,11 +5067,7 @@
         </node>
       </node>
       <node concept="2tJIrI" id="7L7aZ7jMtJ3" role="jymVt" />
-      <node concept="3clFbW" id="3NbAIGiCiyP" role="jymVt">
-        <node concept="3cqZAl" id="3NbAIGiCiyQ" role="3clF45" />
-        <node concept="3Tm1VV" id="3NbAIGiCiyR" role="1B3o_S" />
-        <node concept="3clFbS" id="3NbAIGiCiyS" role="3clF47" />
-      </node>
+      <node concept="2tJIrI" id="3AHmCKdzDPx" role="jymVt" />
       <node concept="3clFb_" id="fXNkb_2" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5Hr2i_R0JJb" role="3clF45">
@@ -8305,9 +8302,7 @@
             <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
           </node>
         </node>
-        <node concept="raruj" id="fXNkb_Q" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
+        <node concept="raruj" id="fXNkb_Q" role="lGtFl" />
         <node concept="3Tm6S6" id="1y7DiaVv2W6" role="1B3o_S" />
         <node concept="37vLTG" id="fXNkb_c" role="3clF46">
           <property role="TrG5h" value="node" />
@@ -8334,20 +8329,44 @@
       </node>
       <node concept="2tJIrI" id="6W4SFvZYGT2" role="jymVt" />
       <node concept="3clFb_" id="5KDKp$lLLig" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
+        <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5KDKp$lLLih" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="3clFbS" id="5KDKp$lLLii" role="3clF47">
           <node concept="3cpWs6" id="5KDKp$lLLij" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLik" role="3cqZAk" />
+            <node concept="1rXfSq" id="3AHmCKdzVSh" role="3cqZAk">
+              <ref role="37wK5l" node="fXNkb_2" resolve="_cell_factory_method_" />
+              <node concept="1rXfSq" id="3AHmCKdzZMu" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
+              </node>
+              <node concept="1rXfSq" id="3AHmCKd$9Mo" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="raruj" id="5KDKp$lLLil" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLim" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
+        <node concept="raruj" id="5KDKp$lLLil" role="lGtFl">
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3Tm6S6" id="5KDKp$lLLin" role="1B3o_S" />
+        <node concept="17Uvod" id="3AHmCKdzPhG" role="lGtFl">
+          <property role="2qtEX9" value="name" />
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <node concept="3zFVjK" id="3AHmCKdzPhH" role="3zH0cK">
+            <node concept="3clFbS" id="3AHmCKdzPhI" role="2VODD2">
+              <node concept="3clFbF" id="3AHmCKdzSX2" role="3cqZAp">
+                <node concept="2OqwBi" id="3AHmCKdzSX3" role="3clFbG">
+                  <node concept="30H73N" id="3AHmCKdzSX4" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="3AHmCKdzSX5" role="2OqNvi">
+                    <ref role="37wK5l" to="tpcb:hHfE2BD" resolve="getFactoryMethodName" />
+                    <node concept="1iwH7S" id="3AHmCKdzSX6" role="37wK5m" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="2tJIrI" id="3jgtgXHWKKo" role="jymVt">
         <node concept="raruj" id="3jgtgXHWM8v" role="lGtFl" />
@@ -8356,6 +8375,9 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="h9B3Lp5" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKdzuAq" role="EKbjA">
+        <ref role="3uigEE" to="qvne:6OQfiPCHBbE" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
   <node concept="13MO4I" id="5qgNcfDodo1">
@@ -8363,11 +8385,8 @@
     <ref role="3gUMe" to="2qld:5qgNcfDk8GC" resolve="CellModel_DiagramNode" />
     <node concept="312cEu" id="5qgNcfDodB3" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
-      <node concept="3clFbW" id="5qgNcfDodB4" role="jymVt">
-        <node concept="3cqZAl" id="5qgNcfDodB5" role="3clF45" />
-        <node concept="3Tm1VV" id="5qgNcfDodB6" role="1B3o_S" />
-        <node concept="3clFbS" id="5qgNcfDodB7" role="3clF47" />
-      </node>
+      <property role="1sVAO0" value="true" />
+      <node concept="2tJIrI" id="3AHmCKd_HNk" role="jymVt" />
       <node concept="3clFb_" id="5qgNcfDodB8" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5qgNcfDodB9" role="3clF45">
@@ -8525,7 +8544,7 @@
                     <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
                   </node>
                   <node concept="1rXfSq" id="5RIhRmzyAmD" role="33vP2m">
-                    <ref role="37wK5l" node="5KDKp$lLLio" resolve="newFactoryMethod" />
+                    <ref role="37wK5l" node="5KDKp$lLLio" resolve="_cell_factory_method_" />
                     <node concept="1ZhdrF" id="5RIhRmzyAmG" role="lGtFl">
                       <property role="2qtEX8" value="baseMethodDeclaration" />
                       <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
@@ -9409,9 +9428,7 @@
             <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
           </node>
         </node>
-        <node concept="raruj" id="5qgNcfDodBu" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
+        <node concept="raruj" id="5qgNcfDodBu" role="lGtFl" />
         <node concept="3Tm6S6" id="5qgNcfDodBv" role="1B3o_S" />
         <node concept="37vLTG" id="5qgNcfDodBw" role="3clF46">
           <property role="TrG5h" value="node" />
@@ -9437,18 +9454,25 @@
         </node>
       </node>
       <node concept="3clFb_" id="5KDKp$lLLio" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
+        <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5KDKp$lLLip" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="3clFbS" id="5KDKp$lLLiq" role="3clF47">
           <node concept="3cpWs6" id="5KDKp$lLLir" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLis" role="3cqZAk" />
+            <node concept="1rXfSq" id="3AHmCKd_UME" role="3cqZAk">
+              <ref role="37wK5l" node="5qgNcfDodB8" resolve="_cell_factory_method_" />
+              <node concept="1rXfSq" id="3AHmCKd_Zg$" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
+              </node>
+              <node concept="1rXfSq" id="3AHmCKdA5Uq" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="raruj" id="5KDKp$lLLit" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLiu" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
+        <node concept="raruj" id="5KDKp$lLLit" role="lGtFl">
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3Tm6S6" id="5KDKp$lLLiv" role="1B3o_S" />
       </node>
@@ -9459,6 +9483,9 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="5qgNcfDodBE" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKd_Ny7" role="EKbjA">
+        <ref role="3uigEE" to="qvne:6OQfiPCHBbE" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
   <node concept="13MO4I" id="5qgNcfDowEC">
@@ -9466,11 +9493,7 @@
     <ref role="3gUMe" to="2qld:5qgNcfDmzOv" resolve="CellModel_DiagramConnector" />
     <node concept="312cEu" id="5qgNcfDowQm" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
-      <node concept="3clFbW" id="5qgNcfDowQn" role="jymVt">
-        <node concept="3cqZAl" id="5qgNcfDowQo" role="3clF45" />
-        <node concept="3Tm1VV" id="5qgNcfDowQp" role="1B3o_S" />
-        <node concept="3clFbS" id="5qgNcfDowQq" role="3clF47" />
-      </node>
+      <property role="1sVAO0" value="true" />
       <node concept="3clFb_" id="5qgNcfDowQr" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5qgNcfDowQs" role="3clF45">
@@ -11210,9 +11233,7 @@
             <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
           </node>
         </node>
-        <node concept="raruj" id="5qgNcfDowQL" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
+        <node concept="raruj" id="5qgNcfDowQL" role="lGtFl" />
         <node concept="3Tm6S6" id="5qgNcfDowQM" role="1B3o_S" />
         <node concept="37vLTG" id="5qgNcfDowQN" role="3clF46">
           <property role="TrG5h" value="node" />
@@ -11238,20 +11259,44 @@
         </node>
       </node>
       <node concept="3clFb_" id="5KDKp$lLLiw" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
+        <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5KDKp$lLLix" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="3clFbS" id="5KDKp$lLLiy" role="3clF47">
           <node concept="3cpWs6" id="5KDKp$lLLiz" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLi$" role="3cqZAk" />
+            <node concept="1rXfSq" id="3AHmCKd_30B" role="3cqZAk">
+              <ref role="37wK5l" node="5qgNcfDowQr" resolve="_cell_factory_method_" />
+              <node concept="1rXfSq" id="3AHmCKd_aZY" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
+              </node>
+              <node concept="1rXfSq" id="3AHmCKd_hUJ" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="raruj" id="5KDKp$lLLi_" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLiA" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
+        <node concept="raruj" id="5KDKp$lLLi_" role="lGtFl">
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3Tm6S6" id="5KDKp$lLLiB" role="1B3o_S" />
+        <node concept="17Uvod" id="3AHmCKd$Xjp" role="lGtFl">
+          <property role="2qtEX9" value="name" />
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <node concept="3zFVjK" id="3AHmCKd$Xjq" role="3zH0cK">
+            <node concept="3clFbS" id="3AHmCKd$Xjr" role="2VODD2">
+              <node concept="3clFbF" id="3AHmCKd_25T" role="3cqZAp">
+                <node concept="2OqwBi" id="3AHmCKd_25U" role="3clFbG">
+                  <node concept="30H73N" id="3AHmCKd_25V" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="3AHmCKd_25W" role="2OqNvi">
+                    <ref role="37wK5l" to="tpcb:hHfE2BD" resolve="getFactoryMethodName" />
+                    <node concept="1iwH7S" id="3AHmCKd_25X" role="37wK5m" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="2tJIrI" id="3jgtgXHWO_m" role="jymVt">
         <node concept="raruj" id="3jgtgXHWO_n" role="lGtFl" />
@@ -11260,6 +11305,9 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="5qgNcfDowQX" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKd$CuF" role="EKbjA">
+        <ref role="3uigEE" to="qvne:6OQfiPCHBbE" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="6uo2fN6nz62">
@@ -11708,11 +11756,7 @@
     <ref role="3gUMe" to="2qld:3GatLR3au6A" resolve="CellModel_Compartment" />
     <node concept="312cEu" id="3GatLR3avIk" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
-      <node concept="3clFbW" id="3GatLR3avIl" role="jymVt">
-        <node concept="3cqZAl" id="3GatLR3avIm" role="3clF45" />
-        <node concept="3Tm1VV" id="3GatLR3avIn" role="1B3o_S" />
-        <node concept="3clFbS" id="3GatLR3avIo" role="3clF47" />
-      </node>
+      <property role="1sVAO0" value="true" />
       <node concept="3clFb_" id="3GatLR3avIp" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="3GatLR3avIq" role="3clF45">
@@ -11725,11 +11769,11 @@
               <node concept="2ShNRf" id="3GatLR3avIu" role="33vP2m">
                 <node concept="1pGfFk" id="3GatLR3avIv" role="2ShVmc">
                   <ref role="37wK5l" to="2o4v:3GatLR387m1" resolve="CompartmentCell" />
-                  <node concept="37vLTw" id="3GatLR3avIw" role="37wK5m">
-                    <ref role="3cqZAo" node="3GatLR3avIE" resolve="editorContext" />
+                  <node concept="1rXfSq" id="3AHmCKdz84L" role="37wK5m">
+                    <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
                   </node>
-                  <node concept="37vLTw" id="3GatLR3avIx" role="37wK5m">
-                    <ref role="3cqZAo" node="3GatLR3avII" resolve="node" />
+                  <node concept="1rXfSq" id="3AHmCKdz9fE" role="37wK5m">
+                    <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
                   </node>
                 </node>
               </node>
@@ -11767,20 +11811,10 @@
             </node>
           </node>
         </node>
-        <node concept="37vLTG" id="3GatLR3avIE" role="3clF46">
-          <property role="TrG5h" value="editorContext" />
-          <node concept="3uibUv" id="3GatLR3avIF" role="1tU5fm">
-            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-          </node>
-        </node>
         <node concept="raruj" id="3GatLR3avIG" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3Tm6S6" id="3GatLR3avIH" role="1B3o_S" />
-        <node concept="37vLTG" id="3GatLR3avII" role="3clF46">
-          <property role="TrG5h" value="node" />
-          <node concept="3Tqbb2" id="3GatLR3avIJ" role="1tU5fm" />
-        </node>
         <node concept="17Uvod" id="3GatLR3avIK" role="lGtFl">
           <property role="2qtEX9" value="name" />
           <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -11799,23 +11833,10 @@
           </node>
         </node>
       </node>
-      <node concept="3clFb_" id="5KDKp$lLLiC" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
-        <node concept="3uibUv" id="5KDKp$lLLiD" role="3clF45">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-        <node concept="3clFbS" id="5KDKp$lLLiE" role="3clF47">
-          <node concept="3cpWs6" id="5KDKp$lLLiF" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLiG" role="3cqZAk" />
-          </node>
-        </node>
-        <node concept="raruj" id="5KDKp$lLLiH" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLiI" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
-        </node>
-        <node concept="3Tm6S6" id="5KDKp$lLLiJ" role="1B3o_S" />
-      </node>
       <node concept="3Tm1VV" id="3GatLR3avIS" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKdyYLM" role="EKbjA">
+        <ref role="3uigEE" to="qvne:6OQfiPCHBbE" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
   <node concept="bUwia" id="63Tq0M97EfP">
@@ -14915,11 +14936,8 @@
     <ref role="3gUMe" to="2qld:rKHxOEoZfO" resolve="CellModel_Shape" />
     <node concept="312cEu" id="rKHxOEqZ8E" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
-      <node concept="3clFbW" id="rKHxOEqZ8F" role="jymVt">
-        <node concept="3cqZAl" id="rKHxOEqZ8G" role="3clF45" />
-        <node concept="3Tm1VV" id="rKHxOEqZ8H" role="1B3o_S" />
-        <node concept="3clFbS" id="rKHxOEqZ8I" role="3clF47" />
-      </node>
+      <property role="1sVAO0" value="true" />
+      <node concept="2tJIrI" id="3AHmCKdAdM_" role="jymVt" />
       <node concept="3clFb_" id="rKHxOEqZ8J" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="rKHxOEqZ8K" role="3clF45">
@@ -15082,9 +15100,7 @@
             <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
           </node>
         </node>
-        <node concept="raruj" id="rKHxOEqZc1" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
+        <node concept="raruj" id="rKHxOEqZc1" role="lGtFl" />
         <node concept="3Tm6S6" id="rKHxOEqZc2" role="1B3o_S" />
         <node concept="37vLTG" id="rKHxOEqZc3" role="3clF46">
           <property role="TrG5h" value="node" />
@@ -15110,22 +15126,49 @@
         </node>
       </node>
       <node concept="3clFb_" id="5KDKp$lLLiK" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
+        <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5KDKp$lLLiL" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="3clFbS" id="5KDKp$lLLiM" role="3clF47">
           <node concept="3cpWs6" id="5KDKp$lLLiN" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLiO" role="3cqZAk" />
+            <node concept="1rXfSq" id="3AHmCKdAiDx" role="3cqZAk">
+              <ref role="37wK5l" node="rKHxOEqZ8J" resolve="_cell_factory_method_" />
+              <node concept="1rXfSq" id="3AHmCKdAjSX" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
+              </node>
+              <node concept="1rXfSq" id="3AHmCKdAlkz" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="raruj" id="5KDKp$lLLiP" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLiQ" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
+        <node concept="raruj" id="5KDKp$lLLiP" role="lGtFl">
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3Tm6S6" id="5KDKp$lLLiR" role="1B3o_S" />
+        <node concept="17Uvod" id="3AHmCKdAfH9" role="lGtFl">
+          <property role="2qtEX9" value="name" />
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <node concept="3zFVjK" id="3AHmCKdAfHa" role="3zH0cK">
+            <node concept="3clFbS" id="3AHmCKdAfHb" role="2VODD2">
+              <node concept="3clFbF" id="3AHmCKdAfRp" role="3cqZAp">
+                <node concept="2OqwBi" id="3AHmCKdAfRq" role="3clFbG">
+                  <node concept="30H73N" id="3AHmCKdAfRr" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="3AHmCKdAfRs" role="2OqNvi">
+                    <ref role="37wK5l" to="tpcb:hHfE2BD" resolve="getFactoryMethodName" />
+                    <node concept="1iwH7S" id="3AHmCKdAfRt" role="37wK5m" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="3Tm1VV" id="rKHxOEqZcd" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKdAeDl" role="EKbjA">
+        <ref role="3uigEE" to="qvne:6OQfiPCHBbE" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
   <node concept="13MO4I" id="gKFhvEzRRj">
@@ -15134,11 +15177,8 @@
     <ref role="3gUMe" to="2qld:gKFhvEzf3v" resolve="CellModel_DiagramContent" />
     <node concept="312cEu" id="gKFhvEzUGa" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
-      <node concept="3clFbW" id="gKFhvEzUGb" role="jymVt">
-        <node concept="3cqZAl" id="gKFhvEzUGc" role="3clF45" />
-        <node concept="3Tm1VV" id="gKFhvEzUGd" role="1B3o_S" />
-        <node concept="3clFbS" id="gKFhvEzUGe" role="3clF47" />
-      </node>
+      <property role="1sVAO0" value="true" />
+      <node concept="2tJIrI" id="3AHmCKd_lYt" role="jymVt" />
       <node concept="3clFb_" id="gKFhvEzUGf" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="gKFhvEzUGg" role="3clF45">
@@ -15493,9 +15533,7 @@
             <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
           </node>
         </node>
-        <node concept="raruj" id="gKFhvEzUJW" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
+        <node concept="raruj" id="gKFhvEzUJW" role="lGtFl" />
         <node concept="3Tm6S6" id="gKFhvEzUJX" role="1B3o_S" />
         <node concept="37vLTG" id="gKFhvEzUJY" role="3clF46">
           <property role="TrG5h" value="node" />
@@ -15521,20 +15559,44 @@
         </node>
       </node>
       <node concept="3clFb_" id="5KDKp$lLLiS" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
+        <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5KDKp$lLLiT" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="3clFbS" id="5KDKp$lLLiU" role="3clF47">
           <node concept="3cpWs6" id="5KDKp$lLLiV" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLiW" role="3cqZAk" />
+            <node concept="1rXfSq" id="3AHmCKd_rlk" role="3cqZAk">
+              <ref role="37wK5l" node="gKFhvEzUGf" resolve="_cell_factory_method_" />
+              <node concept="1rXfSq" id="3AHmCKd_sDZ" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
+              </node>
+              <node concept="1rXfSq" id="3AHmCKd_v7i" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="raruj" id="5KDKp$lLLiX" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLiY" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
+        <node concept="raruj" id="5KDKp$lLLiX" role="lGtFl">
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3Tm6S6" id="5KDKp$lLLiZ" role="1B3o_S" />
+        <node concept="17Uvod" id="3AHmCKd_pxB" role="lGtFl">
+          <property role="2qtEX9" value="name" />
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <node concept="3zFVjK" id="3AHmCKd_pxC" role="3zH0cK">
+            <node concept="3clFbS" id="3AHmCKd_pxD" role="2VODD2">
+              <node concept="3clFbF" id="3AHmCKd_pS2" role="3cqZAp">
+                <node concept="2OqwBi" id="3AHmCKd_pS3" role="3clFbG">
+                  <node concept="30H73N" id="3AHmCKd_pS4" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="3AHmCKd_pS5" role="2OqNvi">
+                    <ref role="37wK5l" to="tpcb:hHfE2BD" resolve="getFactoryMethodName" />
+                    <node concept="1iwH7S" id="3AHmCKd_pS6" role="37wK5m" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="2tJIrI" id="3jgtgXHWSwj" role="jymVt">
         <node concept="raruj" id="3jgtgXHWSwk" role="lGtFl" />
@@ -15543,6 +15605,9 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="gKFhvEzUK8" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKd_ng4" role="EKbjA">
+        <ref role="3uigEE" to="qvne:6OQfiPCHBbE" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
   <node concept="13MO4I" id="4EOrrTBaACU">
diff --git a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime/plugin.mps b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime/plugin.mps
index e3f2e5086f..0fe7691065 100644
--- a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime/plugin.mps
+++ b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime/plugin.mps
@@ -555,7 +555,7 @@
                                   <ref role="2Gs0qQ" node="77z0Sgz0VgH" resolve="module" />
                                 </node>
                                 <node concept="liA8E" id="77z0Sgz0VgQ" role="2OqNvi">
-                                  <ref role="37wK5l" to="lui2:~SModule.getModuleReference()" resolve="getModuleReference" />
+                                  <ref role="37wK5l" to="j8aq:~ReloadableModule.getModuleReference()" resolve="getModuleReference" />
                                 </node>
                               </node>
                             </node>
@@ -631,7 +631,7 @@
                                   <ref role="2Gs0qQ" node="77z0Sgz1GzK" resolve="module" />
                                 </node>
                                 <node concept="liA8E" id="77z0Sgz1GzT" role="2OqNvi">
-                                  <ref role="37wK5l" to="lui2:~SModule.getModuleReference()" resolve="getModuleReference" />
+                                  <ref role="37wK5l" to="j8aq:~ReloadableModule.getModuleReference()" resolve="getModuleReference" />
                                 </node>
                               </node>
                             </node>
diff --git a/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/generator/template/main@generator.mps b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/generator/template/main@generator.mps
deleted file mode 100644
index f4b25241af..0000000000
--- a/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/generator/template/main@generator.mps
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:8f6d87bf-4654-418c-9c68-7759a9e9328a(de.itemis.mps.hacks.xmodelgen.generator.template.main@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports />
-  <registry>
-    <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="Pogn2S64N_">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
diff --git a/code/math/languages/de.itemis.mps.editor.math/generator/template/main@generator.mps b/code/math/languages/de.itemis.mps.editor.math/generator/template/main@generator.mps
index b60893a15a..5f3139ddde 100644
--- a/code/math/languages/de.itemis.mps.editor.math/generator/template/main@generator.mps
+++ b/code/math/languages/de.itemis.mps.editor.math/generator/template/main@generator.mps
@@ -27,6 +27,7 @@
     <import index="5ueo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.style(MPS.Editor/)" />
     <import index="19h7" ref="r:c367b380-739b-4331-a16f-a542455fc0c8(de.itemis.mps.editor.math.editor)" />
     <import index="tp27" ref="r:00000000-0000-4000-0000-011c89590303(jetbrains.mps.lang.smodel.generator.baseLanguage.template.main@generator)" />
+    <import index="nivk" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.descriptor(MPS.Editor/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
@@ -97,6 +98,8 @@
         <child id="1070534934092" name="expression" index="10QFUP" />
       </concept>
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
+        <child id="1095933932569" name="implementedInterface" index="EKbjA" />
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
@@ -752,11 +755,7 @@
     <ref role="3gUMe" to="x4fh:1lPTJf7_6lc" resolve="CellModel_MathBase" />
     <node concept="312cEu" id="fXlj2gl" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
-      <node concept="3clFbW" id="3NbAIGiCiyD" role="jymVt">
-        <node concept="3cqZAl" id="3NbAIGiCiyE" role="3clF45" />
-        <node concept="3Tm1VV" id="3NbAIGiCiyF" role="1B3o_S" />
-        <node concept="3clFbS" id="3NbAIGiCiyG" role="3clF47" />
-      </node>
+      <property role="1sVAO0" value="true" />
       <node concept="3clFb_" id="fXlmLYq" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5Hr2i_R0rUG" role="3clF45">
@@ -1770,9 +1769,7 @@
           <property role="TrG5h" value="node" />
           <node concept="3Tqbb2" id="i2nPODI" role="1tU5fm" />
         </node>
-        <node concept="raruj" id="fXlobIe" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
+        <node concept="raruj" id="fXlobIe" role="lGtFl" />
         <node concept="17Uvod" id="fXlobIf" role="lGtFl">
           <property role="2qtEX9" value="name" />
           <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -1793,22 +1790,49 @@
         <node concept="3Tm6S6" id="1y7DiaVv2W2" role="1B3o_S" />
       </node>
       <node concept="3clFb_" id="5KDKp$lLLj0" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
+        <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5KDKp$lLLj1" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="3clFbS" id="5KDKp$lLLj2" role="3clF47">
           <node concept="3cpWs6" id="5KDKp$lLLj3" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLj4" role="3cqZAk" />
+            <node concept="1rXfSq" id="3AHmCKdCoB4" role="3cqZAk">
+              <ref role="37wK5l" node="fXlmLYq" resolve="_cell_factory_method_" />
+              <node concept="1rXfSq" id="3AHmCKdCsBw" role="37wK5m">
+                <ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getEditorContext()" resolve="getEditorContext" />
+              </node>
+              <node concept="1rXfSq" id="3AHmCKdC$$X" role="37wK5m">
+                <ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getNode()" resolve="getNode" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="raruj" id="5KDKp$lLLj5" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLj6" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
+        <node concept="raruj" id="5KDKp$lLLj5" role="lGtFl">
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3Tm6S6" id="5KDKp$lLLj7" role="1B3o_S" />
+        <node concept="17Uvod" id="3AHmCKdCkGz" role="lGtFl">
+          <property role="2qtEX9" value="name" />
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <node concept="3zFVjK" id="3AHmCKdCkG$" role="3zH0cK">
+            <node concept="3clFbS" id="3AHmCKdCkG_" role="2VODD2">
+              <node concept="3clFbF" id="3AHmCKdCnUz" role="3cqZAp">
+                <node concept="2OqwBi" id="3AHmCKdCnU$" role="3clFbG">
+                  <node concept="30H73N" id="3AHmCKdCnU_" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="3AHmCKdCnUA" role="2OqNvi">
+                    <ref role="37wK5l" to="tpcb:hHfE2BD" resolve="getFactoryMethodName" />
+                    <node concept="1iwH7S" id="3AHmCKdCnUB" role="37wK5m" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="3Tm1VV" id="h9B3Lmg" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKdBVDl" role="EKbjA">
+        <ref role="3uigEE" to="nivk:~EditorBuilderEnvironment" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
   <node concept="13MO4I" id="5ajRFTcx5KO">
diff --git a/code/multiline/languages/multiline/generator/template/main@generator.mps b/code/multiline/languages/multiline/generator/template/main@generator.mps
index 47bfb0936b..9f5e8316ec 100644
--- a/code/multiline/languages/multiline/generator/template/main@generator.mps
+++ b/code/multiline/languages/multiline/generator/template/main@generator.mps
@@ -393,7 +393,7 @@
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="raruj" id="g_CeiMW" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3clFbS" id="g_CeiMh" role="3clF47">
           <node concept="3clFbF" id="5BSUddgtaMT" role="3cqZAp">
@@ -471,8 +471,8 @@
                     <node concept="2ShNRf" id="5BSUddgtpcq" role="37wK5m">
                       <node concept="1pGfFk" id="5BSUddgtBcI" role="2ShVmc">
                         <ref role="37wK5l" to="uddc:~SPropertyInfo.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.language.SProperty)" resolve="SPropertyInfo" />
-                        <node concept="37vLTw" id="5BSUddgtED5" role="37wK5m">
-                          <ref role="3cqZAo" node="g_CeiMe" resolve="node" />
+                        <node concept="1rXfSq" id="3AHmCKdDfGw" role="37wK5m">
+                          <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
                         </node>
                         <node concept="37vLTw" id="5BSUddgtEFq" role="37wK5m">
                           <ref role="3cqZAo" node="6J9VvZhUtHv" resolve="property" />
@@ -488,14 +488,14 @@
                   <node concept="2ShNRf" id="55my_QL13JR" role="33vP2m">
                     <node concept="1pGfFk" id="55my_QL18tH" role="2ShVmc">
                       <ref role="37wK5l" to="61on:7Pi_Fu5RH9k" resolve="MultilineCellProvider" />
-                      <node concept="37vLTw" id="55my_QL1cxi" role="37wK5m">
-                        <ref role="3cqZAo" node="g_CeiMe" resolve="node" />
+                      <node concept="1rXfSq" id="3AHmCKdDgnt" role="37wK5m">
+                        <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
                       </node>
                       <node concept="37vLTw" id="5KpU9QZzrOR" role="37wK5m">
                         <ref role="3cqZAo" node="6J9VvZhUtHv" resolve="property" />
                       </node>
-                      <node concept="37vLTw" id="55my_QL1iU8" role="37wK5m">
-                        <ref role="3cqZAo" node="g_CeiMc" resolve="editorContext" />
+                      <node concept="1rXfSq" id="3AHmCKdDh27" role="37wK5m">
+                        <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
                       </node>
                     </node>
                   </node>
@@ -719,8 +719,8 @@
                     </node>
                     <node concept="liA8E" id="3dYY$_sKB2f" role="2OqNvi">
                       <ref role="37wK5l" to="exr9:~AbstractCellProvider.createEditorCell(jetbrains.mps.openapi.editor.EditorContext)" resolve="createEditorCell" />
-                      <node concept="37vLTw" id="1rfeXz7xt85" role="37wK5m">
-                        <ref role="3cqZAo" node="g_CeiMc" resolve="editorContext" />
+                      <node concept="1rXfSq" id="3AHmCKdDhLd" role="37wK5m">
+                        <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
                       </node>
                     </node>
                   </node>
@@ -781,8 +781,8 @@
                       </node>
                       <node concept="1pGfFk" id="2csR5Duk0Cx" role="2ShVmc">
                         <ref role="37wK5l" to="6lvu:~CompositeSubstituteInfo.&lt;init&gt;(jetbrains.mps.openapi.editor.EditorContext,jetbrains.mps.nodeEditor.cellMenu.CellContext,jetbrains.mps.nodeEditor.cellMenu.SubstituteInfoPartExt[])" resolve="CompositeSubstituteInfo" />
-                        <node concept="37vLTw" id="1rfeXz7xtb9" role="37wK5m">
-                          <ref role="3cqZAo" node="g_CeiMc" resolve="editorContext" />
+                        <node concept="1rXfSq" id="3AHmCKdDjk_" role="37wK5m">
+                          <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
                         </node>
                         <node concept="2OqwBi" id="2csR5Duk0Cz" role="37wK5m">
                           <node concept="37vLTw" id="1rfeXz7xsGX" role="2Oq$k0">
@@ -934,16 +934,6 @@
             </node>
           </node>
         </node>
-        <node concept="37vLTG" id="g_CeiMc" role="3clF46">
-          <property role="TrG5h" value="editorContext" />
-          <node concept="3uibUv" id="5kmN6mz9I9F" role="1tU5fm">
-            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="g_CeiMe" role="3clF46">
-          <property role="TrG5h" value="node" />
-          <node concept="3Tqbb2" id="i2nPODN" role="1tU5fm" />
-        </node>
         <node concept="3Tm6S6" id="1y7DiaVv33d" role="1B3o_S" />
         <node concept="17Uvod" id="g_CeiMX" role="lGtFl">
           <property role="2qtEX9" value="name" />
@@ -963,22 +953,7 @@
           </node>
         </node>
       </node>
-      <node concept="3clFb_" id="5KDKp$lLLi8" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
-        <node concept="3uibUv" id="5KDKp$lLLi9" role="3clF45">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-        <node concept="3clFbS" id="5KDKp$lLLia" role="3clF47">
-          <node concept="3cpWs6" id="5KDKp$lLLib" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLic" role="3cqZAk" />
-          </node>
-        </node>
-        <node concept="raruj" id="5KDKp$lLLid" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLie" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
-        </node>
-        <node concept="3Tm6S6" id="5KDKp$lLLif" role="1B3o_S" />
-      </node>
+      <node concept="2tJIrI" id="3AHmCKdDcvt" role="jymVt" />
       <node concept="312cEu" id="55my_QKZCYm" role="jymVt">
         <property role="TrG5h" value="CellProviderWithRoleImpl" />
         <property role="2bfB8j" value="true" />
@@ -1205,7 +1180,7 @@
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="raruj" id="1TZykZL9fo6" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3clFbS" id="1TZykZL9fo7" role="3clF47">
           <node concept="3clFbF" id="1TZykZL9fo8" role="3cqZAp">
@@ -1230,8 +1205,8 @@
                   <node concept="2YIFZM" id="1TZykZL9prn" role="33vP2m">
                     <ref role="37wK5l" to="93vl:5lTqPuSdcXj" resolve="create" />
                     <ref role="1Pybhc" to="93vl:7cgOZHrhAS_" resolve="EditorCell_Multiline" />
-                    <node concept="37vLTw" id="1TZykZL9pV7" role="37wK5m">
-                      <ref role="3cqZAo" node="1TZykZL9frJ" resolve="editorContext" />
+                    <node concept="1rXfSq" id="3AHmCKdD88w" role="37wK5m">
+                      <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
                     </node>
                     <node concept="2ShNRf" id="1TZykZL9qLt" role="37wK5m">
                       <node concept="1pGfFk" id="1TZykZL9Gxd" role="2ShVmc">
@@ -1264,8 +1239,8 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="37vLTw" id="1TZykZL9IJh" role="37wK5m">
-                      <ref role="3cqZAo" node="1TZykZL9frL" resolve="node" />
+                    <node concept="1rXfSq" id="3AHmCKdD8qS" role="37wK5m">
+                      <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
                     </node>
                   </node>
                 </node>
@@ -1359,16 +1334,6 @@
             </node>
           </node>
         </node>
-        <node concept="37vLTG" id="1TZykZL9frJ" role="3clF46">
-          <property role="TrG5h" value="editorContext" />
-          <node concept="3uibUv" id="1TZykZL9frK" role="1tU5fm">
-            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="1TZykZL9frL" role="3clF46">
-          <property role="TrG5h" value="node" />
-          <node concept="3Tqbb2" id="1TZykZL9frM" role="1tU5fm" />
-        </node>
         <node concept="3Tm6S6" id="1TZykZL9frN" role="1B3o_S" />
         <node concept="17Uvod" id="1TZykZL9frO" role="lGtFl">
           <property role="2qtEX9" value="name" />
@@ -1402,23 +1367,6 @@
         <node concept="17QB3L" id="7XmAYSGTwgd" role="3clF45" />
         <node concept="3Tm1VV" id="5_YqJ2SkYPL" role="1B3o_S" />
       </node>
-      <node concept="2tJIrI" id="1TZykZLatqQ" role="jymVt" />
-      <node concept="3clFb_" id="1TZykZL9frW" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
-        <node concept="3uibUv" id="1TZykZL9frX" role="3clF45">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-        <node concept="3clFbS" id="1TZykZL9frY" role="3clF47">
-          <node concept="3cpWs6" id="1TZykZL9frZ" role="3cqZAp">
-            <node concept="10Nm6u" id="1TZykZL9fs0" role="3cqZAk" />
-          </node>
-        </node>
-        <node concept="raruj" id="1TZykZL9fs1" role="lGtFl" />
-        <node concept="5jKBG" id="1TZykZL9fs2" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
-        </node>
-        <node concept="3Tm6S6" id="1TZykZL9fs3" role="1B3o_S" />
-      </node>
       <node concept="3Tm1VV" id="1TZykZL9fsU" role="1B3o_S" />
       <node concept="3uibUv" id="1TZykZL9fsV" role="1zkMxy">
         <ref role="3uigEE" to="tpc3:7GOmDNDyRby" resolve="CellFactoryContextClass" />
diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps
index 36764ac277..9e508d469b 100644
--- a/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps
+++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps
@@ -799,25 +799,15 @@
     <ref role="3gUMe" to="bbp5:5oklODadopi" resolve="CellModel_QueryList" />
     <node concept="312cEu" id="fYh_FPD" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
-      <node concept="3clFbW" id="3NbAIGiCizB" role="jymVt">
-        <node concept="3Tm1VV" id="3NbAIGiCizD" role="1B3o_S" />
-        <node concept="3cqZAl" id="3NbAIGiCizC" role="3clF45" />
-        <node concept="3clFbS" id="3NbAIGiCizE" role="3clF47" />
-      </node>
+      <property role="1sVAO0" value="true" />
+      <node concept="2tJIrI" id="3AHmCKdF0CQ" role="jymVt" />
       <node concept="3clFb_" id="fYh_FPH" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5Hr2i_R1FKr" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="raruj" id="fYh_FQ9" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
-        <node concept="37vLTG" id="fYh_FQ2" role="3clF46">
-          <property role="TrG5h" value="editorContext" />
-          <property role="3TUv4t" value="true" />
-          <node concept="3uibUv" id="5Xfm$vWHl6E" role="1tU5fm">
-            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-          </node>
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3clFbS" id="fYh_FPI" role="3clF47">
           <node concept="3clFbH" id="1WjrBsNIfyg" role="3cqZAp" />
@@ -830,11 +820,11 @@
               <node concept="2ShNRf" id="1WjrBsNI_nm" role="33vP2m">
                 <node concept="1pGfFk" id="1WjrBsNI_nn" role="2ShVmc">
                   <ref role="37wK5l" node="5vc9XxaAaFz" resolve="_context_class_.GeneratedQueryListHandler" />
-                  <node concept="37vLTw" id="1WjrBsNI_no" role="37wK5m">
-                    <ref role="3cqZAo" node="fYh_FQ2" resolve="editorContext" />
+                  <node concept="1rXfSq" id="3AHmCKdEULC" role="37wK5m">
+                    <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
                   </node>
-                  <node concept="37vLTw" id="1WjrBsNI_np" role="37wK5m">
-                    <ref role="3cqZAo" node="fYh_FQ7" resolve="node" />
+                  <node concept="1rXfSq" id="3AHmCKdEVR5" role="37wK5m">
+                    <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
                   </node>
                   <node concept="1ZhdrF" id="1WjrBsNI_nq" role="lGtFl">
                     <property role="2qtEX8" value="baseMethodDeclaration" />
@@ -1297,8 +1287,8 @@
               <node concept="liA8E" id="7vDkgomYQCW" role="2OqNvi">
                 <ref role="37wK5l" to="d2zl:7vDkgomYIqr" resolve="setOwner" />
                 <node concept="2OqwBi" id="7vDkgomYZkC" role="37wK5m">
-                  <node concept="37vLTw" id="7vDkgomYXNx" role="2Oq$k0">
-                    <ref role="3cqZAo" node="fYh_FQ7" resolve="node" />
+                  <node concept="1rXfSq" id="3AHmCKdEWYj" role="2Oq$k0">
+                    <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
                   </node>
                   <node concept="2yIwOk" id="7vDkgomZ1OU" role="2OqNvi" />
                 </node>
@@ -1695,11 +1685,6 @@
           <node concept="3clFbH" id="1WjrBsNIgqg" role="3cqZAp" />
         </node>
         <node concept="3Tm6S6" id="1y7DiaVv32S" role="1B3o_S" />
-        <node concept="37vLTG" id="fYh_FQ7" role="3clF46">
-          <property role="TrG5h" value="node" />
-          <property role="3TUv4t" value="true" />
-          <node concept="3Tqbb2" id="i2nPOA5" role="1tU5fm" />
-        </node>
         <node concept="17Uvod" id="fYh_FQa" role="lGtFl">
           <property role="2qtEX9" value="name" />
           <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -1768,44 +1753,6 @@
           </node>
         </node>
       </node>
-      <node concept="2tJIrI" id="T_6DrmSAFb" role="jymVt" />
-      <node concept="2tJIrI" id="T_6DrmPvWN" role="jymVt" />
-      <node concept="3clFb_" id="4Hw51cn4eQ7" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
-        <node concept="3uibUv" id="4Hw51cn4eQ8" role="3clF45">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-        <node concept="3clFbS" id="4Hw51cn4eQ9" role="3clF47">
-          <node concept="3cpWs6" id="4Hw51cn4eQa" role="3cqZAp">
-            <node concept="10Nm6u" id="4Hw51cn4eQb" role="3cqZAk" />
-          </node>
-        </node>
-        <node concept="raruj" id="4Hw51cn4eQc" role="lGtFl" />
-        <node concept="5jKBG" id="4Hw51cn4eQd" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
-        </node>
-        <node concept="3Tm6S6" id="4Hw51cn4eQe" role="1B3o_S" />
-      </node>
-      <node concept="2YIFZL" id="3ZqNA5Al5kX" role="jymVt">
-        <property role="TrG5h" value="_condition_" />
-        <node concept="3clFbS" id="3ZqNA5Al5kZ" role="3clF47">
-          <node concept="3cpWs6" id="3ZqNA5Al5l0" role="3cqZAp">
-            <node concept="3clFbT" id="3ZqNA5Al5l1" role="3cqZAk" />
-          </node>
-        </node>
-        <node concept="10P_77" id="3ZqNA5Al5kY" role="3clF45" />
-        <node concept="37vLTG" id="3ZqNA5Al5l2" role="3clF46">
-          <property role="TrG5h" value="node" />
-          <node concept="3Tqbb2" id="3ZqNA5Al5l3" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="3ZqNA5Al5l4" role="3clF46">
-          <property role="TrG5h" value="editorContext" />
-          <node concept="3uibUv" id="bZz9sGBt91" role="1tU5fm">
-            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="3ZqNA5Al5l8" role="1B3o_S" />
-      </node>
       <node concept="2tJIrI" id="1BXECvJW2k5" role="jymVt" />
       <node concept="312cEu" id="1BXECvJW3It" role="jymVt">
         <property role="2bfB8j" value="false" />
@@ -1972,6 +1919,9 @@
         <node concept="3Tm6S6" id="4EGFz66RwQJ" role="1B3o_S" />
       </node>
       <node concept="3Tm1VV" id="h9B3LlU" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKdESnv" role="EKbjA">
+        <ref role="3uigEE" to="qvne:6OQfiPCHBbE" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
   <node concept="13MO4I" id="heOnPBl">
@@ -4011,19 +3961,14 @@
     <ref role="3gUMe" to="bbp5:Op$R490zSx" resolve="CellModel_QueryLink" />
     <node concept="312cEu" id="g_$xYfi" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
-      <node concept="3clFbW" id="3NbAIGiCiLd" role="jymVt">
-        <node concept="3clFbS" id="3NbAIGiCiLg" role="3clF47" />
-        <node concept="3cqZAl" id="3NbAIGiCiLe" role="3clF45" />
-        <node concept="3Tm1VV" id="3NbAIGiCiLf" role="1B3o_S" />
-      </node>
+      <property role="1sVAO0" value="true" />
+      <node concept="2tJIrI" id="3AHmCKdE6rj" role="jymVt" />
       <node concept="3clFb_" id="g_CeiMb" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5Hr2i_R23Rv" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
-        <node concept="raruj" id="g_CeiMW" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
+        <node concept="raruj" id="g_CeiMW" role="lGtFl" />
         <node concept="3clFbS" id="g_CeiMh" role="3clF47">
           <node concept="3cpWs8" id="Op$R49356z" role="3cqZAp">
             <node concept="3cpWsn" id="Op$R49356$" role="3cpWs9">
@@ -4767,18 +4712,25 @@
         </node>
       </node>
       <node concept="3clFb_" id="4Hw51cn4eQf" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
+        <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="4Hw51cn4eQg" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="3clFbS" id="4Hw51cn4eQh" role="3clF47">
           <node concept="3cpWs6" id="4Hw51cn4eQi" role="3cqZAp">
-            <node concept="10Nm6u" id="4Hw51cn4eQj" role="3cqZAk" />
+            <node concept="1rXfSq" id="3AHmCKdEeDJ" role="3cqZAk">
+              <ref role="37wK5l" node="g_CeiMb" resolve="_cell_factory_method_" />
+              <node concept="1rXfSq" id="3AHmCKdEh24" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
+              </node>
+              <node concept="1rXfSq" id="3AHmCKdEiHr" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="raruj" id="4Hw51cn4eQk" role="lGtFl" />
-        <node concept="5jKBG" id="4Hw51cn4eQl" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
+        <node concept="raruj" id="4Hw51cn4eQk" role="lGtFl">
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3Tm6S6" id="4Hw51cn4eQm" role="1B3o_S" />
       </node>
@@ -4852,6 +4804,9 @@
       </node>
       <node concept="2tJIrI" id="4_$XMAvNob" role="jymVt" />
       <node concept="3Tm1VV" id="h9B3LuZ" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKdE9jg" role="EKbjA">
+        <ref role="3uigEE" to="qvne:6OQfiPCHBbE" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
   <node concept="13MO4I" id="gISvw05">
@@ -4860,22 +4815,11 @@
     <node concept="312cEu" id="gISvER$" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
       <property role="1sVAO0" value="true" />
-      <node concept="3clFbW" id="3NbAIGiCiyq" role="jymVt">
-        <node concept="3Tm1VV" id="3NbAIGiCiys" role="1B3o_S" />
-        <node concept="3clFbS" id="3NbAIGiCiyt" role="3clF47" />
-        <node concept="3cqZAl" id="3NbAIGiCiyr" role="3clF45" />
-      </node>
       <node concept="3clFb_" id="gISvER_" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5Hr2i_R0gdo" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
-        <node concept="37vLTG" id="gISvERA" role="3clF46">
-          <property role="TrG5h" value="editorContext" />
-          <node concept="3uibUv" id="3aDel7vYG0V" role="1tU5fm">
-            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-          </node>
-        </node>
         <node concept="17Uvod" id="gISvERG" role="lGtFl">
           <property role="2qtEX9" value="name" />
           <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -4894,24 +4838,9 @@
           </node>
         </node>
         <node concept="raruj" id="gISvERF" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3clFbS" id="gISvERH" role="3clF47">
-          <node concept="3cpWs8" id="gISvERN" role="3cqZAp">
-            <node concept="3cpWsn" id="gISvERO" role="3cpWs9">
-              <property role="TrG5h" value="manager" />
-              <node concept="3uibUv" id="gISvERP" role="1tU5fm">
-                <ref role="3uigEE" to="exr9:~EditorManager" resolve="EditorManager" />
-              </node>
-              <node concept="2YIFZM" id="gISvERQ" role="33vP2m">
-                <ref role="1Pybhc" to="exr9:~EditorManager" resolve="EditorManager" />
-                <ref role="37wK5l" to="exr9:~EditorManager.getInstanceFromContext(jetbrains.mps.openapi.editor.EditorContext)" resolve="getInstanceFromContext" />
-                <node concept="37vLTw" id="5iNrEKztc7E" role="37wK5m">
-                  <ref role="3cqZAo" node="gISvERA" resolve="editorContext" />
-                </node>
-              </node>
-            </node>
-          </node>
           <node concept="3cpWs8" id="gISvERS" role="3cqZAp">
             <node concept="3cpWsn" id="gISvERT" role="3cpWs9">
               <property role="TrG5h" value="editorCell" />
@@ -4921,11 +4850,11 @@
               <node concept="2YIFZM" id="6QZo_pQfR3s" role="33vP2m">
                 <ref role="37wK5l" to="g51k:~EditorCell_Collection.createIndent2(jetbrains.mps.openapi.editor.EditorContext,org.jetbrains.mps.openapi.model.SNode)" resolve="createIndent2" />
                 <ref role="1Pybhc" to="g51k:~EditorCell_Collection" resolve="EditorCell_Collection" />
-                <node concept="37vLTw" id="6QZo_pQfRna" role="37wK5m">
-                  <ref role="3cqZAo" node="gISvERA" resolve="editorContext" />
+                <node concept="1rXfSq" id="3AHmCKdDZN3" role="37wK5m">
+                  <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
                 </node>
-                <node concept="37vLTw" id="6QZo_pQfRRR" role="37wK5m">
-                  <ref role="3cqZAo" node="gISvERC" resolve="node" />
+                <node concept="1rXfSq" id="3AHmCKdDZY8" role="37wK5m">
+                  <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
                 </node>
               </node>
             </node>
@@ -4942,16 +4871,16 @@
                 </node>
                 <node concept="liA8E" id="XVuo2_R$Yw" role="2OqNvi">
                   <ref role="37wK5l" to="f4zo:~EditorCellFactory.createEditorCell(org.jetbrains.mps.openapi.model.SNode,boolean)" resolve="createEditorCell" />
-                  <node concept="37vLTw" id="XVuo2_R$Yx" role="37wK5m">
-                    <ref role="3cqZAo" node="gISvERC" resolve="node" />
+                  <node concept="1rXfSq" id="3AHmCKdE0ka" role="37wK5m">
+                    <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
                   </node>
                   <node concept="2OqwBi" id="XVuo2_R$Yy" role="37wK5m">
-                    <node concept="37vLTw" id="XVuo2_R$Yz" role="2Oq$k0">
-                      <ref role="3cqZAo" node="gISvERA" resolve="editorContext" />
-                    </node>
                     <node concept="liA8E" id="XVuo2_R$Y$" role="2OqNvi">
                       <ref role="37wK5l" to="cj4x:~EditorContext.isInspector()" resolve="isInspector" />
                     </node>
+                    <node concept="1rXfSq" id="3AHmCKdE08b" role="2Oq$k0">
+                      <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
+                    </node>
                   </node>
                 </node>
               </node>
@@ -4962,12 +4891,12 @@
               <node concept="2OqwBi" id="XVuo2_RF$b" role="2Oq$k0">
                 <node concept="2OqwBi" id="XVuo2_RF$c" role="2Oq$k0">
                   <node concept="2OqwBi" id="XVuo2_RF$d" role="2Oq$k0">
-                    <node concept="37vLTw" id="XVuo2_RF$e" role="2Oq$k0">
-                      <ref role="3cqZAo" node="gISvERA" resolve="editorContext" />
-                    </node>
                     <node concept="liA8E" id="XVuo2_RF$f" role="2OqNvi">
                       <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
                     </node>
+                    <node concept="1rXfSq" id="3AHmCKdE0Gb" role="2Oq$k0">
+                      <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
+                    </node>
                   </node>
                   <node concept="liA8E" id="XVuo2_RF$g" role="2OqNvi">
                     <ref role="37wK5l" to="cj4x:~EditorComponent.getUpdater()" resolve="getUpdater" />
@@ -5014,26 +4943,6 @@
           </node>
         </node>
         <node concept="3Tm6S6" id="1y7DiaVv2qA" role="1B3o_S" />
-        <node concept="37vLTG" id="gISvERC" role="3clF46">
-          <property role="TrG5h" value="node" />
-          <node concept="3Tqbb2" id="i2nPOyO" role="1tU5fm" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="4Hw51cn4eQn" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
-        <node concept="3uibUv" id="4Hw51cn4eQo" role="3clF45">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-        <node concept="3clFbS" id="4Hw51cn4eQp" role="3clF47">
-          <node concept="3cpWs6" id="4Hw51cn4eQq" role="3cqZAp">
-            <node concept="10Nm6u" id="4Hw51cn4eQr" role="3cqZAk" />
-          </node>
-        </node>
-        <node concept="raruj" id="4Hw51cn4eQs" role="lGtFl" />
-        <node concept="5jKBG" id="4Hw51cn4eQt" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
-        </node>
-        <node concept="3Tm6S6" id="4Hw51cn4eQu" role="1B3o_S" />
       </node>
       <node concept="3Tm1VV" id="h9B3Lqf" role="1B3o_S" />
       <node concept="3uibUv" id="6$SBfHyuoj9" role="EKbjA">
@@ -6617,19 +6526,13 @@
     <ref role="3gUMe" to="bbp5:8dI1zL1m1P" resolve="CellModel_QueryLinkList" />
     <node concept="312cEu" id="8dI1zL4tg8" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
-      <node concept="3clFbW" id="8dI1zL4tg9" role="jymVt">
-        <node concept="3Tm1VV" id="8dI1zL4tga" role="1B3o_S" />
-        <node concept="3cqZAl" id="8dI1zL4tgb" role="3clF45" />
-        <node concept="3clFbS" id="8dI1zL4tgc" role="3clF47" />
-      </node>
+      <property role="1sVAO0" value="true" />
       <node concept="3clFb_" id="8dI1zL4tgd" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="8dI1zL4tge" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
-        <node concept="raruj" id="8dI1zL4tgf" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
+        <node concept="raruj" id="8dI1zL4tgf" role="lGtFl" />
         <node concept="37vLTG" id="8dI1zL4tgg" role="3clF46">
           <property role="TrG5h" value="editorContext" />
           <node concept="3uibUv" id="8dI1zL4tgh" role="1tU5fm">
@@ -7397,20 +7300,44 @@
         </node>
       </node>
       <node concept="3clFb_" id="4Hw51cn4eQv" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
+        <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="4Hw51cn4eQw" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="3clFbS" id="4Hw51cn4eQx" role="3clF47">
           <node concept="3cpWs6" id="4Hw51cn4eQy" role="3cqZAp">
-            <node concept="10Nm6u" id="4Hw51cn4eQz" role="3cqZAk" />
+            <node concept="1rXfSq" id="3AHmCKdEx1C" role="3cqZAk">
+              <ref role="37wK5l" node="8dI1zL4tgd" resolve="_cell_factory_method_" />
+              <node concept="1rXfSq" id="3AHmCKdExOv" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
+              </node>
+              <node concept="1rXfSq" id="3AHmCKdE$A6" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="raruj" id="4Hw51cn4eQ$" role="lGtFl" />
-        <node concept="5jKBG" id="4Hw51cn4eQ_" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
+        <node concept="raruj" id="4Hw51cn4eQ$" role="lGtFl">
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3Tm6S6" id="4Hw51cn4eQA" role="1B3o_S" />
+        <node concept="17Uvod" id="3AHmCKdEoOO" role="lGtFl">
+          <property role="2qtEX9" value="name" />
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <node concept="3zFVjK" id="3AHmCKdEoOP" role="3zH0cK">
+            <node concept="3clFbS" id="3AHmCKdEoOQ" role="2VODD2">
+              <node concept="3clFbF" id="3AHmCKdEpvA" role="3cqZAp">
+                <node concept="2OqwBi" id="3AHmCKdEpvB" role="3clFbG">
+                  <node concept="30H73N" id="3AHmCKdEpvC" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="3AHmCKdEpvD" role="2OqNvi">
+                    <ref role="37wK5l" to="tpcb:hHfE2BD" resolve="getFactoryMethodName" />
+                    <node concept="1iwH7S" id="3AHmCKdEpvE" role="37wK5m" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="2YIFZL" id="8dI1zL4thX" role="jymVt">
         <property role="TrG5h" value="_condition_" />
@@ -7671,6 +7598,9 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="8dI1zL4ti7" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKdErCj" role="EKbjA">
+        <ref role="3uigEE" to="qvne:6OQfiPCHBbE" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
   <node concept="13MO4I" id="3IFXLmitKDb">
@@ -7679,18 +7609,15 @@
     <ref role="3gUMe" to="bbp5:3IFXLmit$MS" resolve="CellModel_QueryProperty" />
     <node concept="312cEu" id="3IFXLmitRht" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
-      <node concept="3clFbW" id="3IFXLmitRhu" role="jymVt">
-        <node concept="3clFbS" id="3IFXLmitRhv" role="3clF47" />
-        <node concept="3cqZAl" id="3IFXLmitRhw" role="3clF45" />
-        <node concept="3Tm1VV" id="3IFXLmitRhx" role="1B3o_S" />
-      </node>
+      <property role="1sVAO0" value="true" />
+      <node concept="2tJIrI" id="3AHmCKdF4nw" role="jymVt" />
       <node concept="3clFb_" id="3IFXLmitRhy" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="3IFXLmitRhz" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="raruj" id="3IFXLmitRh$" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3clFbS" id="3IFXLmitRh_" role="3clF47">
           <node concept="3cpWs8" id="3IFXLmitRhA" role="3cqZAp">
@@ -7773,11 +7700,11 @@
                 <node concept="37vLTw" id="3IFXLmitRi8" role="37wK5m">
                   <ref role="3cqZAo" node="3IFXLmitRhB" resolve="data" />
                 </node>
-                <node concept="37vLTw" id="3IFXLmitRi9" role="37wK5m">
-                  <ref role="3cqZAo" node="3IFXLmitRmh" resolve="node" />
+                <node concept="1rXfSq" id="3AHmCKdFc8n" role="37wK5m">
+                  <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
                 </node>
-                <node concept="37vLTw" id="3IFXLmitRia" role="37wK5m">
-                  <ref role="3cqZAo" node="3IFXLmitRmf" resolve="editorContext" />
+                <node concept="1rXfSq" id="3AHmCKdFaY1" role="37wK5m">
+                  <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
                 </node>
               </node>
             </node>
@@ -7815,8 +7742,8 @@
                   <node concept="3clFbT" id="3IFXLmiyurW" role="37wK5m">
                     <property role="3clFbU" value="true" />
                   </node>
-                  <node concept="37vLTw" id="3IFXLmiyurX" role="37wK5m">
-                    <ref role="3cqZAo" node="3IFXLmitRmf" resolve="editorContext" />
+                  <node concept="1rXfSq" id="3AHmCKdF9dX" role="37wK5m">
+                    <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
                   </node>
                 </node>
               </node>
@@ -8024,14 +7951,14 @@
               <node concept="2YIFZM" id="bZz9sGBwFL" role="33vP2m">
                 <ref role="1Pybhc" to="g51k:~EditorCell_Property" resolve="EditorCell_Property" />
                 <ref role="37wK5l" to="g51k:~EditorCell_Property.create(jetbrains.mps.openapi.editor.EditorContext,jetbrains.mps.nodeEditor.cells.ModelAccessor,org.jetbrains.mps.openapi.model.SNode)" resolve="create" />
-                <node concept="37vLTw" id="2BHiRxgm8h1" role="37wK5m">
-                  <ref role="3cqZAo" node="3IFXLmitRmf" resolve="editorContext" />
+                <node concept="1rXfSq" id="3AHmCKdF8Ju" role="37wK5m">
+                  <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
                 </node>
                 <node concept="37vLTw" id="3GM_nagTztc" role="37wK5m">
                   <ref role="3cqZAo" node="fYi5$ZY" resolve="modelAccessor" />
                 </node>
-                <node concept="37vLTw" id="2BHiRxglXOq" role="37wK5m">
-                  <ref role="3cqZAo" node="3IFXLmitRmh" resolve="node" />
+                <node concept="1rXfSq" id="3AHmCKdFcFo" role="37wK5m">
+                  <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
                 </node>
               </node>
             </node>
@@ -8101,16 +8028,6 @@
             </node>
           </node>
         </node>
-        <node concept="37vLTG" id="3IFXLmitRmf" role="3clF46">
-          <property role="TrG5h" value="editorContext" />
-          <node concept="3uibUv" id="3IFXLmitRmg" role="1tU5fm">
-            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="3IFXLmitRmh" role="3clF46">
-          <property role="TrG5h" value="node" />
-          <node concept="3Tqbb2" id="3IFXLmitRmi" role="1tU5fm" />
-        </node>
         <node concept="3Tm6S6" id="3IFXLmitRmj" role="1B3o_S" />
         <node concept="17Uvod" id="3IFXLmitRmk" role="lGtFl">
           <property role="2qtEX9" value="name" />
@@ -8130,23 +8047,10 @@
           </node>
         </node>
       </node>
-      <node concept="3clFb_" id="4Hw51cn4eQB" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
-        <node concept="3uibUv" id="4Hw51cn4eQC" role="3clF45">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-        <node concept="3clFbS" id="4Hw51cn4eQD" role="3clF47">
-          <node concept="3cpWs6" id="4Hw51cn4eQE" role="3cqZAp">
-            <node concept="10Nm6u" id="4Hw51cn4eQF" role="3cqZAk" />
-          </node>
-        </node>
-        <node concept="raruj" id="4Hw51cn4eQG" role="lGtFl" />
-        <node concept="5jKBG" id="4Hw51cn4eQH" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
-        </node>
-        <node concept="3Tm6S6" id="4Hw51cn4eQI" role="1B3o_S" />
-      </node>
       <node concept="3Tm1VV" id="3IFXLmitRn2" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKdF5zy" role="EKbjA">
+        <ref role="3uigEE" to="qvne:6OQfiPCHBbE" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
   <node concept="13MO4I" id="4EGFz671olF">
diff --git a/code/richtext/languages/de.slisson.richtext.customcell/generator/template/main@generator.mps b/code/richtext/languages/de.slisson.richtext.customcell/generator/template/main@generator.mps
index 84e6985035..e95f31a851 100644
--- a/code/richtext/languages/de.slisson.richtext.customcell/generator/template/main@generator.mps
+++ b/code/richtext/languages/de.slisson.richtext.customcell/generator/template/main@generator.mps
@@ -16,6 +16,7 @@
     <import index="5mdd" ref="r:f4f3736e-6da2-4bf6-9b34-06696f46bc70(de.slisson.mps.richtext.customcell.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="g51k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells(MPS.Editor/)" />
+    <import index="nivk" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.descriptor(MPS.Editor/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -43,7 +44,10 @@
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
+        <child id="1095933932569" name="implementedInterface" index="EKbjA" />
+      </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -77,7 +81,6 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
-      <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
@@ -88,7 +91,6 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
@@ -279,11 +281,8 @@
     <ref role="3gUMe" to="5mdd:2af7$rtrDWk" resolve="CellModel_CustomFactory" />
     <node concept="312cEu" id="fXNKQOH" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
-      <node concept="3clFbW" id="3NbAIGiCjbF" role="jymVt">
-        <node concept="3cqZAl" id="3NbAIGiCjbG" role="3clF45" />
-        <node concept="3Tm1VV" id="3NbAIGiCjbH" role="1B3o_S" />
-        <node concept="3clFbS" id="3NbAIGiCjbI" role="3clF47" />
-      </node>
+      <property role="1sVAO0" value="true" />
+      <node concept="2tJIrI" id="3AHmCKdCNea" role="jymVt" />
       <node concept="3clFb_" id="fXNLFfO" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_CustomFactory" />
         <node concept="3uibUv" id="5Hr2i_R0Q0J" role="3clF45">
@@ -517,25 +516,47 @@
           <property role="3TUv4t" value="true" />
           <node concept="3Tqbb2" id="i2nPOFr" role="1tU5fm" />
         </node>
-        <node concept="raruj" id="fXNLFgK" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
+        <node concept="raruj" id="fXNLFgK" role="lGtFl" />
       </node>
       <node concept="3clFb_" id="5KDKp$lLLk8" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
+        <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5KDKp$lLLk9" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="3clFbS" id="5KDKp$lLLka" role="3clF47">
           <node concept="3cpWs6" id="5KDKp$lLLkb" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLkc" role="3cqZAk" />
+            <node concept="1rXfSq" id="3AHmCKdCSBo" role="3cqZAk">
+              <ref role="37wK5l" node="fXNLFfO" resolve="_cell_factory_method_CustomFactory" />
+              <node concept="1rXfSq" id="3AHmCKdCSWR" role="37wK5m">
+                <ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getEditorContext()" resolve="getEditorContext" />
+              </node>
+              <node concept="1rXfSq" id="3AHmCKdCTzO" role="37wK5m">
+                <ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getNode()" resolve="getNode" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="raruj" id="5KDKp$lLLkd" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLke" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
+        <node concept="raruj" id="5KDKp$lLLkd" role="lGtFl">
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3Tm6S6" id="5KDKp$lLLkf" role="1B3o_S" />
+        <node concept="17Uvod" id="3AHmCKdCRe2" role="lGtFl">
+          <property role="2qtEX9" value="name" />
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <node concept="3zFVjK" id="3AHmCKdCRe3" role="3zH0cK">
+            <node concept="3clFbS" id="3AHmCKdCRe4" role="2VODD2">
+              <node concept="3clFbF" id="3AHmCKdCRvd" role="3cqZAp">
+                <node concept="2OqwBi" id="3AHmCKdCRve" role="3clFbG">
+                  <node concept="2qgKlT" id="3AHmCKdCRvf" role="2OqNvi">
+                    <ref role="37wK5l" to="tpcb:hHfE2BD" resolve="getFactoryMethodName" />
+                    <node concept="1iwH7S" id="3AHmCKdCRvg" role="37wK5m" />
+                  </node>
+                  <node concept="30H73N" id="3AHmCKdCRvh" role="2Oq$k0" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="3clFb_" id="2af7$rtsxxN" role="jymVt">
         <property role="TrG5h" value="createChildCell" />
@@ -571,6 +592,9 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="h9B3Loo" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKdCO7i" role="EKbjA">
+        <ref role="3uigEE" to="nivk:~EditorBuilderEnvironment" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.util/generator/template/main@generator.mps b/code/shadowmodels/languages/de.q60.mps.shadowmodels.util/generator/template/main@generator.mps
index 5aef63b898..5226fbe0f9 100644
--- a/code/shadowmodels/languages/de.q60.mps.shadowmodels.util/generator/template/main@generator.mps
+++ b/code/shadowmodels/languages/de.q60.mps.shadowmodels.util/generator/template/main@generator.mps
@@ -13,6 +13,7 @@
     <import index="g51k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells(MPS.Editor/)" />
     <import index="tpc2" ref="r:00000000-0000-4000-0000-011c8959029e(jetbrains.mps.lang.editor.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="nivk" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.descriptor(MPS.Editor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -38,7 +39,10 @@
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
+        <child id="1095933932569" name="implementedInterface" index="EKbjA" />
+      </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -72,7 +76,6 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
-      <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
@@ -80,7 +83,6 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
@@ -204,11 +206,7 @@
     <ref role="3gUMe" to="myud:2af7$rtrDWk" resolve="CellModel_CustomFactory" />
     <node concept="312cEu" id="fXNKQOH" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
-      <node concept="3clFbW" id="3NbAIGiCjbF" role="jymVt">
-        <node concept="3cqZAl" id="3NbAIGiCjbG" role="3clF45" />
-        <node concept="3Tm1VV" id="3NbAIGiCjbH" role="1B3o_S" />
-        <node concept="3clFbS" id="3NbAIGiCjbI" role="3clF47" />
-      </node>
+      <property role="1sVAO0" value="true" />
       <node concept="3clFb_" id="fXNLFfO" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_CustomFactory" />
         <node concept="3uibUv" id="5Hr2i_R0Q0J" role="3clF45">
@@ -445,25 +443,47 @@
           <property role="3TUv4t" value="true" />
           <node concept="3Tqbb2" id="i2nPOFr" role="1tU5fm" />
         </node>
-        <node concept="raruj" id="fXNLFgK" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
+        <node concept="raruj" id="fXNLFgK" role="lGtFl" />
       </node>
       <node concept="3clFb_" id="5KDKp$lLLk8" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
+        <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5KDKp$lLLk9" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="3clFbS" id="5KDKp$lLLka" role="3clF47">
           <node concept="3cpWs6" id="5KDKp$lLLkb" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLkc" role="3cqZAk" />
+            <node concept="1rXfSq" id="3AHmCKdCJZU" role="3cqZAk">
+              <ref role="37wK5l" node="fXNLFfO" resolve="_cell_factory_method_CustomFactory" />
+              <node concept="1rXfSq" id="3AHmCKdCKm7" role="37wK5m">
+                <ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getEditorContext()" resolve="getEditorContext" />
+              </node>
+              <node concept="1rXfSq" id="3AHmCKdCLEe" role="37wK5m">
+                <ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getNode()" resolve="getNode" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="raruj" id="5KDKp$lLLkd" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLke" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
+        <node concept="raruj" id="5KDKp$lLLkd" role="lGtFl">
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3Tm6S6" id="5KDKp$lLLkf" role="1B3o_S" />
+        <node concept="17Uvod" id="3AHmCKdCIkp" role="lGtFl">
+          <property role="2qtEX9" value="name" />
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <node concept="3zFVjK" id="3AHmCKdCIkq" role="3zH0cK">
+            <node concept="3clFbS" id="3AHmCKdCIkr" role="2VODD2">
+              <node concept="3clFbF" id="3AHmCKdCIzM" role="3cqZAp">
+                <node concept="2OqwBi" id="3AHmCKdCIzN" role="3clFbG">
+                  <node concept="2qgKlT" id="3AHmCKdCIzO" role="2OqNvi">
+                    <ref role="37wK5l" to="tpcb:hHfE2BD" resolve="getFactoryMethodName" />
+                    <node concept="1iwH7S" id="3AHmCKdCIzP" role="37wK5m" />
+                  </node>
+                  <node concept="30H73N" id="3AHmCKdCIzQ" role="2Oq$k0" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="3clFb_" id="2af7$rtsxxN" role="jymVt">
         <property role="TrG5h" value="createChildCell" />
@@ -499,6 +519,9 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="h9B3Loo" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKdCFor" role="EKbjA">
+        <ref role="3uigEE" to="nivk:~EditorBuilderEnvironment" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps b/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps
index 904db5f5be..c3650fb9c3 100644
--- a/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps
+++ b/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps
@@ -1376,6 +1376,7 @@
     <ref role="3gUMe" to="bnk3:1dAqnm8pvSZ" resolve="PartialTable" />
     <node concept="312cEu" id="1dAqnm8Zq8h" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
+      <property role="1sVAO0" value="true" />
       <node concept="3clFbW" id="1dAqnm8Zq8i" role="jymVt">
         <node concept="3cqZAl" id="1dAqnm8Zq8j" role="3clF45" />
         <node concept="3Tm1VV" id="1dAqnm8Zq8k" role="1B3o_S" />
@@ -1655,9 +1656,7 @@
             <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
           </node>
         </node>
-        <node concept="raruj" id="1dAqnm8Zqa$" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
+        <node concept="raruj" id="1dAqnm8Zqa$" role="lGtFl" />
         <node concept="3Tm6S6" id="1dAqnm8Zqa_" role="1B3o_S" />
         <node concept="37vLTG" id="1dAqnm8ZqaA" role="3clF46">
           <property role="TrG5h" value="node" />
@@ -1683,20 +1682,44 @@
         </node>
       </node>
       <node concept="3clFb_" id="5KDKp$lLLjC" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
+        <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5KDKp$lLLjD" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="3clFbS" id="5KDKp$lLLjE" role="3clF47">
           <node concept="3cpWs6" id="5KDKp$lLLjF" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLjG" role="3cqZAk" />
+            <node concept="1rXfSq" id="3AHmCKdyr4j" role="3cqZAk">
+              <ref role="37wK5l" node="1dAqnm8Zq8m" resolve="_cell_factory_method_" />
+              <node concept="1rXfSq" id="3AHmCKdyuSp" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
+              </node>
+              <node concept="1rXfSq" id="3AHmCKdyxVH" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="raruj" id="5KDKp$lLLjH" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLjI" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
+        <node concept="raruj" id="5KDKp$lLLjH" role="lGtFl">
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3Tm6S6" id="5KDKp$lLLjJ" role="1B3o_S" />
+        <node concept="17Uvod" id="3AHmCKdypOF" role="lGtFl">
+          <property role="2qtEX9" value="name" />
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <node concept="3zFVjK" id="3AHmCKdypOG" role="3zH0cK">
+            <node concept="3clFbS" id="3AHmCKdypOH" role="2VODD2">
+              <node concept="3clFbF" id="3AHmCKdyq2e" role="3cqZAp">
+                <node concept="2OqwBi" id="3AHmCKdyq2f" role="3clFbG">
+                  <node concept="30H73N" id="3AHmCKdyq2g" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="3AHmCKdyq2h" role="2OqNvi">
+                    <ref role="37wK5l" to="tpcb:hHfE2BD" resolve="getFactoryMethodName" />
+                    <node concept="1iwH7S" id="3AHmCKdyq2i" role="37wK5m" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="3clFb_" id="1dAqnm8ZqaK" role="jymVt">
         <property role="TrG5h" value="headerNodeFactory" />
@@ -1743,6 +1766,9 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="1dAqnm8Zqb4" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKdyt0D" role="EKbjA">
+        <ref role="3uigEE" to="qvne:6OQfiPCHBbE" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
   <node concept="13MO4I" id="1dAqnm8tX5g">
@@ -1750,6 +1776,7 @@
     <ref role="3gUMe" to="bnk3:1dAqnm8m1Em" resolve="Table" />
     <node concept="312cEu" id="1dAqnm8tX5h" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
+      <property role="1sVAO0" value="true" />
       <node concept="3clFbW" id="1dAqnm8tX5i" role="jymVt">
         <node concept="3cqZAl" id="1dAqnm8tX5j" role="3clF45" />
         <node concept="3Tm1VV" id="1dAqnm8tX5k" role="1B3o_S" />
@@ -2544,9 +2571,7 @@
             <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
           </node>
         </node>
-        <node concept="raruj" id="1dAqnm8tX5J" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
+        <node concept="raruj" id="1dAqnm8tX5J" role="lGtFl" />
         <node concept="3Tm6S6" id="1dAqnm8tX5K" role="1B3o_S" />
         <node concept="37vLTG" id="1dAqnm8tX5L" role="3clF46">
           <property role="TrG5h" value="node" />
@@ -2572,20 +2597,44 @@
         </node>
       </node>
       <node concept="3clFb_" id="5KDKp$lLLjK" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
+        <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5KDKp$lLLjL" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="3clFbS" id="5KDKp$lLLjM" role="3clF47">
           <node concept="3cpWs6" id="5KDKp$lLLjN" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLjO" role="3cqZAk" />
+            <node concept="1rXfSq" id="3AHmCKdyKKE" role="3cqZAk">
+              <ref role="37wK5l" node="1dAqnm8tX5m" resolve="_cell_factory_method_" />
+              <node concept="1rXfSq" id="3AHmCKdyMFo" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
+              </node>
+              <node concept="1rXfSq" id="3AHmCKdyS_f" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="raruj" id="5KDKp$lLLjP" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLjQ" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
+        <node concept="raruj" id="5KDKp$lLLjP" role="lGtFl">
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3Tm6S6" id="5KDKp$lLLjR" role="1B3o_S" />
+        <node concept="17Uvod" id="3AHmCKdyHTH" role="lGtFl">
+          <property role="2qtEX9" value="name" />
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <node concept="3zFVjK" id="3AHmCKdyHTI" role="3zH0cK">
+            <node concept="3clFbS" id="3AHmCKdyHTJ" role="2VODD2">
+              <node concept="3clFbF" id="3AHmCKdyILZ" role="3cqZAp">
+                <node concept="2OqwBi" id="3AHmCKdyIM0" role="3clFbG">
+                  <node concept="30H73N" id="3AHmCKdyIM1" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="3AHmCKdyIM2" role="2OqNvi">
+                    <ref role="37wK5l" to="tpcb:hHfE2BD" resolve="getFactoryMethodName" />
+                    <node concept="1iwH7S" id="3AHmCKdyIM3" role="37wK5m" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="3clFb_" id="1dAqnm8Ckh6" role="jymVt">
         <property role="TrG5h" value="headerNodeFactory" />
@@ -2632,6 +2681,9 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="1dAqnm8tX5V" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKdyC0O" role="EKbjA">
+        <ref role="3uigEE" to="qvne:6OQfiPCHBbE" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
   <node concept="13MO4I" id="1dAqnm8AYkY">
diff --git a/code/treenotation/com.mbeddr.mpsutil.treenotation/generator/template/main@generator.mps b/code/treenotation/com.mbeddr.mpsutil.treenotation/generator/template/main@generator.mps
index 812958745a..6ef341f207 100644
--- a/code/treenotation/com.mbeddr.mpsutil.treenotation/generator/template/main@generator.mps
+++ b/code/treenotation/com.mbeddr.mpsutil.treenotation/generator/template/main@generator.mps
@@ -31,6 +31,7 @@
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
     <import index="pdwk" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.core.aspects.constraints.rules.kinds(jetbrains.mps.lang.constraints.rules.runtime/)" />
     <import index="ykok" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.smodel.constraints(jetbrains.mps.lang.constraints.rules.runtime/)" />
+    <import index="nivk" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.descriptor(MPS.Editor/)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
     <import index="wvyf" ref="r:5a252772-b920-4950-9982-f2f3538e3e16(com.mbeddr.mpsutil.treenotation.behavior)" implicit="true" />
     <import index="tpcn" ref="r:00000000-0000-4000-0000-011c8959028b(jetbrains.mps.lang.structure.behavior)" implicit="true" />
@@ -96,6 +97,7 @@
       </concept>
       <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
         <child id="1095933932569" name="implementedInterface" index="EKbjA" />
       </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
@@ -1117,11 +1119,7 @@
     <ref role="3gUMe" to="hfvq:7uOgiTbtk8" resolve="TreeCell" />
     <node concept="312cEu" id="fXlj2gl" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
-      <node concept="3clFbW" id="3NbAIGiCiyD" role="jymVt">
-        <node concept="3cqZAl" id="3NbAIGiCiyE" role="3clF45" />
-        <node concept="3Tm1VV" id="3NbAIGiCiyF" role="1B3o_S" />
-        <node concept="3clFbS" id="3NbAIGiCiyG" role="3clF47" />
-      </node>
+      <property role="1sVAO0" value="true" />
       <node concept="3clFb_" id="fXlmLYq" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5Hr2i_R0rUG" role="3clF45">
@@ -1750,9 +1748,7 @@
           <property role="TrG5h" value="node" />
           <node concept="3Tqbb2" id="i2nPODI" role="1tU5fm" />
         </node>
-        <node concept="raruj" id="fXlobIe" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
+        <node concept="raruj" id="fXlobIe" role="lGtFl" />
         <node concept="17Uvod" id="fXlobIf" role="lGtFl">
           <property role="2qtEX9" value="name" />
           <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -1773,20 +1769,44 @@
         <node concept="3Tm6S6" id="1y7DiaVv2W2" role="1B3o_S" />
       </node>
       <node concept="3clFb_" id="4Hw51cn4eR7" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
+        <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="4Hw51cn4eR8" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="3clFbS" id="4Hw51cn4eR9" role="3clF47">
           <node concept="3cpWs6" id="4Hw51cn4eRa" role="3cqZAp">
-            <node concept="10Nm6u" id="4Hw51cn4eRb" role="3cqZAk" />
+            <node concept="1rXfSq" id="3AHmCKdB5Dt" role="3cqZAk">
+              <ref role="37wK5l" node="fXlmLYq" resolve="_cell_factory_method_" />
+              <node concept="1rXfSq" id="3AHmCKdBePm" role="37wK5m">
+                <ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getEditorContext()" resolve="getEditorContext" />
+              </node>
+              <node concept="1rXfSq" id="3AHmCKdBgSq" role="37wK5m">
+                <ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getNode()" resolve="getNode" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="raruj" id="4Hw51cn4eRc" role="lGtFl" />
-        <node concept="5jKBG" id="4Hw51cn4eRd" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
+        <node concept="raruj" id="4Hw51cn4eRc" role="lGtFl">
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3Tm6S6" id="4Hw51cn4eRe" role="1B3o_S" />
+        <node concept="17Uvod" id="3AHmCKdB0jC" role="lGtFl">
+          <property role="2qtEX9" value="name" />
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <node concept="3zFVjK" id="3AHmCKdB0jD" role="3zH0cK">
+            <node concept="3clFbS" id="3AHmCKdB0jE" role="2VODD2">
+              <node concept="3clFbF" id="3AHmCKdB2in" role="3cqZAp">
+                <node concept="2OqwBi" id="3AHmCKdB2io" role="3clFbG">
+                  <node concept="30H73N" id="3AHmCKdB2ip" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="3AHmCKdB2iq" role="2OqNvi">
+                    <ref role="37wK5l" to="tpcb:hHfE2BD" resolve="getFactoryMethodName" />
+                    <node concept="1iwH7S" id="3AHmCKdB2ir" role="37wK5m" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="2tJIrI" id="7uOgiTc7BV" role="jymVt">
         <node concept="raruj" id="7uOgiTc7SF" role="lGtFl" />
@@ -1897,6 +1917,9 @@
         <node concept="3Tm1VV" id="6JR7Jr70a1T" role="1B3o_S" />
       </node>
       <node concept="3Tm1VV" id="h9B3Lmg" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKdBbe9" role="EKbjA">
+        <ref role="3uigEE" to="nivk:~EditorBuilderEnvironment" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="7k8R9gKMgby">
diff --git a/code/widgets/languages/de.itemis.mps.editor.bool/generator/template/main@generator.mps b/code/widgets/languages/de.itemis.mps.editor.bool/generator/template/main@generator.mps
index d0bc980234..a4ea7c47da 100644
--- a/code/widgets/languages/de.itemis.mps.editor.bool/generator/template/main@generator.mps
+++ b/code/widgets/languages/de.itemis.mps.editor.bool/generator/template/main@generator.mps
@@ -323,7 +323,7 @@
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="raruj" id="g_CeiMW" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3clFbS" id="g_CeiMh" role="3clF47">
           <node concept="3cpWs8" id="5KpU9QZyFnQ" role="3cqZAp">
@@ -385,14 +385,14 @@
               <node concept="2ShNRf" id="55my_QL13JR" role="33vP2m">
                 <node concept="1pGfFk" id="55my_QL18tH" role="2ShVmc">
                   <ref role="37wK5l" to="hdil:4g2H4r3Ws99" resolve="CheckboxCellProvider" />
-                  <node concept="37vLTw" id="55my_QL1cxi" role="37wK5m">
-                    <ref role="3cqZAo" node="g_CeiMe" resolve="node" />
+                  <node concept="1rXfSq" id="3AHmCKdDBDw" role="37wK5m">
+                    <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
                   </node>
                   <node concept="37vLTw" id="5KpU9QZyMfy" role="37wK5m">
                     <ref role="3cqZAo" node="5KpU9QZyFnR" resolve="property" />
                   </node>
-                  <node concept="37vLTw" id="55my_QL1iU8" role="37wK5m">
-                    <ref role="3cqZAo" node="g_CeiMc" resolve="editorContext" />
+                  <node concept="1rXfSq" id="3AHmCKdD$mN" role="37wK5m">
+                    <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
                   </node>
                 </node>
               </node>
@@ -586,8 +586,8 @@
                   <node concept="2OqwBi" id="3dYY$_sKB2d" role="10QFUP">
                     <node concept="liA8E" id="3dYY$_sKB2f" role="2OqNvi">
                       <ref role="37wK5l" to="exr9:~AbstractCellProvider.createEditorCell(jetbrains.mps.openapi.editor.EditorContext)" resolve="createEditorCell" />
-                      <node concept="37vLTw" id="2BHiRxgheFY" role="37wK5m">
-                        <ref role="3cqZAo" node="g_CeiMc" resolve="editorContext" />
+                      <node concept="1rXfSq" id="3AHmCKdDA70" role="37wK5m">
+                        <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
                       </node>
                     </node>
                     <node concept="37vLTw" id="3GM_nagTtE4" role="2Oq$k0">
@@ -784,8 +784,8 @@
                   </node>
                   <node concept="1pGfFk" id="2csR5Duk0Cx" role="2ShVmc">
                     <ref role="37wK5l" to="6lvu:~CompositeSubstituteInfo.&lt;init&gt;(jetbrains.mps.openapi.editor.EditorContext,jetbrains.mps.nodeEditor.cellMenu.CellContext,jetbrains.mps.nodeEditor.cellMenu.SubstituteInfoPartExt[])" resolve="CompositeSubstituteInfo" />
-                    <node concept="37vLTw" id="2BHiRxgmKsa" role="37wK5m">
-                      <ref role="3cqZAo" node="g_CeiMc" resolve="editorContext" />
+                    <node concept="1rXfSq" id="3AHmCKdDAOq" role="37wK5m">
+                      <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
                     </node>
                     <node concept="2OqwBi" id="2csR5Duk0Cz" role="37wK5m">
                       <node concept="37vLTw" id="3GM_nagTxpJ" role="2Oq$k0">
@@ -924,16 +924,6 @@
             </node>
           </node>
         </node>
-        <node concept="37vLTG" id="g_CeiMc" role="3clF46">
-          <property role="TrG5h" value="editorContext" />
-          <node concept="3uibUv" id="3BkXqO9qb4X" role="1tU5fm">
-            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="g_CeiMe" role="3clF46">
-          <property role="TrG5h" value="node" />
-          <node concept="3Tqbb2" id="i2nPODN" role="1tU5fm" />
-        </node>
         <node concept="3Tm6S6" id="1y7DiaVv33d" role="1B3o_S" />
         <node concept="17Uvod" id="g_CeiMX" role="lGtFl">
           <property role="2qtEX9" value="name" />
@@ -953,22 +943,6 @@
           </node>
         </node>
       </node>
-      <node concept="3clFb_" id="5KDKp$lLLjS" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
-        <node concept="3uibUv" id="5KDKp$lLLjT" role="3clF45">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-        <node concept="3clFbS" id="5KDKp$lLLjU" role="3clF47">
-          <node concept="3cpWs6" id="5KDKp$lLLjV" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLjW" role="3cqZAk" />
-          </node>
-        </node>
-        <node concept="raruj" id="5KDKp$lLLjX" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLjY" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
-        </node>
-        <node concept="3Tm6S6" id="5KDKp$lLLjZ" role="1B3o_S" />
-      </node>
       <node concept="312cEu" id="55my_QKZCYm" role="jymVt">
         <property role="TrG5h" value="CellProviderWithRoleImpl" />
         <property role="2bfB8j" value="true" />
@@ -1105,7 +1079,7 @@
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="raruj" id="6bmIkNC6OcL" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3clFbS" id="6bmIkNC6OcM" role="3clF47">
           <node concept="3cpWs8" id="6J9VvZhUtHu" role="3cqZAp">
@@ -1167,14 +1141,14 @@
               <node concept="2ShNRf" id="6bmIkNC6OcP" role="33vP2m">
                 <node concept="1pGfFk" id="6bmIkNC6OcQ" role="2ShVmc">
                   <ref role="37wK5l" to="hdil:6bmIkNC7z3j" resolve="BooleanTextCellProvider" />
-                  <node concept="37vLTw" id="6bmIkNC6OcR" role="37wK5m">
-                    <ref role="3cqZAo" node="6bmIkNC6OfW" resolve="node" />
+                  <node concept="1rXfSq" id="3AHmCKdDqkt" role="37wK5m">
+                    <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
                   </node>
                   <node concept="37vLTw" id="5KpU9QZyu0_" role="37wK5m">
                     <ref role="3cqZAo" node="6J9VvZhUtHv" resolve="property" />
                   </node>
-                  <node concept="37vLTw" id="6bmIkNC6OcS" role="37wK5m">
-                    <ref role="3cqZAo" node="6bmIkNC6OfU" resolve="editorContext" />
+                  <node concept="1rXfSq" id="3AHmCKdDqWL" role="37wK5m">
+                    <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
                   </node>
                 </node>
               </node>
@@ -1421,8 +1395,8 @@
               <node concept="2OqwBi" id="6bmIkNC6Oem" role="37vLTx">
                 <node concept="liA8E" id="6bmIkNC6Oen" role="2OqNvi">
                   <ref role="37wK5l" to="hdil:6bmIkNC7z3u" resolve="createEditorCell" />
-                  <node concept="37vLTw" id="6bmIkNC6Oeo" role="37wK5m">
-                    <ref role="3cqZAo" node="6bmIkNC6OfU" resolve="editorContext" />
+                  <node concept="1rXfSq" id="3AHmCKdDrCa" role="37wK5m">
+                    <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="6bmIkNC6Oep" role="2Oq$k0">
@@ -1477,8 +1451,8 @@
                   </node>
                   <node concept="1pGfFk" id="6bmIkNC6OeK" role="2ShVmc">
                     <ref role="37wK5l" to="6lvu:~CompositeSubstituteInfo.&lt;init&gt;(jetbrains.mps.openapi.editor.EditorContext,jetbrains.mps.nodeEditor.cellMenu.CellContext,jetbrains.mps.nodeEditor.cellMenu.SubstituteInfoPartExt[])" resolve="CompositeSubstituteInfo" />
-                    <node concept="37vLTw" id="6bmIkNC6OeL" role="37wK5m">
-                      <ref role="3cqZAo" node="6bmIkNC6OfU" resolve="editorContext" />
+                    <node concept="1rXfSq" id="3AHmCKdDsfg" role="37wK5m">
+                      <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
                     </node>
                     <node concept="2OqwBi" id="6bmIkNC6OeM" role="37wK5m">
                       <node concept="37vLTw" id="6bmIkNC6OeN" role="2Oq$k0">
@@ -1617,16 +1591,6 @@
             </node>
           </node>
         </node>
-        <node concept="37vLTG" id="6bmIkNC6OfU" role="3clF46">
-          <property role="TrG5h" value="editorContext" />
-          <node concept="3uibUv" id="6bmIkNC6OfV" role="1tU5fm">
-            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="6bmIkNC6OfW" role="3clF46">
-          <property role="TrG5h" value="node" />
-          <node concept="3Tqbb2" id="6bmIkNC6OfX" role="1tU5fm" />
-        </node>
         <node concept="3Tm6S6" id="6bmIkNC6OfY" role="1B3o_S" />
         <node concept="17Uvod" id="6bmIkNC6OfZ" role="lGtFl">
           <property role="2qtEX9" value="name" />
@@ -1647,22 +1611,6 @@
         </node>
       </node>
       <node concept="2tJIrI" id="44Oik0Usut9" role="jymVt" />
-      <node concept="3clFb_" id="5KDKp$lLLk0" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
-        <node concept="3uibUv" id="5KDKp$lLLk1" role="3clF45">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-        <node concept="3clFbS" id="5KDKp$lLLk2" role="3clF47">
-          <node concept="3cpWs6" id="5KDKp$lLLk3" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLk4" role="3cqZAk" />
-          </node>
-        </node>
-        <node concept="raruj" id="5KDKp$lLLk5" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLk6" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
-        </node>
-        <node concept="3Tm6S6" id="5KDKp$lLLk7" role="1B3o_S" />
-      </node>
       <node concept="312cEu" id="6bmIkNC6Og7" role="jymVt">
         <property role="TrG5h" value="CellProviderWithRoleImpl" />
         <property role="2bfB8j" value="true" />
diff --git a/code/widgets/languages/de.itemis.mps.editor.collapsible/generator/template/main@generator.mps b/code/widgets/languages/de.itemis.mps.editor.collapsible/generator/template/main@generator.mps
index 1b49581707..604d8102fc 100644
--- a/code/widgets/languages/de.itemis.mps.editor.collapsible/generator/template/main@generator.mps
+++ b/code/widgets/languages/de.itemis.mps.editor.collapsible/generator/template/main@generator.mps
@@ -17,6 +17,7 @@
     <import index="tpe8" ref="r:00000000-0000-4000-0000-011c895902cc(jetbrains.mps.baseLanguage.generator.java.conceptFunctionDefaults@generator)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="g51k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells(MPS.Editor/)" />
+    <import index="nivk" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.descriptor(MPS.Editor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
   </imports>
@@ -47,7 +48,10 @@
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
+        <child id="1095933932569" name="implementedInterface" index="EKbjA" />
+      </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
@@ -275,6 +279,7 @@
     <ref role="3gUMe" to="o1st:48DYfEsZko6" resolve="CellModel_Collapsible" />
     <node concept="312cEu" id="fXNkb_1" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
+      <property role="1sVAO0" value="true" />
       <node concept="3clFbW" id="3NbAIGiCiyP" role="jymVt">
         <node concept="3cqZAl" id="3NbAIGiCiyQ" role="3clF45" />
         <node concept="3Tm1VV" id="3NbAIGiCiyR" role="1B3o_S" />
@@ -304,16 +309,9 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="5pN$eUoOX3r" role="3cqZAp">
-            <node concept="1rXfSq" id="5pN$eUoOX3q" role="3clFbG">
-              <ref role="37wK5l" node="fXNkb_2" resolve="_cell_factory_method_" />
-              <node concept="10Nm6u" id="5pN$eUoOX66" role="37wK5m" />
-              <node concept="10Nm6u" id="5pN$eUoOX8v" role="37wK5m" />
-            </node>
-          </node>
           <node concept="3clFbF" id="5pN$eUoOXcY" role="3cqZAp">
             <node concept="1rXfSq" id="5pN$eUoOXcW" role="3clFbG">
-              <ref role="37wK5l" node="5KDKp$lLLjw" resolve="newFactoryMethod" />
+              <ref role="37wK5l" node="5KDKp$lLLjw" resolve="_cell_factory_method_" />
             </node>
           </node>
         </node>
@@ -853,9 +851,7 @@
             <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
           </node>
         </node>
-        <node concept="raruj" id="fXNkb_Q" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
+        <node concept="raruj" id="fXNkb_Q" role="lGtFl" />
         <node concept="3Tm6S6" id="1y7DiaVv2W6" role="1B3o_S" />
         <node concept="37vLTG" id="fXNkb_c" role="3clF46">
           <property role="TrG5h" value="node" />
@@ -881,22 +877,49 @@
       </node>
       <node concept="2tJIrI" id="5pN$eUoP$xe" role="jymVt" />
       <node concept="3clFb_" id="5KDKp$lLLjw" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
+        <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5KDKp$lLLjx" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="3clFbS" id="5KDKp$lLLjy" role="3clF47">
           <node concept="3cpWs6" id="5KDKp$lLLjz" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLj$" role="3cqZAk" />
+            <node concept="1rXfSq" id="3AHmCKdASkW" role="3cqZAk">
+              <ref role="37wK5l" node="fXNkb_2" resolve="_cell_factory_method_" />
+              <node concept="1rXfSq" id="3AHmCKdATLw" role="37wK5m">
+                <ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getEditorContext()" resolve="getEditorContext" />
+              </node>
+              <node concept="1rXfSq" id="3AHmCKdAUY6" role="37wK5m">
+                <ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getNode()" resolve="getNode" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="raruj" id="5KDKp$lLLj_" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLjA" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
+        <node concept="raruj" id="5KDKp$lLLj_" role="lGtFl">
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3Tm6S6" id="5KDKp$lLLjB" role="1B3o_S" />
+        <node concept="17Uvod" id="3AHmCKdAN1U" role="lGtFl">
+          <property role="2qtEX9" value="name" />
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <node concept="3zFVjK" id="3AHmCKdAN1V" role="3zH0cK">
+            <node concept="3clFbS" id="3AHmCKdAN1W" role="2VODD2">
+              <node concept="3clFbF" id="3AHmCKdAOg6" role="3cqZAp">
+                <node concept="2OqwBi" id="3AHmCKdAOg7" role="3clFbG">
+                  <node concept="30H73N" id="3AHmCKdAOg8" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="3AHmCKdAOg9" role="2OqNvi">
+                    <ref role="37wK5l" to="tpcb:hHfE2BD" resolve="getFactoryMethodName" />
+                    <node concept="1iwH7S" id="3AHmCKdAOga" role="37wK5m" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="3Tm1VV" id="h9B3Lp5" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKdAKta" role="EKbjA">
+        <ref role="3uigEE" to="nivk:~EditorBuilderEnvironment" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/widgets/languages/de.itemis.mps.editor.dropdown/generator/template/main@generator.mps b/code/widgets/languages/de.itemis.mps.editor.dropdown/generator/template/main@generator.mps
index 9c5bfd76ea..c8339d05c4 100644
--- a/code/widgets/languages/de.itemis.mps.editor.dropdown/generator/template/main@generator.mps
+++ b/code/widgets/languages/de.itemis.mps.editor.dropdown/generator/template/main@generator.mps
@@ -12,6 +12,7 @@
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
     <import index="tpcb" ref="r:00000000-0000-4000-0000-011c89590297(jetbrains.mps.lang.editor.behavior)" />
     <import index="4dud" ref="r:2da81fb8-b6c6-47b8-8c70-4c760b6faf63(de.itemis.mps.editor.dropdown.runtime)" />
+    <import index="nivk" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.descriptor(MPS.Editor/)" />
     <import index="9b3t" ref="r:89097a7d-e3bb-45b9-bbd8-21e9e897dd54(de.itemis.mps.editor.dropdown.structure)" implicit="true" />
   </imports>
   <registry>
@@ -19,6 +20,7 @@
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
       </concept>
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -31,7 +33,10 @@
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
+        <child id="1095933932569" name="implementedInterface" index="EKbjA" />
+      </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
@@ -55,7 +60,6 @@
       <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="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
@@ -63,7 +67,6 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <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" />
@@ -72,6 +75,7 @@
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
+      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
@@ -186,19 +190,14 @@
     <ref role="3gUMe" to="9b3t:_i_acSf54w" resolve="CellModel_DropDown" />
     <node concept="312cEu" id="g_$xYfi" role="13RCb5">
       <property role="TrG5h" value="_context_class_" />
-      <node concept="3clFbW" id="3NbAIGiCiLd" role="jymVt">
-        <node concept="3clFbS" id="3NbAIGiCiLg" role="3clF47" />
-        <node concept="3cqZAl" id="3NbAIGiCiLe" role="3clF45" />
-        <node concept="3Tm1VV" id="3NbAIGiCiLf" role="1B3o_S" />
-      </node>
+      <property role="1sVAO0" value="true" />
+      <node concept="2tJIrI" id="3AHmCKdBinL" role="jymVt" />
       <node concept="3clFb_" id="g_CeiMb" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5Hr2i_R23Rv" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
-        <node concept="raruj" id="g_CeiMW" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
+        <node concept="raruj" id="g_CeiMW" role="lGtFl" />
         <node concept="3clFbS" id="g_CeiMh" role="3clF47">
           <node concept="3cpWs8" id="g_CeiMn" role="3cqZAp">
             <node concept="3cpWsn" id="g_CeiMo" role="3cpWs9">
@@ -281,22 +280,49 @@
         </node>
       </node>
       <node concept="3clFb_" id="5KDKp$lLLhS" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
+        <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5KDKp$lLLhT" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="3clFbS" id="5KDKp$lLLhU" role="3clF47">
           <node concept="3cpWs6" id="5KDKp$lLLhV" role="3cqZAp">
-            <node concept="10Nm6u" id="5KDKp$lLLhW" role="3cqZAk" />
+            <node concept="1rXfSq" id="3AHmCKdBl1q" role="3cqZAk">
+              <ref role="37wK5l" node="g_CeiMb" resolve="_cell_factory_method_" />
+              <node concept="1rXfSq" id="3AHmCKdBldm" role="37wK5m">
+                <ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getEditorContext()" resolve="getEditorContext" />
+              </node>
+              <node concept="1rXfSq" id="3AHmCKdBlub" role="37wK5m">
+                <ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getNode()" resolve="getNode" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="raruj" id="5KDKp$lLLhX" role="lGtFl" />
-        <node concept="5jKBG" id="5KDKp$lLLhY" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
+        <node concept="raruj" id="5KDKp$lLLhX" role="lGtFl">
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
         </node>
         <node concept="3Tm6S6" id="5KDKp$lLLhZ" role="1B3o_S" />
+        <node concept="17Uvod" id="3AHmCKdBk8$" role="lGtFl">
+          <property role="2qtEX9" value="name" />
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <node concept="3zFVjK" id="3AHmCKdBk8_" role="3zH0cK">
+            <node concept="3clFbS" id="3AHmCKdBk8A" role="2VODD2">
+              <node concept="3clFbF" id="3AHmCKdBkwT" role="3cqZAp">
+                <node concept="2OqwBi" id="3AHmCKdBkwU" role="3clFbG">
+                  <node concept="2qgKlT" id="3AHmCKdBkwV" role="2OqNvi">
+                    <ref role="37wK5l" to="tpcb:hHfE2BD" resolve="getFactoryMethodName" />
+                    <node concept="1iwH7S" id="3AHmCKdBkwW" role="37wK5m" />
+                  </node>
+                  <node concept="30H73N" id="3AHmCKdBkwX" role="2Oq$k0" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="3Tm1VV" id="h9B3LuZ" role="1B3o_S" />
+      <node concept="3uibUv" id="3AHmCKdBj1$" role="EKbjA">
+        <ref role="3uigEE" to="nivk:~EditorBuilderEnvironment" resolve="EditorBuilderEnvironment" />
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/widgets/languages/de.itemis.mps.editor.enumeration/generator/template/main@generator.mps b/code/widgets/languages/de.itemis.mps.editor.enumeration/generator/template/main@generator.mps
index 6b3571dce0..5d64938bf0 100644
--- a/code/widgets/languages/de.itemis.mps.editor.enumeration/generator/template/main@generator.mps
+++ b/code/widgets/languages/de.itemis.mps.editor.enumeration/generator/template/main@generator.mps
@@ -294,16 +294,13 @@
     <node concept="312cEu" id="44Oik0UpKjJ" role="13RCb5">
       <property role="1sVAO0" value="true" />
       <property role="TrG5h" value="_context_class_" />
-      <node concept="2tJIrI" id="PE3B26xaRM" role="jymVt" />
       <node concept="2tJIrI" id="44Oik0Ut6uk" role="jymVt" />
       <node concept="3clFb_" id="g_CeiMb" role="jymVt">
         <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="5Hr2i_R23Rv" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
-        <node concept="raruj" id="g_CeiMW" role="lGtFl">
-          <ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-        </node>
+        <node concept="raruj" id="g_CeiMW" role="lGtFl" />
         <node concept="3clFbS" id="g_CeiMh" role="3clF47">
           <node concept="3cpWs8" id="6J9VvZhUtHu" role="3cqZAp">
             <node concept="3cpWsn" id="6J9VvZhUtHv" role="3cpWs9">
@@ -962,19 +959,43 @@
       </node>
       <node concept="2tJIrI" id="44Oik0Uswhm" role="jymVt" />
       <node concept="3clFb_" id="44Oik0UpMXJ" role="jymVt">
-        <property role="TrG5h" value="newFactoryMethod" />
+        <property role="TrG5h" value="_cell_factory_method_" />
         <node concept="3uibUv" id="44Oik0UpNgp" role="3clF45">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="3Tm6S6" id="44Oik0UpN7x" role="1B3o_S" />
         <node concept="3clFbS" id="44Oik0UpMXN" role="3clF47">
           <node concept="3cpWs6" id="44Oik0UpOFd" role="3cqZAp">
-            <node concept="10Nm6u" id="44Oik0UpOOK" role="3cqZAk" />
+            <node concept="1rXfSq" id="3AHmCKdBAhc" role="3cqZAk">
+              <ref role="37wK5l" node="g_CeiMb" resolve="_cell_factory_method_" />
+              <node concept="1rXfSq" id="3AHmCKdBDyp" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBdf" resolve="getEditorContext" />
+              </node>
+              <node concept="1rXfSq" id="3AHmCKdBFGw" role="37wK5m">
+                <ref role="37wK5l" to="qvne:6OQfiPCHBgy" resolve="getNode" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="raruj" id="44Oik0UpOXD" role="lGtFl" />
-        <node concept="5jKBG" id="44Oik0UpPfM" role="lGtFl">
-          <ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
+        <node concept="raruj" id="44Oik0UpOXD" role="lGtFl">
+          <ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
+        </node>
+        <node concept="17Uvod" id="3AHmCKdB$Gm" role="lGtFl">
+          <property role="2qtEX9" value="name" />
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <node concept="3zFVjK" id="3AHmCKdB$Gn" role="3zH0cK">
+            <node concept="3clFbS" id="3AHmCKdB$Go" role="2VODD2">
+              <node concept="3clFbF" id="3AHmCKdB_Hv" role="3cqZAp">
+                <node concept="2OqwBi" id="3AHmCKdB_Hw" role="3clFbG">
+                  <node concept="2qgKlT" id="3AHmCKdB_Hx" role="2OqNvi">
+                    <ref role="37wK5l" to="tpcb:hHfE2BD" resolve="getFactoryMethodName" />
+                    <node concept="1iwH7S" id="3AHmCKdB_Hy" role="37wK5m" />
+                  </node>
+                  <node concept="30H73N" id="3AHmCKdB_Hz" role="2Oq$k0" />
+                </node>
+              </node>
+            </node>
+          </node>
         </node>
       </node>
       <node concept="312cEu" id="55my_QKZCYm" role="jymVt">