diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
index e55b86cd..50359c3d 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
@@ -16543,6 +16543,115 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="41_kb$lDhrU" role="3cqZAp" />
+        <node concept="3SKdUt" id="41_kb$lDhrW" role="3cqZAp">
+          <node concept="1PaTwC" id="41_kb$lDhrX" role="1aUNEU">
+            <node concept="3oM_SD" id="41_kb$lDhrY" role="1PaTwD">
+              <property role="3oM_SC" value="backward" />
+            </node>
+            <node concept="3oM_SD" id="41_kb$lDhs1" role="1PaTwD">
+              <property role="3oM_SC" value="pattern" />
+            </node>
+          </node>
+        </node>
+        <node concept="1nLNNL" id="41_kb$lDhqr" role="3cqZAp">
+          <node concept="1nLNMm" id="41_kb$lDhqs" role="1nLNNK">
+            <node concept="3Aq93q" id="41_kb$lDhqt" role="1nLNMb">
+              <node concept="3I6sU6" id="41_kb$lDhqu" role="3Ip0Jz">
+                <node concept="3I6s7M" id="41_kb$lDhqv" role="3I6sU7">
+                  <node concept="3Aqt3T" id="41_kb$lDhqw" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
+                    <node concept="1HFMs5" id="41_kb$lDhqx" role="3AunhB">
+                      <node concept="a7P8L" id="41_kb$lDhqy" role="1uarlU">
+                        <ref role="a7OzE" node="41_kb$lDhqF" resolve="Type" />
+                      </node>
+                      <node concept="ns1u0" id="41_kb$lDhqz" role="1uarlW">
+                        <ref role="ns1xF" node="6RzTUCTkJsT" resolve="conceptRef" />
+                        <node concept="nsMwS" id="41_kb$lDhs6" role="ns1xD">
+                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                          <node concept="a7P8L" id="41_kb$lDhsd" role="iSaTp">
+                            <ref role="a7OzE" node="41_kb$lDhqJ" resolve="Free" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1HFMs5" id="41_kb$lDhq$" role="3AunhB">
+                      <node concept="a7P8L" id="41_kb$lDhq_" role="1uarlU">
+                        <ref role="a7OzE" node="41_kb$lDhqG" resolve="Ptn" />
+                      </node>
+                      <node concept="ns1u0" id="41_kb$lDhqA" role="1uarlW">
+                        <ref role="ns1xF" node="6RzTUCTkJsT" resolve="conceptRef" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="41_kb$lDhqD" role="3AunhB">
+                      <ref role="a7OzE" node="41_kb$lDhr3" resolve="Options" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="41_kb$lDhqE" role="0Rg$4">
+              <node concept="aZer4" id="41_kb$lDhqF" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="aZer4" id="41_kb$lDhqG" role="3XD1gS">
+                <property role="TrG5h" value="Ptn" />
+              </node>
+              <node concept="32pEOW" id="41_kb$lDhqH" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="41_kb$lDhqI" role="0Rg$4">
+              <node concept="aZer4" id="41_kb$lDhqJ" role="3XD1gS">
+                <property role="TrG5h" value="Free" />
+              </node>
+              <node concept="3Tqbb2" id="41_kb$lDhqK" role="3vLBG7" />
+            </node>
+            <node concept="3Aq9_M" id="41_kb$lDhqL" role="1nLNMa">
+              <node concept="3I6sU6" id="41_kb$lDhqM" role="3Ip0Jz">
+                <node concept="3I6s7M" id="41_kb$lDhqN" role="3I6sU7">
+                  <node concept="2aLmEc" id="41_kb$lDhqO" role="3I6s78">
+                    <node concept="a7P8L" id="41_kb$lDhqP" role="2aLmnP">
+                      <ref role="a7OzE" node="41_kb$lDhqJ" resolve="Free" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3I6s7M" id="41_kb$lDhqQ" role="3I6sU7">
+                  <node concept="3A8Hvi" id="41_kb$lDhqR" role="3I6s78">
+                    <node concept="a7P8L" id="41_kb$lDhqS" role="3A8w4Q">
+                      <ref role="a7OzE" node="41_kb$lDhqG" resolve="Ptn" />
+                    </node>
+                    <node concept="a7P8L" id="41_kb$lDhqT" role="3A8wtg">
+                      <ref role="a7OzE" node="41_kb$lDhqF" resolve="Type" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3xSepi" id="41_kb$lDhqU" role="3xSepv">
+              <node concept="3Aq9E8" id="41_kb$lDhqV" role="3xSepj">
+                <node concept="3I6sU6" id="41_kb$lDhqW" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="41_kb$lDhqX" role="3I6sU7">
+                    <node concept="3A8Hvi" id="41_kb$lDhqY" role="3I6s78">
+                      <node concept="a7P8L" id="41_kb$lDhqZ" role="3A8w4Q">
+                        <ref role="a7OzE" node="41_kb$lDhqG" resolve="Ptn" />
+                      </node>
+                      <node concept="a7P8L" id="41_kb$lDhr0" role="3A8wtg">
+                        <ref role="a7OzE" node="41_kb$lDhqF" resolve="Type" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="41_kb$lDhr1" role="0Rg$4">
+              <node concept="3uibUv" id="41_kb$lDhr2" role="3vLBG7">
+                <ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="ConvertsContext.Options" />
+              </node>
+              <node concept="aZer4" id="41_kb$lDhr3" role="3XD1gS">
+                <property role="TrG5h" value="Options" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbH" id="6tm4iVtX7Ti" role="3cqZAp" />
         <node concept="3SKdUt" id="3lXUvG04azY" role="3cqZAp">
           <node concept="1PaTwC" id="3lXUvG04azZ" role="1aUNEU">
