diff --git a/languages/jetbrains.mps.jchr/languageModels/editor.mps b/languages/jetbrains.mps.jchr/languageModels/editor.mps
index 0a725ed0..1aa42c15 100644
--- a/languages/jetbrains.mps.jchr/languageModels/editor.mps
+++ b/languages/jetbrains.mps.jchr/languageModels/editor.mps
@@ -569,6 +569,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/languages/jetbrains.mps.jchr/languageModels/structure.mps b/languages/jetbrains.mps.jchr/languageModels/structure.mps
index ee0f351c..5799a197 100644
--- a/languages/jetbrains.mps.jchr/languageModels/structure.mps
+++ b/languages/jetbrains.mps.jchr/languageModels/structure.mps
@@ -55,6 +55,9 @@
+
+
+
@@ -196,6 +199,9 @@
+
+
+
@@ -213,5 +219,8 @@
+
+
+
diff --git a/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index 6db481ef..c2b8ee58 100644
--- a/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -5,40 +5,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -598,5 +689,186 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index 913c791c..1bf9967a 100644
--- a/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -16,11 +16,13 @@
6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)
+ 894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr)
7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.unification.tree)
b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator)
d7706f63-9be2-479c-a3da-ae92af1e64d5(jetbrains.mps.lang.generator.generationContext)
+ 7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)
35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)
@@ -33,6 +35,8 @@
6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)
6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)
+ 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)
+ 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)
7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.unification.tree)
diff --git a/languages/jetbrains.mps.logic/languageModels/editor.mps b/languages/jetbrains.mps.logic/languageModels/editor.mps
index a14a7263..d9855402 100644
--- a/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -7,6 +7,13 @@
+
+
+
+
+
+
+
@@ -19,19 +26,14 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
+
+
@@ -54,6 +56,12 @@
+
+
+
+
+
+
@@ -327,10 +335,6 @@
-
-
-
-
@@ -372,10 +376,6 @@
-
-
-
-
diff --git a/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/unification/sandbox.mps b/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/unification/sandbox.mps
index 5508d45d..e8c752e9 100644
--- a/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/unification/sandbox.mps
+++ b/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/unification/sandbox.mps
@@ -13,6 +13,7 @@
+
@@ -53,11 +54,32 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/unification/util.mps b/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/unification/util.mps
index 1ce87869..b3a2711d 100644
--- a/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/unification/util.mps
+++ b/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/unification/util.mps
@@ -75,6 +75,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+