diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
index c6ee806a..5726fca1 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
@@ -26,6 +26,8 @@
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" />
+    <import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
+    <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -38,6 +40,7 @@
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
       <concept id="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
         <child id="1076505808688" name="condition" index="2$JKZa" />
@@ -72,6 +75,9 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
@@ -215,7 +221,6 @@
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
       </concept>
-      <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1154546920561" name="jetbrains.mps.lang.smodel.structure.OperationParm_ConceptList" flags="ng" index="3gmYPX">
         <child id="1154546920563" name="concept" index="3gmYPZ" />
@@ -1922,14 +1927,14 @@
               <node concept="3Tqbb2" id="7LI_gNMomBW" role="1tU5fm">
                 <ref role="ehGHo" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
               </node>
-              <node concept="1PxgMI" id="7c96q9tzDxt" role="33vP2m">
-                <property role="1BlNFB" value="true" />
-                <node concept="chp4Y" id="JOGAOsxD_G" role="3oSUPX">
-                  <ref role="cht4Q" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
-                </node>
-                <node concept="2OqwBi" id="7c96q9tzC66" role="1m5AlR">
-                  <node concept="2rP1CM" id="7LI_gNMoMNW" role="2Oq$k0" />
-                  <node concept="2Rxl7S" id="7c96q9tzCw$" role="2OqNvi" />
+              <node concept="2OqwBi" id="1vAI4X$HwLC" role="33vP2m">
+                <node concept="2rP1CM" id="1vAI4X$HwuL" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="1vAI4X$HxJF" role="2OqNvi">
+                  <node concept="1xMEDy" id="1vAI4X$HxJH" role="1xVPHs">
+                    <node concept="chp4Y" id="1vAI4X$Hy97" role="ri$Ld">
+                      <ref role="cht4Q" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -2213,123 +2218,159 @@
       <ref role="EomxK" to="tpck:h0TrG11" resolve="name" />
       <node concept="QB0g5" id="554EtBIsJl0" role="QCWH9">
         <node concept="3clFbS" id="554EtBIsJl1" role="2VODD2">
-          <node concept="3cpWs8" id="554EtBIsJPn" role="3cqZAp">
-            <node concept="3cpWsn" id="554EtBIsJPq" role="3cpWs9">
-              <property role="TrG5h" value="owner" />
-              <node concept="3Tqbb2" id="554EtBIsJPm" role="1tU5fm">
-                <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
-              </node>
-              <node concept="2OqwBi" id="554EtBIsKR9" role="33vP2m">
-                <node concept="EsrRn" id="554EtBIsKCF" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="554EtBIsL4S" role="2OqNvi">
-                  <node concept="1xMEDy" id="554EtBIsL4U" role="1xVPHs">
-                    <node concept="chp4Y" id="554EtBIsL7e" role="ri$Ld">
-                      <ref role="cht4Q" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
+          <node concept="3clFbJ" id="1vAI4X$UeSD" role="3cqZAp">
+            <node concept="3clFbS" id="1vAI4X$UeTb" role="3clFbx">
+              <node concept="3cpWs8" id="554EtBIsJPn" role="3cqZAp">
+                <node concept="3cpWsn" id="554EtBIsJPq" role="3cpWs9">
+                  <property role="TrG5h" value="owner" />
+                  <node concept="3Tqbb2" id="554EtBIsJPm" role="1tU5fm">
+                    <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
+                  </node>
+                  <node concept="2OqwBi" id="554EtBIsKR9" role="33vP2m">
+                    <node concept="EsrRn" id="554EtBIsKCF" role="2Oq$k0" />
+                    <node concept="2Xjw5R" id="554EtBIsL4S" role="2OqNvi">
+                      <node concept="1xMEDy" id="554EtBIsL4U" role="1xVPHs">
+                        <node concept="chp4Y" id="554EtBIsL7e" role="ri$Ld">
+                          <ref role="cht4Q" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-          </node>
-          <node concept="3clFbJ" id="554EtBIsL9j" role="3cqZAp">
-            <node concept="3clFbS" id="554EtBIsL9l" role="3clFbx">
-              <node concept="3cpWs8" id="554EtBItr1I" role="3cqZAp">
-                <node concept="3cpWsn" id="554EtBItr1L" role="3cpWs9">
-                  <property role="TrG5h" value="inheritedFeatures" />
-                  <node concept="A3Dl8" id="554EtBItr1F" role="1tU5fm">
-                    <node concept="17QB3L" id="554EtBItsbc" role="A3Ik2" />
-                  </node>
-                  <node concept="2OqwBi" id="554EtBItpqh" role="33vP2m">
-                    <node concept="2OqwBi" id="554EtBItpqi" role="2Oq$k0">
-                      <node concept="2OqwBi" id="554EtBItpqj" role="2Oq$k0">
-                        <node concept="37vLTw" id="554EtBItpqk" role="2Oq$k0">
-                          <ref role="3cqZAo" node="554EtBIsJPq" resolve="owner" />
-                        </node>
-                        <node concept="2qgKlT" id="554EtBItpql" role="2OqNvi">
-                          <ref role="37wK5l" to="x5bw:4lCLOtww4qi" resolve="prototypesStack" />
-                        </node>
+              <node concept="3clFbJ" id="554EtBIsL9j" role="3cqZAp">
+                <node concept="3clFbS" id="554EtBIsL9l" role="3clFbx">
+                  <node concept="3cpWs8" id="554EtBItr1I" role="3cqZAp">
+                    <node concept="3cpWsn" id="554EtBItr1L" role="3cpWs9">
+                      <property role="TrG5h" value="inheritedFeatures" />
+                      <node concept="A3Dl8" id="554EtBItr1F" role="1tU5fm">
+                        <node concept="17QB3L" id="554EtBItsbc" role="A3Ik2" />
                       </node>
