diff --git a/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl b/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl
index 03e9b749..449dea23 100644
--- a/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl
+++ b/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl
@@ -41,7 +41,7 @@
258bd2f6-0d02-411d-86b2-5a5ea083e6d2(jetbrains.mps.lang.editor.table.runtime)
86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)
f8e20673-3f65-44e9-84c0-c4a4b6ede37e(jetbrains.mps.make.facets)
- a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)
+ a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)
df9d410f-2ebb-43f7-893a-483a4f085250(jetbrains.mps.smodel.resources)
diff --git a/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index 39a6d701..fa96e71e 100644
--- a/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -134,7 +134,7 @@
-
+
@@ -211,7 +211,7 @@
-
+
@@ -367,43 +367,48 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -412,16 +417,16 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
@@ -431,20 +436,20 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -453,16 +458,16 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
@@ -472,6 +477,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -493,7 +589,7 @@
-
+
@@ -753,7 +849,7 @@
-
+
diff --git a/languages/jetbrains.mps.logic/languageModels/actions.mps b/languages/jetbrains.mps.logic/languageModels/actions.mps
index b4cb020c..828d2e21 100644
--- a/languages/jetbrains.mps.logic/languageModels/actions.mps
+++ b/languages/jetbrains.mps.logic/languageModels/actions.mps
@@ -48,6 +48,12 @@
+
+
+
+
+
+
@@ -64,13 +70,19 @@
+
+
+
+
+
+
-
+
diff --git a/languages/jetbrains.mps.logic/languageModels/editor.mps b/languages/jetbrains.mps.logic/languageModels/editor.mps
index d9855402..27752328 100644
--- a/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -293,25 +293,25 @@
-
+
-
+
-
+
-
+
@@ -325,58 +325,63 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
-
-
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
+
+
+
-
+
@@ -1396,6 +1401,12 @@
+
+
+
+
+
+
@@ -1499,6 +1510,12 @@
+
+
+
+
+
+
diff --git a/languages/jetbrains.mps.logic/languageModels/structure.mps b/languages/jetbrains.mps.logic/languageModels/structure.mps
index 5f92b9e9..99cc55c4 100644
--- a/languages/jetbrains.mps.logic/languageModels/structure.mps
+++ b/languages/jetbrains.mps.logic/languageModels/structure.mps
@@ -3,9 +3,9 @@
+
-
@@ -14,22 +14,16 @@
-
+
-
+
-
-
-
-
-
-
@@ -57,7 +51,7 @@
-
+
@@ -79,12 +73,12 @@
-
+
-
+
@@ -98,15 +92,15 @@
-
-
+
+
-
-
+
+
@@ -115,10 +109,10 @@
-
+
-
+
@@ -164,5 +158,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/logic/sandbox.mps b/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/logic/sandbox.mps
index 0852d9bd..10f9ddde 100644
--- a/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/logic/sandbox.mps
+++ b/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/logic/sandbox.mps
@@ -946,91 +946,98 @@
-
+
-
+
+
-
+
+
-
+
-
+
+
+
-
+
-
+
+
+
-
+
+
+
-
+
-
+
-
@@ -1040,21 +1047,25 @@
-
+
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
@@ -1065,36 +1076,40 @@
+
+
-
+
-
+
-
+
+
+
-
+
@@ -1103,8 +1118,7 @@
-
-
+
@@ -1358,17 +1372,19 @@
-
+
+
+
@@ -1377,15 +1393,17 @@
+
+
-
+
@@ -1412,47 +1430,53 @@
-
+
+
+
-
+
+
+
-
+
+
+
@@ -1479,23 +1503,25 @@
-
+
+
+
-
+
@@ -1504,7 +1530,7 @@
-
+
@@ -1526,17 +1552,19 @@
-
+
+
+
@@ -1550,5 +1578,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 5fa73727..ce903e51 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
@@ -44,8 +44,35 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -57,27 +84,29 @@
-
+
+
+
-
+
-
+
@@ -106,12 +135,6 @@
-
-
-
-
-
-
diff --git a/languages/jetbrains.mps.logic/sandbox/runner/models/jetbrains/mps/logic/sandbox/runner.mps b/languages/jetbrains.mps.logic/sandbox/runner/models/jetbrains/mps/logic/sandbox/runner.mps
index 0a17f58d..93dc71c0 100644
--- a/languages/jetbrains.mps.logic/sandbox/runner/models/jetbrains/mps/logic/sandbox/runner.mps
+++ b/languages/jetbrains.mps.logic/sandbox/runner/models/jetbrains/mps/logic/sandbox/runner.mps
@@ -9,6 +9,7 @@
+
@@ -45,7 +46,7 @@
-
+
@@ -59,17 +60,40 @@
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -94,17 +118,19 @@
-
+
+
+
@@ -113,56 +139,113 @@
+
+
-
+
-
-
+
+
-
+
-
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+