diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
index 1e844bce..22b6c0a7 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
@@ -71,7 +71,6 @@
         <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="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -744,28 +743,6 @@
       <node concept="3clFbS" id="1ffsG7bN0rH" role="2VODD2" />
     </node>
   </node>
-  <node concept="13h7C7" id="1CgWc1TyELS">
-    <property role="3GE5qa" value="constraint.template" />
-    <ref role="13h7C2" to="wq2x:6p0DfM0asBO" resolve="ConstraintDeclaration" />
-    <node concept="13i0hz" id="1CgWc1TyEM4" role="13h7CS">
-      <property role="TrG5h" value="getArity" />
-      <node concept="3Tm1VV" id="1CgWc1TyEM5" role="1B3o_S" />
-      <node concept="3clFbS" id="1CgWc1TyEM6" role="3clF47">
-        <node concept="3clFbF" id="1CgWc1TyEMg" role="3cqZAp">
-          <node concept="2OqwBi" id="1CgWc1TyEOV" role="3clFbG">
-            <node concept="13iPFW" id="1CgWc1TyEMf" role="2Oq$k0" />
-            <node concept="3TrcHB" id="1CgWc1TyF9M" role="2OqNvi">
-              <ref role="3TsBF5" to="wq2x:6p0DfM0azKj" resolve="arity" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="10Oyi0" id="1CgWc1TyEMc" role="3clF45" />
-    </node>
-    <node concept="13hLZK" id="1CgWc1TyELT" role="13h7CW">
-      <node concept="3clFbS" id="1CgWc1TyELU" role="2VODD2" />
-    </node>
-  </node>
   <node concept="13h7C7" id="3PWU9gizUU7">
     <property role="3GE5qa" value="rule.component" />
     <ref role="13h7C2" to="wq2x:6p0DfM0a3gA" resolve="Head" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
index 788ea476..d2004262 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
@@ -100,6 +100,12 @@
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
+        <property id="6329021646629104958" name="text" index="3SKdUp" />
+      </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
+      </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
@@ -109,12 +115,21 @@
       <concept id="1202989531578" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_CanBeAChild" flags="in" index="nKS2y" />
       <concept id="1202989658459" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_parentNode" flags="nn" index="nLn13" />
       <concept id="8966504967485224688" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_contextNode" flags="nn" index="2rP1CM" />
+      <concept id="1147467115080" name="jetbrains.mps.lang.constraints.structure.NodePropertyConstraint" flags="ng" index="EnEH3">
+        <reference id="1147467295099" name="applicableProperty" index="EomxK" />
+        <child id="1147468630220" name="propertyGetter" index="EtsB7" />
+        <child id="1152963095733" name="propertySetter" index="1LXaQT" />
+      </concept>
+      <concept id="1147467790433" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_PropertyGetter" flags="in" index="Eqf_E" />
+      <concept id="1147468365020" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_node" flags="nn" index="EsrRn" />
       <concept id="5676632058862809931" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_ReferentSearchScope_Scope" flags="in" index="13QW63" />
       <concept id="1159285995602" name="jetbrains.mps.lang.constraints.structure.NodeDefaultSearchScope" flags="ng" index="3EP7_v">
         <child id="1159286114227" name="searchScopeFactory" index="3EP$qY" />
       </concept>
+      <concept id="1152959968041" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_PropertySetter" flags="in" index="1LLf8_" />
       <concept id="1213093968558" name="jetbrains.mps.lang.constraints.structure.ConceptConstraints" flags="ng" index="1M2fIO">
         <reference id="1213093996982" name="concept" index="1M2myG" />
+        <child id="1213098023997" name="property" index="1MhHOB" />
         <child id="1213100494875" name="referent" index="1Mr941" />
         <child id="1213101058038" name="defaultScope" index="1MtirG" />
         <child id="1213106463729" name="canBeChild" index="1MLUbF" />
@@ -198,6 +213,7 @@
       </concept>
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
+      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
     </language>
   </registry>
   <node concept="1M2fIO" id="6ntBQ9KM5bM">
@@ -1052,5 +1068,36 @@
       </node>
     </node>
   </node>
+  <node concept="1M2fIO" id="2vGNdoJFT55">
+    <property role="3GE5qa" value="constraint.template" />
+    <ref role="1M2myG" to="wq2x:6p0DfM0asBO" resolve="ConstraintDeclaration" />
+    <node concept="EnEH3" id="2vGNdoJFT56" role="1MhHOB">
+      <ref role="EomxK" to="wq2x:6p0DfM0azKj" resolve="arity" />
+      <node concept="Eqf_E" id="2vGNdoJFT58" role="EtsB7">
+        <node concept="3clFbS" id="2vGNdoJFT59" role="2VODD2">
+          <node concept="3clFbF" id="2vGNdoJFTmc" role="3cqZAp">
+            <node concept="2OqwBi" id="2vGNdoJFWAa" role="3clFbG">
+              <node concept="2OqwBi" id="2vGNdoJFTDI" role="2Oq$k0">
+                <node concept="EsrRn" id="2vGNdoJFTmb" role="2Oq$k0" />
+                <node concept="3Tsc0h" id="2vGNdoJFUe5" role="2OqNvi">
+                  <ref role="3TtcxE" to="wq2x:1CgWc1TyPxy" resolve="parameters" />
+                </node>
+              </node>
+              <node concept="34oBXx" id="2vGNdoJFZxL" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1LLf8_" id="2vGNdoJFZPZ" role="1LXaQT">
+        <node concept="3clFbS" id="2vGNdoJFZQ0" role="2VODD2">
+          <node concept="3SKdUt" id="2vGNdoJG0a_" role="3cqZAp">
+            <node concept="3SKdUq" id="2vGNdoJG0aB" role="3SKWNk">
+              <property role="3SKdUp" value="can't be set" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index d307cf0f..9d3023a7 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -16,9 +16,7 @@
   </imports>
   <registry>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