-                      <node concept="3goQfb" id="554EtBItpqm" role="2OqNvi">
-                        <node concept="1bVj0M" id="554EtBItpqn" role="23t8la">
-                          <node concept="3clFbS" id="554EtBItpqo" role="1bW5cS">
-                            <node concept="3clFbF" id="554EtBItpqp" role="3cqZAp">
-                              <node concept="2OqwBi" id="554EtBItpqq" role="3clFbG">
-                                <node concept="2OqwBi" id="554EtBItpqr" role="2Oq$k0">
-                                  <node concept="37vLTw" id="554EtBItpqs" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="554EtBItpqv" resolve="it" />
-                                  </node>
-                                  <node concept="3TrEf2" id="554EtBItpqt" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:JOGAOsxaCc" resolve="template" />
-                                  </node>
-                                </node>
-                                <node concept="3Tsc0h" id="554EtBItpqu" role="2OqNvi">
-                                  <ref role="3TtcxE" to="wq2x:JOGAOsxiLz" resolve="feature" />
-                                </node>
-                              </node>
+                      <node concept="2OqwBi" id="554EtBItpqh" role="33vP2m">
+                        <node concept="2OqwBi" id="554EtBItpqi" role="2Oq$k0">
+                          <node concept="2OqwBi" id="554EtBItpqj" role="2Oq$k0">
+                            <node concept="37vLTw" id="554EtBItpqk" role="2Oq$k0">
+                              <ref role="3cqZAo" node="554EtBIsJPq" resolve="owner" />
+                            </node>
+                            <node concept="2qgKlT" id="554EtBItpql" role="2OqNvi">
+                              <ref role="37wK5l" to="x5bw:4lCLOtww4qi" resolve="prototypesStack" />
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="554EtBItpqv" role="1bW2Oz">
-                            <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="554EtBItpqw" role="1tU5fm" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3$u5V9" id="554EtBItpqx" role="2OqNvi">
-                      <node concept="1bVj0M" id="554EtBItpqy" role="23t8la">
-                        <node concept="3clFbS" id="554EtBItpqz" role="1bW5cS">
-                          <node concept="3clFbF" id="554EtBItpq$" role="3cqZAp">
-                            <node concept="3K4zz7" id="554EtBIukQr" role="3clFbG">
-                              <node concept="10Nm6u" id="554EtBIulDZ" role="3K4GZi" />
-                              <node concept="3y3z36" id="554EtBIujMx" role="3K4Cdx">
-                                <node concept="EsrRn" id="554EtBIukfc" role="3uHU7w" />
-                                <node concept="37vLTw" id="554EtBIujl0" role="3uHU7B">
-                                  <ref role="3cqZAo" node="554EtBItpqC" resolve="it" />
+                          <node concept="3goQfb" id="554EtBItpqm" role="2OqNvi">
+                            <node concept="1bVj0M" id="554EtBItpqn" role="23t8la">
+                              <node concept="3clFbS" id="554EtBItpqo" role="1bW5cS">
+                                <node concept="3clFbF" id="554EtBItpqp" role="3cqZAp">
+                                  <node concept="2OqwBi" id="554EtBItpqq" role="3clFbG">
+                                    <node concept="2OqwBi" id="554EtBItpqr" role="2Oq$k0">
+                                      <node concept="37vLTw" id="554EtBItpqs" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="554EtBItpqv" resolve="it" />
+                                      </node>
+                                      <node concept="3TrEf2" id="554EtBItpqt" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="wq2x:JOGAOsxaCc" resolve="template" />
+                                      </node>
+                                    </node>
+                                    <node concept="3Tsc0h" id="554EtBItpqu" role="2OqNvi">
+                                      <ref role="3TtcxE" to="wq2x:JOGAOsxiLz" resolve="feature" />
+                                    </node>
+                                  </node>
                                 </node>
                               </node>
