diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index f660d640..b9857d85 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -576,7 +576,6 @@
-
@@ -3238,160 +3237,118 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -3399,13 +3356,12 @@
-
-
-
-
+
+
+
+
-
@@ -7213,6 +7169,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index 0b915d00..e1fbb5a2 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -5974,5 +5974,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index 1fd327ea..2cd6acbe 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -1472,5 +1472,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+