diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl
index 25e5cafb..089bf68f 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl
@@ -68,6 +68,8 @@
35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)
+ d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)
+ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)
@@ -114,6 +116,7 @@
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
index e9fa692b..f439aefa 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
@@ -11,7 +11,8 @@
-
+
+
@@ -67,6 +68,9 @@
+
+
+
@@ -117,6 +121,11 @@
+
+
+
+
+
@@ -126,6 +135,11 @@
+
+
+
+
+
@@ -142,16 +156,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -183,6 +211,14 @@
+
+
+
+
+
+
+
+
@@ -194,6 +230,14 @@
+
+
+
+
+
+
+
+
@@ -226,6 +270,7 @@
+
@@ -248,6 +293,7 @@
+
@@ -269,6 +315,7 @@
+
@@ -300,6 +347,7 @@
+
@@ -333,19 +381,52 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -362,6 +443,12 @@
+
+
+
+
+
+
@@ -456,6 +543,205 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1199,5 +1485,434 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/jetbrains.mps.baseLanguage.tuplesExt.test.msd b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/jetbrains.mps.baseLanguage.tuplesExt.test.msd
index 8b2725c7..254582dd 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/jetbrains.mps.baseLanguage.tuplesExt.test.msd
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/jetbrains.mps.baseLanguage.tuplesExt.test.msd
@@ -18,6 +18,7 @@
a247e09e-2435-45ba-b8d2-07e93feba96a(jetbrains.mps.baseLanguage.tuples)
6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)
d351f235-67ad-4737-a13e-ec0ea46c55e2(jetbrains.mps.baseLanguage.tuplesExt)
+ d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)
@@ -44,6 +45,7 @@
+
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples.mps
index df74cfbe..2999f197 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples.mps
@@ -10,6 +10,7 @@
+
@@ -51,6 +52,7 @@
+
@@ -84,6 +86,7 @@
+
@@ -565,7 +568,72 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+