@@ -19986,14 +20095,8 @@
                       <ref role="ns1xF" to="wi9y:1oUE7CX3tx9" resolve="list" />
                       <node concept="nsMwS" id="4boCUQton_A" role="ns1xD">
                         <ref role="nsMwP" to="wi9y:1oUE7CX3Xc1" resolve="elem" />
-                        <node concept="ns1u0" id="4boCUQtonXi" role="iSaTp">
-                          <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
-                          <node concept="nsMwS" id="4boCUQtooK9" role="ns1xD">
-                            <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                            <node concept="a7P8L" id="4boCUQtooQl" role="iSaTp">
-                              <ref role="a7OzE" node="4boCUQtooul" resolve="ConceptA" />
-                            </node>
-                          </node>
+                        <node concept="a7P8L" id="41_kb$lzKAm" role="iSaTp">
+                          <ref role="a7OzE" node="4boCUQton_I" resolve="CType" />
                         </node>
                       </node>
                     </node>
@@ -20015,44 +20118,76 @@
             </node>
             <node concept="3NuqgR" id="4boCUQton_H" role="0Rg$4">
               <node concept="aZer4" id="4boCUQton_I" role="3XD1gS">
-                <property role="TrG5h" value="CType" />
+                <property role="TrG5h" value="E" />
               </node>
               <node concept="32pEOW" id="4boCUQton_J" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="4boCUQtoouk" role="0Rg$4">
               <node concept="aZer4" id="4boCUQtooul" role="3XD1gS">
-                <property role="TrG5h" value="ConceptA" />
+                <property role="TrG5h" value="EConcept" />
               </node>
               <node concept="aZer4" id="5wYq9r5ns1w" role="3XD1gS">
-                <property role="TrG5h" value="ConceptB" />
+                <property role="TrG5h" value="TrgConcept" />
               </node>
               <node concept="3Tqbb2" id="3CulEO26UxV" role="3vLBG7" />
             </node>
             <node concept="3xSepi" id="5wYq9r5nsaT" role="3xSepv">
               <node concept="3Aq9E8" id="5wYq9r5nsaU" role="3xSepj">
                 <node concept="3I6sU6" id="5wYq9r5nsaV" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="5wYq9r5nsgL" role="3I6sU7">