-                              <node concept="2OqwBi" id="554EtBItpq_" role="3K4E3e">
-                                <node concept="37vLTw" id="554EtBItpqA" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="554EtBItpqC" resolve="it" />
-                                </node>
-                                <node concept="3TrcHB" id="554EtBItpqB" role="2OqNvi">
-                                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                </node>
+                              <node concept="Rh6nW" id="554EtBItpqv" role="1bW2Oz">
+                                <property role="TrG5h" value="it" />
+                                <node concept="2jxLKc" id="554EtBItpqw" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="554EtBItpqC" role="1bW2Oz">
-                          <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="554EtBItpqD" role="1tU5fm" />
+                        <node concept="3$u5V9" id="554EtBItpqx" role="2OqNvi">
+                          <node concept="1bVj0M" id="554EtBItpqy" role="23t8la">
+                            <node concept="3clFbS" id="554EtBItpqz" role="1bW5cS">
+                              <node concept="3clFbF" id="554EtBItpq$" role="3cqZAp">
+                                <node concept="3K4zz7" id="554EtBIukQr" role="3clFbG">
+                                  <node concept="10Nm6u" id="554EtBIulDZ" role="3K4GZi" />
+                                  <node concept="3y3z36" id="554EtBIujMx" role="3K4Cdx">
+                                    <node concept="EsrRn" id="554EtBIukfc" role="3uHU7w" />
+                                    <node concept="37vLTw" id="554EtBIujl0" role="3uHU7B">
+                                      <ref role="3cqZAo" node="554EtBItpqC" resolve="it" />
+                                    </node>
+                                  </node>
+                                  <node concept="2OqwBi" id="554EtBItpq_" role="3K4E3e">
+                                    <node concept="37vLTw" id="554EtBItpqA" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="554EtBItpqC" resolve="it" />
+                                    </node>
+                                    <node concept="3TrcHB" id="554EtBItpqB" role="2OqNvi">
+                                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="Rh6nW" id="554EtBItpqC" role="1bW2Oz">
+                              <property role="TrG5h" value="it" />
+                              <node concept="2jxLKc" id="554EtBItpqD" role="1tU5fm" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cpWs6" id="554EtBIsLHB" role="3cqZAp">
+                    <node concept="3fqX7Q" id="554EtBItpqe" role="3cqZAk">
+                      <node concept="2OqwBi" id="554EtBItpqg" role="3fr31v">
+                        <node concept="3JPx81" id="554EtBItpqE" role="2OqNvi">
+                          <node concept="1Wqviy" id="554EtBItpqF" role="25WWJ7" />
+                        </node>
+                        <node concept="37vLTw" id="554EtBItvL1" role="2Oq$k0">
+                          <ref role="3cqZAo" node="554EtBItr1L" resolve="inheritedFeatures" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-              </node>
-              <node concept="3cpWs6" id="554EtBIsLHB" role="3cqZAp">
-                <node concept="3fqX7Q" id="554EtBItpqe" role="3cqZAk">
-                  <node concept="2OqwBi" id="554EtBItpqg" role="3fr31v">
-                    <node concept="3JPx81" id="554EtBItpqE" role="2OqNvi">
-                      <node concept="1Wqviy" id="554EtBItpqF" role="25WWJ7" />
-                    </node>
-                    <node concept="37vLTw" id="554EtBItvL1" role="2Oq$k0">
-                      <ref role="3cqZAo" node="554EtBItr1L" resolve="inheritedFeatures" />
-                    </node>
+                <node concept="3y3z36" id="554EtBIsLvw" role="3clFbw">
+                  <node concept="10Nm6u" id="554EtBIsLA2" role="3uHU7w" />
+                  <node concept="37vLTw" id="554EtBIsLa7" role="3uHU7B">
+                    <ref role="3cqZAo" node="554EtBIsJPq" resolve="owner" />
                   </node>
                 </node>
               </node>
