diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps
index e451fda0..c197ce1b 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps
@@ -2151,36 +2151,10 @@
                 </node>
               </node>
             </node>
-            <node concept="3Aq93q" id="3ZfjIHuw9dS" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="3ZfjIHuw9dT" role="3Ip0Jz">
-                <node concept="3I6s7M" id="3ZfjIHuw9dU" role="3I6sU7">
-                  <node concept="3Aqt3T" id="3ZfjIHuw9dV" role="3I6s78">
-                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
-                    <node concept="37jhX" id="3ZfjIHuw9dW" role="3AunhB">
-                      <node concept="2OqwBi" id="3ZfjIHuw9dX" role="37jj2">
-                        <node concept="3A2sRY" id="3ZfjIHuw9NP" role="2Oq$k0">
-                          <ref role="3A2yKK" node="3ZfjIHuw8Nw" resolve="gcosmb" />
-                        </node>
-                        <node concept="3TrEf2" id="3ZfjIHuw9WE" role="2OqNvi">
-                          <ref role="3Tt5mk" to="tpf3:hIk6f7o" resolve="referenceNode" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="a7P8L" id="3ZfjIHuw9e0" role="3AunhB">
-                      <ref role="a7OzE" node="3ZfjIHuw9e3" resolve="RefType" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
             <node concept="3NuqgR" id="3ZfjIHuw9e1" role="0Rg$4">
               <node concept="aZer4" id="3ZfjIHuw9e2" role="3XD1gS">
                 <property role="TrG5h" value="MsgType" />
               </node>
-              <node concept="aZer4" id="3ZfjIHuw9e3" role="3XD1gS">
-                <property role="TrG5h" value="RefType" />
-              </node>
               <node concept="32pEOW" id="3ZfjIHuw9e4" role="3vLBG7" />
             </node>
             <node concept="3xSepi" id="3ZfjIHuw9e5" role="3xSepv">
@@ -2205,32 +2179,83 @@
                   </node>
                 </node>
               </node>
-              <node concept="3Aq9E8" id="3ZfjIHuw9ek" role="3xSepj">
-                <node concept="3I6sU6" id="3ZfjIHuw9el" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="3ZfjIHuw9em" role="3I6sU7">
-                    <node concept="3Aqt3T" id="3ZfjIHuw9en" role="3I6s78">
-                      <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
-                      <node concept="a7P8L" id="3ZfjIHuw9eo" role="3AunhB">
-                        <ref role="a7OzE" node="3ZfjIHuw9e3" resolve="RefType" />
-                      </node>
-                      <node concept="ns1u0" id="3ZfjIHuw9ep" role="3AunhB">
-                        <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
-                        <node concept="nsMwS" id="3ZfjIHuw9eq" role="ns1xD">
-                          <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                          <node concept="h$QuP" id="ZNYuguK_Cc" role="iSaTp">
-                            <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7XekScWV3nP" role="3cqZAp" />
+        <node concept="3clFbJ" id="7XekScWV2Pa" role="3cqZAp">
+          <node concept="3clFbS" id="7XekScWV2Pc" role="3clFbx">
+            <node concept="1nLNNL" id="7XekScWV2Ja" role="3cqZAp">
+              <node concept="1nLNMm" id="7XekScWV2Jb" role="1nLNNK">
+                <node concept="3Aq93q" id="7XekScWV2Jl" role="1nLNMb">
+                  <property role="3ArMco" value="true" />
+                  <node concept="3I6sU6" id="7XekScWV2Jm" role="3Ip0Jz">
+                    <node concept="3I6s7M" id="7XekScWV2Jn" role="3I6sU7">
+                      <node concept="3Aqt3T" id="7XekScWV2Jo" role="3I6s78">
+                        <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                        <node concept="37jhX" id="7XekScWV2Jp" role="3AunhB">
+                          <node concept="2OqwBi" id="7XekScWV2Jq" role="37jj2">
+                            <node concept="3A2sRY" id="7XekScWV2Jr" role="2Oq$k0">
+                              <ref role="3A2yKK" node="3ZfjIHuw8Nw" resolve="gcosmb" />
+                            </node>
+                            <node concept="3TrEf2" id="7XekScWV2Js" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tpf3:hIk6f7o" resolve="referenceNode" />
+                            </node>
                           </node>
                         </node>
-                      </node>
-                      <node concept="37jhX" id="3ZfjIHuw9ew" role="3AunhB">
-                        <node concept="2YIFZM" id="3ZfjIHuw9ex" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
-                          <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
+                        <node concept="a7P8L" id="7XekScWV2Jt" role="3AunhB">
+                          <ref role="a7OzE" node="7XekScWV2Jw" resolve="RefType" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
+                <node concept="3NuqgR" id="7XekScWV2Ju" role="0Rg$4">
+                  <node concept="aZer4" id="7XekScWV2Jw" role="3XD1gS">
+                    <property role="TrG5h" value="RefType" />
+                  </node>
+                  <node concept="32pEOW" id="7XekScWV2Jx" role="3vLBG7" />
+                </node>
+                <node concept="3xSepi" id="7XekScWV2Jy" role="3xSepv">
+                  <node concept="3Aq9E8" id="7XekScWV2JF" role="3xSepj">
+                    <node concept="3I6sU6" id="7XekScWV2JG" role="3Ip0Jz">
+                      <node concept="3I6s7M" id="7XekScWV2JH" role="3I6sU7">
+                        <node concept="3Aqt3T" id="7XekScWV2JI" role="3I6s78">
+                          <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
+                          <node concept="a7P8L" id="7XekScWV2JJ" role="3AunhB">
+                            <ref role="a7OzE" node="7XekScWV2Jw" resolve="RefType" />
+                          </node>
+                          <node concept="ns1u0" id="7XekScWV2JK" role="3AunhB">
+                            <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
+                            <node concept="nsMwS" id="7XekScWV2JL" role="ns1xD">
+                              <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
+                              <node concept="h$QuP" id="7XekScWV2JM" role="iSaTp">
+                                <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="37jhX" id="7XekScWV2JN" role="3AunhB">
+                            <node concept="2YIFZM" id="7XekScWV2JO" role="37jj2">
+                              <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                              <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="7XekScWV3g3" role="3clFbw">
+            <node concept="10Nm6u" id="7XekScWV3nK" role="3uHU7w" />
+            <node concept="2OqwBi" id="7XekScWV35B" role="3uHU7B">
+              <node concept="3A2sRY" id="7XekScWV2QT" role="2Oq$k0">
+                <ref role="3A2yKK" node="3ZfjIHuw8Nw" resolve="gcosmb" />
+              </node>
+              <node concept="3TrEf2" id="7XekScWV3eM" role="2OqNvi">
+                <ref role="3Tt5mk" to="tpf3:hIk6f7o" resolve="referenceNode" />
               </node>
             </node>
           </node>