diff --git a/languages/jetbrains.mps.jchr/languageModels/typesystem.mps b/languages/jetbrains.mps.jchr/languageModels/typesystem.mps
index d127a24e..503d052f 100644
--- a/languages/jetbrains.mps.jchr/languageModels/typesystem.mps
+++ b/languages/jetbrains.mps.jchr/languageModels/typesystem.mps
@@ -8,12 +8,12 @@
+
+
-
-
@@ -134,11 +134,134 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -241,31 +364,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -582,7 +690,11 @@
-
+
+
+
+
+