+              <node concept="3cpWs6" id="554EtBItqmo" role="3cqZAp">
+                <node concept="3clFbT" id="554EtBItqnc" role="3cqZAk">
+                  <property role="3clFbU" value="true" />
+                </node>
+              </node>
+              <node concept="3clFbH" id="1vAI4X$UieB" role="3cqZAp" />
             </node>
-            <node concept="3y3z36" id="554EtBIsLvw" role="3clFbw">
-              <node concept="10Nm6u" id="554EtBIsLA2" role="3uHU7w" />
-              <node concept="37vLTw" id="554EtBIsLa7" role="3uHU7B">
-                <ref role="3cqZAo" node="554EtBIsJPq" resolve="owner" />
+            <node concept="1Wc70l" id="1vAI4X$Ueoe" role="3clFbw">
+              <node concept="3fqX7Q" id="1vAI4X$Ueof" role="3uHU7w">
+                <node concept="2YIFZM" id="1vAI4X$Ueog" role="3fr31v">
+                  <ref role="37wK5l" to="18ew:~JavaNameUtil.isJavaReserved(java.lang.String)" resolve="isJavaReserved" />
+                  <ref role="1Pybhc" to="18ew:~JavaNameUtil" resolve="JavaNameUtil" />
+                  <node concept="1Wqviy" id="1vAI4X$Ueoh" role="37wK5m" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="1vAI4X$Ueoi" role="3uHU7B">
+                <node concept="2OqwBi" id="1vAI4X$Ueoj" role="2Oq$k0">
+                  <node concept="liA8E" id="1vAI4X$Ueok" role="2OqNvi">
+                    <ref role="37wK5l" to="ni5j:~Pattern.matcher(java.lang.CharSequence)" resolve="matcher" />
+                    <node concept="1Wqviy" id="1vAI4X$Ueol" role="37wK5m" />
+                  </node>
+                  <node concept="10M0yZ" id="1vAI4X$Ueom" role="2Oq$k0">
+                    <ref role="1PxDUh" to="18ew:~JavaNameUtil" resolve="JavaNameUtil" />
+                    <ref role="3cqZAo" to="18ew:~JavaNameUtil.VALID_ID_PATTERN" resolve="VALID_ID_PATTERN" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="1vAI4X$Ueon" role="2OqNvi">
+                  <ref role="37wK5l" to="ni5j:~Matcher.matches()" resolve="matches" />
+                </node>
               </node>
             </node>