-                    <node concept="3Aqt3T" id="5wYq9r5nsgK" role="3I6s78">
+                  <node concept="3I6s7M" id="41_kb$lzKAs" role="3I6sU7">
+                    <node concept="3Aqt3T" id="41_kb$lzKAt" role="3I6s78">
                       <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
-                      <node concept="ns1u0" id="5wYq9r5nsy9" role="3AunhB">
-                        <ref role="ns1xF" node="3bgqfmmLhUu" resolve="nodeList" />
-                        <node concept="nsMwS" id="5wYq9r5nsA5" role="ns1xD">
-                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                          <node concept="a7P8L" id="5wYq9r5nsRB" role="iSaTp">
-                            <ref role="a7OzE" node="4boCUQtooul" resolve="ConceptA" />
+                      <node concept="ns1u0" id="41_kb$lzKB2" role="3AunhB">
+                        <ref role="ns1xF" to="wi9y:1oUE7CX3tx9" resolve="list" />
+                        <node concept="nsMwS" id="41_kb$lzKB4" role="ns1xD">
+                          <ref role="nsMwP" to="wi9y:1oUE7CX3Xc1" resolve="elem" />
+                          <node concept="a7P8L" id="41_kb$lzKB7" role="iSaTp">
+                            <ref role="a7OzE" node="4boCUQton_I" resolve="CType" />
                           </node>
                         </node>
                       </node>
-                      <node concept="ns1u0" id="5wYq9r5ntjj" role="3AunhB">
-                        <ref role="ns1xF" node="3bgqfmmLhUu" resolve="nodeList" />
-                        <node concept="nsMwS" id="5wYq9r5ntjk" role="ns1xD">
-                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                          <node concept="a7P8L" id="5wYq9r5ntpz" role="iSaTp">
-                            <ref role="a7OzE" node="5wYq9r5ns1w" resolve="ConceptB" />
+                      <node concept="ns1u0" id="41_kb$lzKBe" role="3AunhB">
+                        <ref role="ns1xF" to="wi9y:1oUE7CX3tx9" resolve="list" />
+                        <node concept="nsMwS" id="41_kb$lzKBg" role="ns1xD">
+                          <ref role="nsMwP" to="wi9y:1oUE7CX3Xc1" resolve="elem" />
+                          <node concept="ns1u0" id="41_kb$lzKBm" role="iSaTp">
+                            <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
+                            <node concept="nsMwS" id="41_kb$lzKBp" role="ns1xD">
+                              <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                              <node concept="a7P8L" id="41_kb$lzKC2" role="iSaTp">
+                                <ref role="a7OzE" node="4boCUQtooul" resolve="EConcept" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="a7P8L" id="3OUB6BCUAa3" role="3AunhB">
+                      <node concept="a7P8L" id="41_kb$lzKA$" role="3AunhB">
+                        <ref role="a7OzE" node="3OUB6BCUAa0" resolve="Options" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="41_kb$lzKC9" role="3I6sU7">
+                    <node concept="3Aqt3T" id="41_kb$lzKCa" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
+                      <node concept="ns1u0" id="41_kb$lzL3n" role="3AunhB">
+                        <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
+                        <node concept="nsMwS" id="41_kb$lzL3p" role="ns1xD">
+                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                          <node concept="a7P8L" id="41_kb$lzL3s" role="iSaTp">
+                            <ref role="a7OzE" node="4boCUQtooul" resolve="EConcept" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="ns1u0" id="41_kb$lzL3z" role="3AunhB">
+                        <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
+                        <node concept="nsMwS" id="41_kb$lzL3_" role="ns1xD">
+                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
+                          <node concept="a7P8L" id="41_kb$lzL3O" role="iSaTp">
+                            <ref role="a7OzE" node="5wYq9r5ns1w" resolve="TrgConcept" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="41_kb$lzKCj" role="3AunhB">
                         <ref role="a7OzE" node="3OUB6BCUAa0" resolve="Options" />
                       </node>
                     </node>