-      <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9">
-        <property id="1225118933224" name="comment" index="YLQ7P" />
-      </concept>
+      <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9" />
       <concept id="6054523464626862044" name="jetbrains.mps.lang.structure.structure.AttributeInfo_IsMultiple" flags="ng" index="tn0Fv">
         <property id="6054523464626875854" name="value" index="tnX3d" />
       </concept>
@@ -276,9 +274,6 @@
       <property role="TrG5h" value="arity" />
       <property role="IQ2nx" value="7368070394767096851" />
       <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
-      <node concept="asaX9" id="5bC6UNlv7_E" role="lGtFl">
-        <property role="YLQ7P" value="use getArity() behavior method (derived from parameter number)" />
-      </node>
     </node>
     <node concept="1TJgyj" id="1CgWc1TyPxy" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
index 2c7dfe4c..4f7f59d2 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
@@ -17,7 +17,6 @@
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
     <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="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.typesystem2.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -929,63 +928,6 @@
       <ref role="1YaFvo" to="tpee:fz7wK6G" resolve="BaseMethodCall" />
     </node>
   </node>
-  <node concept="18kY7G" id="5bC6UNlu6we">
-    <property role="TrG5h" value="check_ConstraintDeclaration" />
-    <property role="3GE5qa" value="constraint.template" />
-    <node concept="3clFbS" id="5bC6UNlu6wf" role="18ibNy">
-      <node concept="2Mj0R9" id="5bC6UNlu6MS" role="3cqZAp">
-        <node concept="Xl_RD" id="5bC6UNlu9V9" role="2MkJ7o">
-          <property role="Xl_RC" value="Arity must correspond with number of parameters" />
-        </node>
-        <node concept="1YBJjd" id="5bC6UNlu9T$" role="2OEOjV">
-          <ref role="1YBMHb" node="5bC6UNlu6wh" resolve="constraintDeclaration" />
-        </node>
-        <node concept="22lmx$" id="5bC6UNlB$Eu" role="2MkoU_">
-          <node concept="3clFbC" id="5bC6UNlu7iA" role="3uHU7B">
-            <node concept="2OqwBi" id="5bC6UNlu6yu" role="3uHU7B">
-              <node concept="1YBJjd" id="5bC6UNlu6wl" role="2Oq$k0">
-                <ref role="1YBMHb" node="5bC6UNlu6wh" resolve="constraintDeclaration" />
-              </node>
-              <node concept="3TrcHB" id="5bC6UNlu6H5" role="2OqNvi">
-                <ref role="3TsBF5" to="wq2x:6p0DfM0azKj" resolve="arity" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="5bC6UNlu8x_" role="3uHU7w">
-              <node concept="2OqwBi" id="5bC6UNlu7rx" role="2Oq$k0">
-                <node concept="1YBJjd" id="5bC6UNlu7jL" role="2Oq$k0">
-                  <ref role="1YBMHb" node="5bC6UNlu6wh" resolve="constraintDeclaration" />
-                </node>
-                <node concept="3Tsc0h" id="5bC6UNlu7AW" role="2OqNvi">
-                  <ref role="3TtcxE" to="wq2x:1CgWc1TyPxy" resolve="parameters" />
-                </node>
-              </node>
-              <node concept="34oBXx" id="5bC6UNlu9QL" role="2OqNvi" />
-            </node>
-          </node>
-          <node concept="3clFbC" id="5bC6UNlB$JQ" role="3uHU7w">
-            <node concept="2OqwBi" id="5bC6UNl$Gs2" role="3uHU7B">
-              <node concept="2OqwBi" id="5bC6UNl$Gs3" role="2Oq$k0">
-                <node concept="1YBJjd" id="5bC6UNl$Gs4" role="2Oq$k0">
-                  <ref role="1YBMHb" node="5bC6UNlu6wh" resolve="constraintDeclaration" />
-                </node>
-                <node concept="3Tsc0h" id="5bC6UNl$Gs5" role="2OqNvi">
-                  <ref role="3TtcxE" to="wq2x:1CgWc1TyPxy" resolve="parameters" />
-                </node>
-              </node>
-              <node concept="34oBXx" id="5bC6UNl$Gs6" role="2OqNvi" />
-            </node>
-            <node concept="3cmrfG" id="5bC6UNl$I8d" role="3uHU7w">
-              <property role="3cmrfH" value="0" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="5bC6UNlu6wh" role="1YuTPh">
-      <property role="TrG5h" value="constraintDeclaration" />
-      <ref role="1YaFvo" to="wq2x:6p0DfM0asBO" resolve="ConstraintDeclaration" />
-    </node>
-  </node>
   <node concept="18kY7G" id="5bC6UNlv2MQ">
     <property role="TrG5h" value="check_UserConstraint" />
     <property role="3GE5qa" value="constraint" />
@@ -1001,8 +943,8 @@
                 <ref role="3Tt5mk" to="wq2x:6p0DfM0aywA" resolve="template" />
               </node>
             </node>
-            <node concept="2qgKlT" id="5bC6UNlv7yy" role="2OqNvi">
-              <ref role="37wK5l" to="x5bw:1CgWc1TyEM4" resolve="getArity" />
+            <node concept="3TrcHB" id="2vGNdoJFSZz" role="2OqNvi">
+              <ref role="3TsBF5" to="wq2x:6p0DfM0azKj" resolve="arity" />
             </node>
           </node>
           <node concept="2OqwBi" id="5bC6UNlv3z0" role="3uHU7B">