-          </node>
-          <node concept="3cpWs6" id="554EtBItqmo" role="3cqZAp">
-            <node concept="3clFbT" id="554EtBItqnc" role="3cqZAk">
-              <property role="3clFbU" value="true" />
+            <node concept="9aQIb" id="1vAI4X$UgZS" role="9aQIa">
+              <node concept="3clFbS" id="1vAI4X$UgZT" role="9aQI4">
+                <node concept="3cpWs6" id="1vAI4X$Uh_t" role="3cqZAp">
+                  <node concept="3clFbT" id="1vAI4X$UhLR" role="3cqZAk" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index 8faa1a14..1169bac6 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -486,12 +486,7 @@
       <concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC">
         <reference id="1139880128956" name="concept" index="1A9B2P" />
       </concept>
-      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
-        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
-      </concept>
       <concept id="7835263205327057228" name="jetbrains.mps.lang.smodel.structure.Node_GetChildrenAndChildAttributesOperation" flags="ng" index="Bykcj" />
-      <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
       <concept id="1966870290088668520" name="jetbrains.mps.lang.smodel.structure.Enum_MembersOperation" flags="ng" index="2ViDtN" />
       <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
@@ -537,9 +532,6 @@
       <concept id="1140131837776" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithAnotherOperation" flags="nn" index="1P9Npp">
         <child id="1140131861877" name="replacementNode" index="1P9ThW" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <property id="1238684351431" name="asCast" index="1BlNFB" />
-      </concept>
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -4141,45 +4133,9 @@
   <node concept="24kQdi" id="JOGAOsxiLE">
     <property role="3GE5qa" value="term.feature" />
     <ref role="1XX52x" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
-    <node concept="3EZMnI" id="1CcQBrPqjR2" role="2wV5jI">
-      <node concept="l2Vlx" id="1CcQBrPqjR5" role="2iSdaV" />
-      <node concept="PMmxH" id="JOGAOsx_Cg" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
-      </node>
-      <node concept="3F0A7n" id="JOGAOsx_Ch" role="3EZMnx">
-        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-        <node concept="A1WHr" id="JOGAOsx_Ci" role="3vIgyS">
-          <ref role="2ZyFGn" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
-        </node>
-      </node>
-      <node concept="3EZMnI" id="JOGAOsx_Cj" role="3EZMnx">
-        <node concept="VPM3Z" id="JOGAOsx_Ck" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="l2Vlx" id="JOGAOsx_Cl" role="2iSdaV" />
-        <node concept="3F0ifn" id="JOGAOsx_Cm" role="3EZMnx">
-          <property role="3F0ifm" value="=" />
-        </node>
-        <node concept="3F1sOY" id="JOGAOsx_Cn" role="3EZMnx">
-          <ref role="1NtTu8" to="wq2x:JOGAOsxmrx" resolve="getter" />
-        </node>
-        <node concept="pkWqt" id="JOGAOsx_Co" role="pqm2j">
-          <node concept="3clFbS" id="JOGAOsx_Cp" role="2VODD2">
-            <node concept="3clFbF" id="JOGAOsx_Cq" role="3cqZAp">
-              <node concept="2OqwBi" id="JOGAOsx_Cr" role="3clFbG">
-                <node concept="2OqwBi" id="JOGAOsx_Cs" role="2Oq$k0">
-                  <node concept="pncrf" id="JOGAOsx_Ct" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="JOGAOsx_Cu" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:JOGAOsxmrx" resolve="getter" />
-                  </node>
-                </node>
-                <node concept="3x8VRR" id="JOGAOsx_Cv" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
+    <node concept="3F0ifn" id="1vAI4X$UzsX" role="2wV5jI">
+      <property role="3F0ifm" value="" />
+      <property role="ilYzB" value="&lt;choose feature&gt;" />
     </node>
   </node>
   <node concept="24kQdi" id="JOGAOsxTDr">
@@ -6009,14 +5965,14 @@
                 <node concept="3Tqbb2" id="7LI_gNMomBW" role="1tU5fm">
                   <ref role="ehGHo" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
                 </node>
-                <node concept="1PxgMI" id="7LI_gNMoKlm" role="33vP2m">
-                  <property role="1BlNFB" value="true" />
-                  <node concept="chp4Y" id="7LI_gNMoKln" role="3oSUPX">
-                    <ref role="cht4Q" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
-                  </node>
-                  <node concept="2OqwBi" id="7LI_gNMoKlo" role="1m5AlR">
-                    <node concept="7Obwk" id="7LI_gNMoKlp" role="2Oq$k0" />
-                    <node concept="2Rxl7S" id="7LI_gNMoKlq" role="2OqNvi" />
+                <node concept="2OqwBi" id="1vAI4X$I9Ep" role="33vP2m">
+                  <node concept="7Obwk" id="1vAI4X$I9mN" role="2Oq$k0" />
+                  <node concept="2Xjw5R" id="1vAI4X$Ia6u" role="2OqNvi">
+                    <node concept="1xMEDy" id="1vAI4X$Ia6w" role="1xVPHs">
+                      <node concept="chp4Y" id="1vAI4X$Ialz" role="ri$Ld">
+                        <ref role="cht4Q" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
@@ -8559,5 +8515,206 @@
       <node concept="l2Vlx" id="6wBZuQUGpQh" role="2iSdaV" />
     </node>
   </node>
+  <node concept="24kQdi" id="1vAI4X$Pc7C">
+    <property role="3GE5qa" value="term.feature" />
+    <ref role="1XX52x" to="wq2x:JOGAOsxnj6" resolve="ValueFeature" />
+    <node concept="3EZMnI" id="1vAI4X$Pc9G" role="2wV5jI">
+      <node concept="l2Vlx" id="1vAI4X$Pc9H" role="2iSdaV" />
+      <node concept="PMmxH" id="1vAI4X$Pc9I" role="3EZMnx">
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
+      </node>
+      <node concept="3F0A7n" id="1vAI4X$Pc9J" role="3EZMnx">
+        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+        <node concept="A1WHr" id="1vAI4X$RB7K" role="3vIgyS">
+          <ref role="2ZyFGn" to="wq2x:JOGAOsxnj6" resolve="ValueFeature" />
+        </node>
+      </node>
+      <node concept="3EZMnI" id="1vAI4X$Pe46" role="3EZMnx">
+        <node concept="VPM3Z" id="1vAI4X$Pe48" role="3F10Kt" />
+        <node concept="l2Vlx" id="1vAI4X$Pe4b" role="2iSdaV" />
+        <node concept="3F0ifn" id="1vAI4X$Pd9_" role="3EZMnx">
+          <property role="3F0ifm" value=":" />
+          <node concept="VPM3Z" id="1vAI4X$PgLV" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="VPxyj" id="1vAI4X$PgSw" role="3F10Kt" />
+          <node concept="11L4FC" id="1vAI4X$Qvkp" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="3F1sOY" id="1vAI4X$PeMk" role="3EZMnx">
+          <ref role="1NtTu8" to="wq2x:1vAI4X$P8hj" resolve="type" />
+        </node>
+        <node concept="pkWqt" id="1vAI4X$Pf8J" role="pqm2j">
+          <node concept="3clFbS" id="1vAI4X$Pf8K" role="2VODD2">
+            <node concept="3clFbF" id="1vAI4X$PfeF" role="3cqZAp">
+              <node concept="2OqwBi" id="1vAI4X$PgiU" role="3clFbG">
+                <node concept="2OqwBi" id="1vAI4X$PftS" role="2Oq$k0">
+                  <node concept="pncrf" id="1vAI4X$PfeE" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="1vAI4X$PfIx" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:1vAI4X$P8hj" resolve="type" />
+                  </node>
+                </node>
+                <node concept="3x8VRR" id="1vAI4X$PgwQ" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3EZMnI" id="1vAI4X$Pc9L" role="3EZMnx">
+        <node concept="VPM3Z" id="1vAI4X$Pc9M" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="l2Vlx" id="1vAI4X$Pc9N" role="2iSdaV" />
+        <node concept="3F0ifn" id="1vAI4X$Pc9O" role="3EZMnx">
+          <property role="3F0ifm" value="=" />
+        </node>
+        <node concept="3F1sOY" id="1vAI4X$Pc9P" role="3EZMnx">
+          <ref role="1NtTu8" to="wq2x:JOGAOsxmrx" resolve="getter" />
+          <node concept="3nxI2P" id="1vAI4X$PplN" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="pkWqt" id="1vAI4X$Pc9Q" role="pqm2j">
+          <node concept="3clFbS" id="1vAI4X$Pc9R" role="2VODD2">
+            <node concept="3clFbF" id="1vAI4X$Pc9S" role="3cqZAp">
+              <node concept="2OqwBi" id="1vAI4X$Pc9T" role="3clFbG">
+                <node concept="2OqwBi" id="1vAI4X$Pc9U" role="2Oq$k0">
+                  <node concept="pncrf" id="1vAI4X$Pc9V" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="1vAI4X$Pc9W" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:JOGAOsxmrx" resolve="getter" />
+                  </node>
+                </node>
+                <node concept="3x8VRR" id="1vAI4X$Pc9X" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="3ICUPy" id="1vAI4X$PhDq">
+    <property role="3GE5qa" value="term.feature" />
+    <ref role="aqKnT" to="wq2x:JOGAOsxnj6" resolve="ValueFeature" />
+    <node concept="22hDWj" id="1vAI4X$PhLz" role="22hAXT" />
+    <node concept="1Qtc8_" id="1vAI4X$PhTj" role="IW6Ez">
+      <node concept="3cWJ9i" id="1vAI4X$PhZR" role="1Qtc8$">
+        <node concept="CtIbL" id="1vAI4X$PhZT" role="CtIbM">
+          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+        </node>
+      </node>
+      <node concept="aenpk" id="1vAI4X$Pi_l" role="1Qtc8A">
+        <node concept="27VH4U" id="1vAI4X$PiGF" role="aenpu">
+          <node concept="3clFbS" id="1vAI4X$PiGG" role="2VODD2">
+            <node concept="3clFbF" id="1vAI4X$PiNr" role="3cqZAp">
+              <node concept="2OqwBi" id="1vAI4X$Pj$9" role="3clFbG">
+                <node concept="2OqwBi" id="1vAI4X$Pj2C" role="2Oq$k0">
+                  <node concept="7Obwk" id="1vAI4X$PiNq" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="1vAI4X$Pjnj" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:1vAI4X$P8hj" resolve="type" />
+                  </node>
+                </node>
+                <node concept="3w_OXm" id="1vAI4X$PjOM" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="IWgqT" id="1vAI4X$PjZm" role="aenpr">
+          <node concept="1hCUdq" id="1vAI4X$PjZn" role="1hCUd6">
+            <node concept="3clFbS" id="1vAI4X$PjZo" role="2VODD2">
+              <node concept="3clFbF" id="1vAI4X$Pk7V" role="3cqZAp">
+                <node concept="Xl_RD" id="1vAI4X$Pk7U" role="3clFbG">
+                  <property role="Xl_RC" value=":" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="IWg2L" id="1vAI4X$PjZp" role="IWgqQ">
+            <node concept="3clFbS" id="1vAI4X$PjZq" role="2VODD2">
+              <node concept="3clFbF" id="1vAI4X$Pkhr" role="3cqZAp">
+                <node concept="2OqwBi" id="1vAI4X$PkKC" role="3clFbG">
+                  <node concept="2OqwBi" id="1vAI4X$Pkj$" role="2Oq$k0">
+                    <node concept="7Obwk" id="1vAI4X$Pkhq" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="1vAI4X$Pk_F" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:1vAI4X$P8hj" resolve="type" />
+                    </node>
+                  </node>
+                  <node concept="zfrQC" id="1vAI4X$Pl9X" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cqGtN" id="1vAI4X$Plp_" role="2jZA2a">
+            <node concept="3cqJkl" id="1vAI4X$PlpA" role="3cqGtW">
+              <node concept="3clFbS" id="1vAI4X$PlpB" role="2VODD2">
+                <node concept="3clFbF" id="1vAI4X$Pl$o" role="3cqZAp">
+                  <node concept="Xl_RD" id="1vAI4X$Pl$n" role="3clFbG">
+                    <property role="Xl_RC" value="specify value type" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="PKFIW" id="1vAI4X$UxOr">
+    <property role="3GE5qa" value="term.feature" />
+    <property role="TrG5h" value="TermFeature_EditorComponent" />
+    <ref role="1XX52x" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
+    <node concept="3EZMnI" id="1CcQBrPqjR2" role="2wV5jI">
+      <node concept="l2Vlx" id="1CcQBrPqjR5" role="2iSdaV" />
+      <node concept="PMmxH" id="JOGAOsx_Cg" role="3EZMnx">
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+      </node>
+      <node concept="3F0A7n" id="JOGAOsx_Ch" role="3EZMnx">
+        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+      </node>
+      <node concept="3EZMnI" id="JOGAOsx_Cj" role="3EZMnx">
+        <node concept="VPM3Z" id="JOGAOsx_Ck" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="l2Vlx" id="JOGAOsx_Cl" role="2iSdaV" />
+        <node concept="3F0ifn" id="JOGAOsx_Cm" role="3EZMnx">
+          <property role="3F0ifm" value="=" />
+        </node>
+        <node concept="3F1sOY" id="JOGAOsx_Cn" role="3EZMnx">
+          <ref role="1NtTu8" to="wq2x:JOGAOsxmrx" resolve="getter" />
+        </node>
+        <node concept="pkWqt" id="JOGAOsx_Co" role="pqm2j">
+          <node concept="3clFbS" id="JOGAOsx_Cp" role="2VODD2">
+            <node concept="3clFbF" id="JOGAOsx_Cq" role="3cqZAp">
+              <node concept="2OqwBi" id="JOGAOsx_Cr" role="3clFbG">
+                <node concept="2OqwBi" id="JOGAOsx_Cs" role="2Oq$k0">
+                  <node concept="pncrf" id="JOGAOsx_Ct" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="JOGAOsx_Cu" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:JOGAOsxmrx" resolve="getter" />
+                  </node>
+                </node>
+                <node concept="3x8VRR" id="JOGAOsx_Cv" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="24kQdi" id="1vAI4X$U_sh">
+    <property role="3GE5qa" value="term.feature" />
+    <ref role="1XX52x" to="wq2x:JOGAOsxm2z" resolve="ChildFeature" />
+    <node concept="PMmxH" id="1vAI4X$UB09" role="2wV5jI">
+      <ref role="PMmxG" node="1vAI4X$UxOr" resolve="TermFeature_EditorComponent" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="1vAI4X$UBlj">
+    <property role="3GE5qa" value="term.feature" />
+    <ref role="1XX52x" to="wq2x:JOGAOsxpXw" resolve="ListFeature" />
+    <node concept="PMmxH" id="1vAI4X$UBtR" role="2wV5jI">
+      <ref role="PMmxG" node="1vAI4X$UxOr" resolve="TermFeature_EditorComponent" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index 3b7ae891..480c338f 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -1392,6 +1392,7 @@
       <property role="20lmBu" value="fLJjDmT/aggregation" />
       <property role="20kJfa" value="getter" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+      <node concept="asaX9" id="1vAI4X$PolV" role="lGtFl" />
     </node>
     <node concept="t5JxF" id="3MfP0fwg5uK" role="lGtFl">
       <property role="t5JxN" value="Defines a term feature." />
@@ -1447,9 +1448,18 @@
     <property role="34LRSv" value="value" />
     <property role="3GE5qa" value="term.feature" />
     <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="TermFeature" />
+    <node concept="1TJgyj" id="1vAI4X$P8hj" role="1TKVEi">
+      <property role="IQ2ns" value="1722266558649369683" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="type" />
+      <ref role="20lvS9" to="tpee:fz3vP1H" resolve="Type" />
+    </node>
     <node concept="t5JxF" id="3MfP0fwg5w9" role="lGtFl">
       <property role="t5JxN" value="Feature declaration of an Object value." />
     </node>
+    <node concept="PrWs8" id="1vAI4X$TLdh" role="PzmwI">
+      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
+    </node>
   </node>
   <node concept="1TIwiD" id="JOGAOsxanH">
     <property role="EcuMT" value="861509610434242029" />