From ce9f4765771d561eed6cfc2436f4c17ad5f06251 Mon Sep 17 00:00:00 2001
From: Amin Ait Lamqadem <alamqadem@itemis.de>
Date: Tue, 23 Sep 2025 13:48:00 +0200
Subject: [PATCH 01/18] Add language, runtime and sandbox

---
 code/.mps/modules.xml                         |   4 +
 ...mis.mps.baseLanguageExtensions.runtime.msd |  19 ++++
 ...mis.mps.baseLanguageExtensions.runtime.mps |   8 ++
 ...mis.mps.baseLanguageExtensions.sandbox.msd |  22 ++++
 ...mis.mps.baseLanguageExtensions.sandbox.mps |  10 ++
 .../de.itemis.mps.baseLanguageExtensions.mpl  | 107 ++++++++++++++++++
 ...tensions.generator.templates@generator.mps |  24 ++++
 ...is.mps.baseLanguageExtensions.behavior.mps |  12 ++
 ...mps.baseLanguageExtensions.constraints.mps |  19 ++++
 ...emis.mps.baseLanguageExtensions.editor.mps |  12 ++
 ...s.mps.baseLanguageExtensions.structure.mps |  10 ++
 ....mps.baseLanguageExtensions.typesystem.mps |  11 ++
 ...itemis.mps.baseLanguageExtensions.test.msd |  19 ++++
 13 files changed, 277 insertions(+)
 create mode 100644 code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
 create mode 100644 code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
 create mode 100644 code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/de.itemis.mps.baseLanguageExtensions.sandbox.msd
 create mode 100644 code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
 create mode 100644 code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl
 create mode 100644 code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
 create mode 100644 code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.behavior.mps
 create mode 100644 code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.constraints.mps
 create mode 100644 code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.editor.mps
 create mode 100644 code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
 create mode 100644 code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
 create mode 100644 code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd

diff --git a/code/.mps/modules.xml b/code/.mps/modules.xml
index acc8df9845..a5b5cd747d 100644
--- a/code/.mps/modules.xml
+++ b/code/.mps/modules.xml
@@ -81,6 +81,9 @@
       <modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.collection/de.itemis.model.simple.demo.collection.mpl" folder="modelmerger2.test.language" />
       <modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.property/de.itemis.model.simple.demo.property.mpl" folder="modelmerger2.test.language" />
       <modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.reference/de.itemis.model.simple.demo.reference.mpl" folder="modelmerger2.test.language" />
+      <modulePath path="$PROJECT_DIR$/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd" folder="baseLanguageExtensions" />
+      <modulePath path="$PROJECT_DIR$/languages/de.itemis.mps.baseLanguageExtensions.sandbox/de.itemis.mps.baseLanguageExtensions.sandbox.msd" folder="baseLanguageExtensions" />
+      <modulePath path="$PROJECT_DIR$/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl" folder="baseLanguageExtensions" />
       <modulePath path="$PROJECT_DIR$/langvis/languages/com.dslfoundry.langvis.demolang/com.dslfoundry.langvis.demolang.mpl" folder="langvis" />
       <modulePath path="$PROJECT_DIR$/langvis/solutions/com.dslfoundry.langvis.demo/com.dslfoundry.langvis.demo.msd" folder="langvis" />
       <modulePath path="$PROJECT_DIR$/langvis/solutions/com.dslfoundry.langvis.plugin/com.dslfoundry.langvis.plugin.msd" folder="langvis" />
@@ -190,6 +193,7 @@
       <modulePath path="$PROJECT_DIR$/solutions/de.itemis.model.merge.simple.demo/de.itemis.model.merge.simple.demo.msd" folder="modelmerger2" />
       <modulePath path="$PROJECT_DIR$/solutions/de.itemis.model.merge.test.integration/de.itemis.model.merge.test.integration.msd" folder="modelmerger2" />
       <modulePath path="$PROJECT_DIR$/solutions/de.itemis.model.merge.test/de.itemis.model.merge.test.msd" folder="modelmerger2" />
+      <modulePath path="$PROJECT_DIR$/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd" folder="baseLanguageExtensions" />
       <modulePath path="$PROJECT_DIR$/solutions/de.itemis.mps.extensions.changelog/de.itemis.mps.extensions.changelog.msd" folder="build" />
       <modulePath path="$PROJECT_DIR$/spellcheck/languages/de.itemis.mps.spellcheck/de.itemis.mps.spellcheck.mpl" folder="spellcheck" />
       <modulePath path="$PROJECT_DIR$/spellcheck/solutions/de.itemis.mps.spellcheck.demo/de.itemis.mps.spellcheck.demo.msd" folder="spellcheck" />
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
new file mode 100644
index 0000000000..5a4fff2452
--- /dev/null
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solution name="de.itemis.mps.baseLanguageExtensions.runtime" uuid="d91eaf6f-a378-467f-9524-0c201ee2e15f" moduleVersion="0" compileInMPS="true">
+  <models>
+    <modelRoot type="default" contentPath="${module}">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <facets>
+    <facet compile="mps" classes="mps" ext="no" type="java">
+      <classes generated="true" path="${module}/classes_gen" />
+    </facet>
+  </facets>
+  <sourcePath />
+  <languageVersions />
+  <dependencyVersions>
+    <module reference="d91eaf6f-a378-467f-9524-0c201ee2e15f(de.itemis.mps.baseLanguageExtensions.runtime)" version="0" />
+  </dependencyVersions>
+</solution>
+
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
new file mode 100644
index 0000000000..0c90b1452f
--- /dev/null
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:2eaed950-3bc1-47cd-9b02-e917ff994d7c(de.itemis.mps.baseLanguageExtensions.runtime)">
+  <persistence version="9" />
+  <languages />
+  <imports />
+  <registry />
+</model>
+
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/de.itemis.mps.baseLanguageExtensions.sandbox.msd b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/de.itemis.mps.baseLanguageExtensions.sandbox.msd
new file mode 100644
index 0000000000..7e6246874f
--- /dev/null
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/de.itemis.mps.baseLanguageExtensions.sandbox.msd
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solution name="de.itemis.mps.baseLanguageExtensions.sandbox" uuid="46ef3165-951c-4ff0-9259-ca23b5717443" moduleVersion="0" compileInMPS="true">
+  <models>
+    <modelRoot type="default" contentPath="${module}">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <facets>
+    <facet compile="off" classes="off" ext="no" type="java">
+      <classes generated="true" path="${module}/classes_gen" />
+    </facet>
+  </facets>
+  <sourcePath />
+  <languageVersions>
+    <language slang="l:52b771c2-b79f-4f44-98f2-d24fd25a210b:de.itemis.mps.baseLanguageExtensions" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="46ef3165-951c-4ff0-9259-ca23b5717443(de.itemis.mps.baseLanguageExtensions.sandbox)" version="0" />
+  </dependencyVersions>
+</solution>
+
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
new file mode 100644
index 0000000000..d5384f1224
--- /dev/null
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:dae58e0d-cfc8-4c6e-929d-37b22f4242e5(de.itemis.mps.baseLanguageExtensions.sandbox)">
+  <persistence version="9" />
+  <languages>
+    <use id="52b771c2-b79f-4f44-98f2-d24fd25a210b" name="de.itemis.mps.baseLanguageExtensions" version="0" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl b/code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl
new file mode 100644
index 0000000000..afea30c6ba
--- /dev/null
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<language namespace="de.itemis.mps.baseLanguageExtensions" uuid="52b771c2-b79f-4f44-98f2-d24fd25a210b" languageVersion="0" moduleVersion="0">
+  <models>
+    <modelRoot type="default" contentPath="${module}">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <facets>
+    <facet compile="mps" classes="mps" ext="yes" type="java">
+      <classes generated="true" path="${module}/classes_gen" />
+    </facet>
+  </facets>
+  <accessoryModels />
+  <generators>
+    <generator alias="main" namespace="de.itemis.mps.baseLanguageExtensions.generator" uuid="0c2a16a3-4205-4401-a2b4-4af76e67fa52">
+      <models>
+        <modelRoot type="default" contentPath="${module}/generator">
+          <sourceRoot location="templates" />
+        </modelRoot>
+      </models>
+      <facets>
+        <facet compile="mps" classes="mps" ext="no" type="java">
+          <classes generated="true" path="${module}/generator/classes_gen" />
+        </facet>
+      </facets>
+      <external-templates />
+      <languageVersions>
+        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
+        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
+        <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
+        <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
+        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
+        <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
+        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+      </languageVersions>
+      <dependencyVersions>
+        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+        <module reference="52b771c2-b79f-4f44-98f2-d24fd25a210b(de.itemis.mps.baseLanguageExtensions)" version="0" />
+        <module reference="0c2a16a3-4205-4401-a2b4-4af76e67fa52(de.itemis.mps.baseLanguageExtensions.generator)" version="0" />
+        <module reference="d91eaf6f-a378-467f-9524-0c201ee2e15f(de.itemis.mps.baseLanguageExtensions.runtime)" version="0" />
+        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+      </dependencyVersions>
+      <mapping-priorities />
+    </generator>
+  </generators>
+  <sourcePath />
+  <languageVersions>
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
+    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
+    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
+    <language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
+    <language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />
+    <language slang="l:5dae8159-ab99-46bb-a40d-0cee30ee7018:jetbrains.mps.lang.constraints.rules.kinds" version="0" />
+    <language slang="l:134c38d4-e3af-4d9e-b069-1c7df0a4005d:jetbrains.mps.lang.constraints.rules.skeleton" version="0" />
+    <language slang="l:3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7:jetbrains.mps.lang.context" version="0" />
+    <language slang="l:ea3159bf-f48e-4720-bde2-86dba75f0d34:jetbrains.mps.lang.context.defs" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
+    <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
+    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
+    <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
+    <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
+    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="52b771c2-b79f-4f44-98f2-d24fd25a210b(de.itemis.mps.baseLanguageExtensions)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
+  </dependencyVersions>
+  <runtime>
+    <dependency reexport="false">d91eaf6f-a378-467f-9524-0c201ee2e15f(de.itemis.mps.baseLanguageExtensions.runtime)</dependency>
+  </runtime>
+  <extendedLanguages />
+</language>
+
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
new file mode 100644
index 0000000000..8f7a495efd
--- /dev/null
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:e9626ecf-a0aa-465d-b5a3-3e84bb263ef5(de.itemis.mps.baseLanguageExtensions.generator.templates@generator)">
+  <persistence version="9" />
+  <languages>
+    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
+  </languages>
+  <imports>
+    <import index="pkab" ref="r:63a6d225-96f6-404a-a9eb-033dc2f950a1(de.itemis.mps.baseLanguageExtensions.structure)" />
+  </imports>
+  <registry>
+    <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
+      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="bUwia" id="7EVAkaCx$5S">
+    <property role="TrG5h" value="main" />
+  </node>
+</model>
+
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.behavior.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.behavior.mps
new file mode 100644
index 0000000000..7f614722fa
--- /dev/null
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.behavior.mps
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:91c9eafb-fc30-4be3-97fa-867edc800c16(de.itemis.mps.baseLanguageExtensions.behavior)">
+  <persistence version="9" />
+  <languages>
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
+    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.constraints.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.constraints.mps
new file mode 100644
index 0000000000..679c51f0a5
--- /dev/null
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.constraints.mps
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:ef77ae2b-58ea-4c2a-9bab-de7fe5ec2b15(de.itemis.mps.baseLanguageExtensions.constraints)">
+  <persistence version="9" />
+  <languages>
+    <use id="5dae8159-ab99-46bb-a40d-0cee30ee7018" name="jetbrains.mps.lang.constraints.rules.kinds" version="0" />
+    <use id="ea3159bf-f48e-4720-bde2-86dba75f0d34" name="jetbrains.mps.lang.context.defs" version="0" />
+    <use id="e51810c5-7308-4642-bcb6-469e61b5dd18" name="jetbrains.mps.lang.constraints.msg.specification" version="0" />
+    <use id="134c38d4-e3af-4d9e-b069-1c7df0a4005d" name="jetbrains.mps.lang.constraints.rules.skeleton" version="0" />
+    <use id="b3551702-269c-4f05-ba61-58060cef4292" name="jetbrains.mps.lang.rulesAndMessages" version="0" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="6" />
+    <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
+    <use id="3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7" name="jetbrains.mps.lang.context" version="0" />
+    <use id="ad93155d-79b2-4759-b10c-55123e763903" name="jetbrains.mps.lang.messages" version="0" />
+    <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.editor.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.editor.mps
new file mode 100644
index 0000000000..53986484dd
--- /dev/null
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.editor.mps
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:dca4ef47-9ba9-4d6c-8e06-d355b171ecdd(de.itemis.mps.baseLanguageExtensions.editor)">
+  <persistence version="9" />
+  <languages>
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
new file mode 100644
index 0000000000..1ba35fe152
--- /dev/null
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:63a6d225-96f6-404a-a9eb-033dc2f950a1(de.itemis.mps.baseLanguageExtensions.structure)">
+  <persistence version="9" />
+  <languages>
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
new file mode 100644
index 0000000000..751a1bac42
--- /dev/null
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:fabdbbcc-ff78-4a0f-be5a-f7fa3e3a6127(de.itemis.mps.baseLanguageExtensions.typesystem)">
+  <persistence version="9" />
+  <languages>
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
+    <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd
new file mode 100644
index 0000000000..19024306e2
--- /dev/null
+++ b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solution name="de.itemis.mps.baseLanguageExtensions.test" uuid="6f208df3-71dd-4d85-97d4-cc55c1d5b8e4" moduleVersion="0" compileInMPS="true">
+  <models>
+    <modelRoot type="default" contentPath="${module}">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <facets>
+    <facet compile="mps" classes="mps" ext="no" type="java">
+      <classes generated="true" path="${module}/classes_gen" />
+    </facet>
+  </facets>
+  <sourcePath />
+  <languageVersions />
+  <dependencyVersions>
+    <module reference="6f208df3-71dd-4d85-97d4-cc55c1d5b8e4(de.itemis.mps.baseLanguageExtensions.test)" version="0" />
+  </dependencyVersions>
+</solution>
+

From c15d85b20eb75d4a9b3f7e54e6cf548cf0fbe9bc Mon Sep 17 00:00:00 2001
From: Amin Ait Lamqadem <alamqadem@itemis.de>
Date: Wed, 24 Sep 2025 09:52:01 +0200
Subject: [PATCH 02/18] Add baseLanguageExtensions to build script

---
 .../models/de.itemis.mps.extensions.build.mps | 305 ++++++++++++++++++
 1 file changed, 305 insertions(+)

diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
index de52303d02..35d1eb4674 100644
--- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
+++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -9683,6 +9683,190 @@
         </node>
       </node>
     </node>
+    <node concept="m$_wf" id="vJfcQmbzgw" role="3989C9">
+      <property role="m$_wk" value="de.itemis.mps.baseLanguageExtensions" />
+      <node concept="3_J27D" id="vJfcQmbzgx" role="m$_yQ">
+        <node concept="3Mxwew" id="vJfcQmbzgy" role="3MwsjC">
+          <property role="3MwjfP" value="MPS BaseLanguage Extensions" />
+        </node>
+      </node>
+      <node concept="3_J27D" id="vJfcQmbzgz" role="m_cZH">
+        <node concept="3Mxwew" id="vJfcQmbzg$" role="3MwsjC">
+          <property role="3MwjfP" value="de.itemis.mps.baseLanguageExtensions" />
+        </node>
+      </node>
+      <node concept="3_J27D" id="vJfcQmbzg_" role="m$_w8">
+        <node concept="3Mxwey" id="vJfcQmbzgA" role="3MwsjC">
+          <ref role="3Mxwex" node="4MKCCgA1ncQ" resolve="versionNumber" />
+        </node>
+      </node>
+      <node concept="3_J27D" id="vJfcQmbzgB" role="3s6cr7">
+        <node concept="3Mxwew" id="vJfcQmbzgC" role="3MwsjC">
+          <property role="3MwjfP" value="Adds various operators to the language BaseLanguage" />
+        </node>
+      </node>
+      <node concept="m$f5U" id="vJfcQmbzgD" role="m$_yh">
+        <ref role="m$f5T" node="vJfcQmbzfe" resolve="de.itemis.mps.baseLanguageExtensions" />
+      </node>
+      <node concept="m$_yC" id="vJfcQmbzgE" role="m$_yJ">
+        <ref role="m$_y1" to="ffeo:4k71ibbKLe8" resolve="jetbrains.mps.core" />
+      </node>
+      <node concept="2iUeEo" id="vJfcQmbzgF" role="2iVFfd">
+        <property role="2iUeEt" value="itemis AG" />
+        <property role="2iUeEu" value="https://www.itemis.com/en/it-services/methods-and-tools/mps" />
+      </node>
+    </node>
+    <node concept="2G$12M" id="vJfcQmbzfe" role="3989C9">
+      <property role="TrG5h" value="de.itemis.mps.baseLanguageExtensions" />
+      <node concept="1E1JtD" id="vJfcQmbzff" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="de.itemis.mps.baseLanguageExtensions" />
+        <property role="3LESm3" value="52b771c2-b79f-4f44-98f2-d24fd25a210b" />
+        <node concept="398BVA" id="vJfcQmbzfg" role="3LF7KH">
+          <ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
+          <node concept="2Ry0Ak" id="vJfcQmb_ml" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="vJfcQmb_A6" role="2Ry0An">
+              <property role="2Ry0Am" value="de.itemis.mps.baseLanguageExtensions" />
+              <node concept="2Ry0Ak" id="vJfcQmb_PR" role="2Ry0An">
+                <property role="2Ry0Am" value="de.itemis.mps.baseLanguageExtensions.mpl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3rtmxn" id="vJfcQmbzfl" role="3bR31x">
+          <node concept="3LXTmp" id="vJfcQmbzfm" role="3rtmxm">
+            <node concept="398BVA" id="vJfcQmbzfn" role="3LXTmr">
+              <ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="vJfcQmbzfo" role="iGT6I">
+                <property role="2Ry0Am" value="pagination" />
+                <node concept="2Ry0Ak" id="vJfcQmbzfp" role="2Ry0An">
+                  <property role="2Ry0Am" value="languages" />
+                  <node concept="2Ry0Ak" id="vJfcQmbzfq" role="2Ry0An">
+                    <property role="2Ry0Am" value="de.itemis.mps.editor.pagination" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="vJfcQmbzfr" role="3LXTna">
+              <property role="3qWCbO" value="icons/**" />
+            </node>
+          </node>
+        </node>
+        <node concept="1BupzO" id="vJfcQmbzfu" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="vJfcQmbAFg" role="1HemKq">
+            <node concept="398BVA" id="vJfcQmbAF7" role="3LXTmr">
+              <ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="vJfcQmbAF8" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="vJfcQmbAF9" role="2Ry0An">
+                  <property role="2Ry0Am" value="de.itemis.mps.baseLanguageExtensions" />
+                  <node concept="2Ry0Ak" id="vJfcQmbAFa" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="vJfcQmbAFh" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="1yeLz9" id="vJfcQmbzfC" role="1TViLv">
+          <property role="TrG5h" value="de.itemis.mps.baseLanguageExtensions.generator" />
+          <property role="3LESm3" value="0c2a16a3-4205-4401-a2b4-4af76e67fa52" />
+          <node concept="1BupzO" id="vJfcQmbzfD" role="3bR31x">
+            <property role="3ZfqAx" value="generator/templates" />
+            <property role="1Hdu6h" value="true" />
+            <property role="1HemKv" value="true" />
+            <node concept="3LXTmp" id="vJfcQmbAFt" role="1HemKq">
+              <node concept="398BVA" id="vJfcQmbAFi" role="3LXTmr">
+                <ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
+                <node concept="2Ry0Ak" id="vJfcQmbAFj" role="iGT6I">
+                  <property role="2Ry0Am" value="languages" />
+                  <node concept="2Ry0Ak" id="vJfcQmbAFk" role="2Ry0An">
+                    <property role="2Ry0Am" value="de.itemis.mps.baseLanguageExtensions" />
+                    <node concept="2Ry0Ak" id="vJfcQmbAFl" role="2Ry0An">
+                      <property role="2Ry0Am" value="generator" />
+                      <node concept="2Ry0Ak" id="vJfcQmbAFm" role="2Ry0An">
+                        <property role="2Ry0Am" value="templates" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3qWCbU" id="vJfcQmbAFu" role="3LXTna">
+                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1E0d5M" id="vJfcQmbzfS" role="1E1XAP">
+          <ref role="1E0d5P" node="vJfcQmbzfZ" resolve="de.itemis.mps.editor.pagination.runtime" />
+        </node>
+      </node>
+      <node concept="1E1JtA" id="vJfcQmbzfZ" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="de.itemis.mps.baseLanguageExtensions.runtime" />
+        <property role="3LESm3" value="d91eaf6f-a378-467f-9524-0c201ee2e15f" />
+        <node concept="398BVA" id="vJfcQmbzg0" role="3LF7KH">
+          <ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
+          <node concept="2Ry0Ak" id="vJfcQmbBiO" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="vJfcQmbBy_" role="2Ry0An">
+              <property role="2Ry0Am" value="de.itemis.mps.baseLanguageExtensions.runtime" />
+              <node concept="2Ry0Ak" id="vJfcQmbBMm" role="2Ry0An">
+                <property role="2Ry0Am" value="de.itemis.mps.baseLanguageExtensions.runtime.msd" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1BupzO" id="vJfcQmbzgb" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="vJfcQmbDnd" role="1HemKq">
+            <node concept="398BVA" id="vJfcQmbDn4" role="3LXTmr">
+              <ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="vJfcQmbDn5" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="vJfcQmbDn6" role="2Ry0An">
+                  <property role="2Ry0Am" value="de.itemis.mps.baseLanguageExtensions.runtime" />
+                  <node concept="2Ry0Ak" id="vJfcQmbDn7" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="vJfcQmbDne" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="3rtmxn" id="vJfcQmbzgp" role="3bR31x">
+          <node concept="3LXTmp" id="vJfcQmbzgq" role="3rtmxm">
+            <node concept="3qWCbU" id="vJfcQmbzgr" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="vJfcQmbzgs" role="3LXTmr">
+              <ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="vJfcQmbzgt" role="iGT6I">
+                <property role="2Ry0Am" value="pagination" />
+                <node concept="2Ry0Ak" id="vJfcQmbzgu" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="vJfcQmbzgv" role="2Ry0An">
+                    <property role="2Ry0Am" value="de.itemis.mps.editor.pagination.runtime" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="m$_wf" id="5Jv8_iJNYP8" role="3989C9">
       <property role="m$_wk" value="de.itemis.mps.spellcheck" />
       <node concept="3_J27D" id="5Jv8_iJNYP9" role="m$_yQ">
@@ -16672,6 +16856,10 @@
         <ref role="m_rDy" node="6lSuB9eYUwh" resolve="de.itemis.mps.editor.pagination" />
         <node concept="pUk6x" id="6lSuB9eYZaj" role="pUk7w" />
       </node>
+      <node concept="m$_wl" id="vJfcQmbEoh" role="39821P">
+        <ref role="m_rDy" node="vJfcQmbzgw" resolve="de.itemis.mps.baseLanguageExtensions" />
+        <node concept="pUk6x" id="vJfcQmbEoi" role="pUk7w" />
+      </node>
       <node concept="m$_wl" id="5Jv8_iJO3MF" role="39821P">
         <ref role="m_rDy" node="5Jv8_iJNYP8" resolve="de.itemis.mps.spellcheck" />
         <node concept="pUk6x" id="5Jv8_iJO3MG" role="pUk7w" />
@@ -19501,6 +19689,78 @@
         </node>
       </node>
     </node>
+    <node concept="2G$12M" id="vJfcQmbELP" role="3989C9">
+      <property role="TrG5h" value="baseLanguageExtensions-tests" />
+      <node concept="1E1JtA" id="vJfcQmbELQ" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="de.itemis.mps.baseLanguageExtensions.test" />
+        <property role="3LESm3" value="6f208df3-71dd-4d85-97d4-cc55c1d5b8e4" />
+        <property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
+        <node concept="398BVA" id="vJfcQmbELR" role="3LF7KH">
+          <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+          <node concept="2Ry0Ak" id="vJfcQmbEPP" role="iGT6I">
+            <property role="2Ry0Am" value="solutions" />
+            <node concept="2Ry0Ak" id="vJfcQmbEQE" role="2Ry0An">
+              <property role="2Ry0Am" value="de.itemis.mps.baseLanguageExtensions.test" />
+              <node concept="2Ry0Ak" id="vJfcQmbFkK" role="2Ry0An">
+                <property role="2Ry0Am" value="de.itemis.mps.baseLanguageExtensions.test.msd" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1BupzO" id="vJfcQmbEM0" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="vJfcQmbFwa" role="1HemKq">
+            <node concept="398BVA" id="vJfcQmbFvW" role="3LXTmr">
+              <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="vJfcQmbFvX" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="vJfcQmbFvY" role="2Ry0An">
+                  <property role="2Ry0Am" value="de.itemis.mps.baseLanguageExtensions.test" />
+                  <node concept="2Ry0Ak" id="vJfcQmbFvZ" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="vJfcQmbFwb" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="3rtmxn" id="vJfcQmbEM8" role="3bR31x">
+          <node concept="3LXTmp" id="vJfcQmbEM9" role="3rtmxm">
+            <node concept="3qWCbU" id="vJfcQmbEMa" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="vJfcQmbEMb" role="3LXTmr">
+              <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="vJfcQmbEMc" role="iGT6I">
+                <property role="2Ry0Am" value="pagination" />
+                <node concept="2Ry0Ak" id="vJfcQmbEMd" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="vJfcQmbEMe" role="2Ry0An">
+                    <property role="2Ry0Am" value="de.itemis.mps.editor.pagination.test" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="vJfcQmgs$G" role="3bR37C">
+          <node concept="3bR9La" id="vJfcQmgs$H" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="vJfcQmgs$I" role="3bR37C">
+          <node concept="3bR9La" id="vJfcQmgs$J" role="1SiIV1">
+            <ref role="3bR37D" node="vJfcQmbzfZ" resolve="de.itemis.mps.baseLanguageExtensions.runtime" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2G$12M" id="4JmkJs3GrYV" role="3989C9">
       <property role="TrG5h" value="shadowmodels-tests" />
       <node concept="1E1JtA" id="4JmkJs3Gs4u" role="2G$12L">
@@ -22491,6 +22751,45 @@
           </node>
         </node>
       </node>
+      <node concept="1E1JtA" id="vJfcQmbFNu" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="de.itemis.mps.baseLanguageExtensions.sandbox" />
+        <property role="3LESm3" value="46ef3165-951c-4ff0-9259-ca23b5717443" />
+        <node concept="398BVA" id="vJfcQmbFOb" role="3LF7KH">
+          <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+          <node concept="2Ry0Ak" id="vJfcQmbFP1" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="vJfcQmbFRr" role="2Ry0An">
+              <property role="2Ry0Am" value="de.itemis.mps.baseLanguageExtensions.sandbox" />
+              <node concept="2Ry0Ak" id="vJfcQmbFSg" role="2Ry0An">
+                <property role="2Ry0Am" value="de.itemis.mps.baseLanguageExtensions.sandbox.msd" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1BupzO" id="vJfcQmbGlE" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="vJfcQmbGlF" role="1HemKq">
+            <node concept="398BVA" id="vJfcQmbGls" role="3LXTmr">
+              <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="vJfcQmbGlt" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="vJfcQmbGlu" role="2Ry0An">
+                  <property role="2Ry0Am" value="de.itemis.mps.baseLanguageExtensions.sandbox" />
+                  <node concept="2Ry0Ak" id="vJfcQmbGlv" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="vJfcQmbGlG" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="1E1JtD" id="4zIvKyx$cVb" role="2G$12L">
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="com.mbeddr.mpsutil.intentions.sandboxlang" />
@@ -22965,6 +23264,9 @@
       <node concept="L2wRC" id="7NiuBZ$i0Mf" role="39821P">
         <ref role="L2wRA" node="7NiuBZ$i0jE" resolve="de.itemis.mps.editor.pagination.test" />
       </node>
+      <node concept="L2wRC" id="vJfcQmbGmN" role="39821P">
+        <ref role="L2wRA" node="vJfcQmbELQ" resolve="de.itemis.mps.baseLanguageExtensions.test" />
+      </node>
       <node concept="L2wRC" id="6wECU8wthq9" role="39821P">
         <ref role="L2wRA" node="6wECU8wth18" resolve="third.party.usage.test" />
       </node>
@@ -23075,6 +23377,9 @@
       <node concept="22LTRM" id="7NiuBZ$i0Ql" role="22LTRK">
         <ref role="22LTRN" node="7NiuBZ$i0jE" resolve="de.itemis.mps.editor.pagination.test" />
       </node>
+      <node concept="22LTRM" id="vJfcQmbGnA" role="22LTRK">
+        <ref role="22LTRN" node="vJfcQmbELQ" resolve="de.itemis.mps.baseLanguageExtensions.test" />
+      </node>
     </node>
   </node>
 </model>

From 827f754c0caf1d70d4194368c209404b9a9bf0b3 Mon Sep 17 00:00:00 2001
From: Dennis Albrecht <dalbrecht@itemis.com>
Date: Tue, 23 Sep 2025 18:13:48 +0200
Subject: [PATCH 03/18] included ElvisOperator runtime

---
 ...mis.mps.baseLanguageExtensions.runtime.msd |   7 +-
 ...mis.mps.baseLanguageExtensions.runtime.mps | 122 ++++++-
 ...itemis.mps.baseLanguageExtensions.test.msd |  16 +-
 ...ageExtensions.test.elvisOperator@tests.mps | 341 ++++++++++++++++++
 4 files changed, 482 insertions(+), 4 deletions(-)
 create mode 100644 code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.elvisOperator@tests.mps

diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
index 5a4fff2452..52fa4b7239 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
@@ -11,7 +11,12 @@
     </facet>
   </facets>
   <sourcePath />
-  <languageVersions />
+  <languageVersions>
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+  </languageVersions>
   <dependencyVersions>
     <module reference="d91eaf6f-a378-467f-9524-0c201ee2e15f(de.itemis.mps.baseLanguageExtensions.runtime)" version="0" />
   </dependencyVersions>
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
index 0c90b1452f..d4fb02ee13 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
@@ -1,8 +1,126 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:2eaed950-3bc1-47cd-9b02-e917ff994d7c(de.itemis.mps.baseLanguageExtensions.runtime)">
   <persistence version="9" />
-  <languages />
+  <languages>
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+  </languages>
   <imports />
-  <registry />
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ" />
+      <concept id="1109279851642" name="jetbrains.mps.baseLanguage.structure.GenericDeclaration" flags="ng" index="16eOlS">
+        <child id="1109279881614" name="typeVariableDeclaration" index="16eVyc" />
+      </concept>
+      <concept id="1109283449304" name="jetbrains.mps.baseLanguage.structure.TypeVariableReference" flags="in" index="16syzq">
+        <reference id="1109283546497" name="typeVariableDeclaration" index="16sUi3" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="1225271221393" name="jetbrains.mps.baseLanguage.structure.NPENotEqualsExpression" flags="nn" index="17QLQc" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
+        <child id="1199542457201" name="resultType" index="1ajl9A" />
+      </concept>
+      <concept id="1225797177491" name="jetbrains.mps.baseLanguage.closures.structure.InvokeFunctionOperation" flags="nn" index="1Bd96e" />
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="312cEu" id="w6MstBXH_b">
+    <property role="TrG5h" value="ElvisOperationUtil" />
+    <node concept="2YIFZL" id="w6MstBXHAP" role="jymVt">
+      <property role="TrG5h" value="apply" />
+      <node concept="3clFbS" id="w6MstBXHAS" role="3clF47">
+        <node concept="3clFbJ" id="w6MstBXHFJ" role="3cqZAp">
+          <node concept="17QLQc" id="w6MstBXHNb" role="3clFbw">
+            <node concept="37vLTw" id="w6MstBXHGY" role="3uHU7B">
+              <ref role="3cqZAo" node="w6MstBXHCr" resolve="lhs" />
+            </node>
+            <node concept="10Nm6u" id="w6MstBXHMy" role="3uHU7w" />
+          </node>
+          <node concept="3clFbS" id="w6MstBXHFL" role="3clFbx">
+            <node concept="3cpWs6" id="w6MstBXHOy" role="3cqZAp">
+              <node concept="37vLTw" id="w6MstBXHQO" role="3cqZAk">
+                <ref role="3cqZAo" node="w6MstBXHCr" resolve="lhs" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="w6MstBXHSF" role="3cqZAp">
+          <node concept="2OqwBi" id="w6MstBXHVy" role="3cqZAk">
+            <node concept="37vLTw" id="w6MstBXHUi" role="2Oq$k0">
+              <ref role="3cqZAo" node="w6MstBXHDe" resolve="rhs" />
+            </node>
+            <node concept="1Bd96e" id="w6MstBXHY4" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="w6MstBXHAi" role="1B3o_S" />
+      <node concept="16syzq" id="w6MstBXHBZ" role="3clF45">
+        <ref role="16sUi3" node="w6MstBXHBl" resolve="T" />
+      </node>
+      <node concept="16euLQ" id="w6MstBXHBl" role="16eVyc">
+        <property role="TrG5h" value="T" />
+      </node>
+      <node concept="37vLTG" id="w6MstBXHCr" role="3clF46">
+        <property role="TrG5h" value="lhs" />
+        <node concept="16syzq" id="w6MstBXHCq" role="1tU5fm">
+          <ref role="16sUi3" node="w6MstBXHBl" resolve="T" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="w6MstBXHDe" role="3clF46">
+        <property role="TrG5h" value="rhs" />
+        <node concept="1ajhzC" id="w6MstBXHEb" role="1tU5fm">
+          <node concept="16syzq" id="w6MstBXHEB" role="1ajl9A">
+            <ref role="16sUi3" node="w6MstBXHBl" resolve="T" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="w6MstBXH_c" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd
index 19024306e2..9dfa590493 100644
--- a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd
+++ b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd
@@ -11,8 +11,22 @@
     </facet>
   </facets>
   <sourcePath />
-  <languageVersions />
+  <dependencies>
+    <dependency reexport="false">d91eaf6f-a378-467f-9524-0c201ee2e15f(de.itemis.mps.baseLanguageExtensions.runtime)</dependency>
+    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+  </dependencies>
+  <languageVersions>
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
+    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+  </languageVersions>
   <dependencyVersions>
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="d91eaf6f-a378-467f-9524-0c201ee2e15f(de.itemis.mps.baseLanguageExtensions.runtime)" version="0" />
     <module reference="6f208df3-71dd-4d85-97d4-cc55c1d5b8e4(de.itemis.mps.baseLanguageExtensions.test)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.elvisOperator@tests.mps b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.elvisOperator@tests.mps
new file mode 100644
index 0000000000..719bf9d529
--- /dev/null
+++ b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.elvisOperator@tests.mps
@@ -0,0 +1,341 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:e155915b-469c-4f65-8ff6-a3dceadbfe03(de.itemis.mps.baseLanguageExtensions.test.elvisOperator@tests)">
+  <persistence version="9" />
+  <languages>
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
+    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+  </languages>
+  <imports>
+    <import index="96gm" ref="r:2eaed950-3bc1-47cd-9b02-e917ff994d7c(de.itemis.mps.baseLanguageExtensions.runtime)" />
+    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1239714755177" name="jetbrains.mps.baseLanguage.structure.AbstractUnaryNumberOperation" flags="nn" index="2$Kvd9">
+        <child id="1239714902950" name="expression" index="2$L3a6" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
+      <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
+        <child id="1199542457201" name="resultType" index="1ajl9A" />
+      </concept>
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
+    <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
+      <concept id="1171931690126" name="jetbrains.mps.baseLanguage.unitTest.structure.TestMethod" flags="ig" index="3s$Bmu">
+        <property id="1171931690128" name="methodName" index="3s$Bm0" />
+      </concept>
+      <concept id="1171931851043" name="jetbrains.mps.baseLanguage.unitTest.structure.BTestCase" flags="ig" index="3s_ewN">
+        <property id="1171931851045" name="testCaseName" index="3s_ewP" />
+        <child id="1171931851044" name="testMethodList" index="3s_ewO" />
+      </concept>
+      <concept id="1171931858461" name="jetbrains.mps.baseLanguage.unitTest.structure.TestMethodList" flags="ng" index="3s_gsd">
+        <child id="1171931858462" name="testMethod" index="3s_gse" />
+      </concept>
+      <concept id="8427750732757990717" name="jetbrains.mps.baseLanguage.unitTest.structure.BinaryAssert" flags="nn" index="3tpDYu">
+        <child id="8427750732757990725" name="actual" index="3tpDZA" />
+        <child id="8427750732757990724" name="expected" index="3tpDZB" />
+      </concept>
+      <concept id="1171978097730" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertEquals" flags="nn" index="3vlDli" />
+      <concept id="1172017222794" name="jetbrains.mps.baseLanguage.unitTest.structure.Fail" flags="nn" index="3xETmq" />
+      <concept id="1172073500303" name="jetbrains.mps.baseLanguage.unitTest.structure.Message" flags="ng" index="3_1$Yv">
+        <child id="1172073511101" name="message" index="3_1BAH" />
+      </concept>
+      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ng" index="3_9gw8">
+        <child id="1172075534298" name="message" index="3_9lra" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="3s_ewN" id="w6MstBY8cQ">
+    <property role="3s_ewP" value="ElvisOperation" />
+    <node concept="3Tm1VV" id="w6MstBY8cR" role="1B3o_S" />
+    <node concept="3s_gsd" id="w6MstBY8cS" role="3s_ewO">
+      <node concept="3s$Bmu" id="w6MstBY8dD" role="3s_gse">
+        <property role="3s$Bm0" value="rightHandSideIsEvaluatedOnce" />
+        <node concept="3cqZAl" id="w6MstBY8dE" role="3clF45" />
+        <node concept="3Tm1VV" id="w6MstBY8dF" role="1B3o_S" />
+        <node concept="3clFbS" id="w6MstBY8dG" role="3clF47">
+          <node concept="3cpWs8" id="w6MstBY8gc" role="3cqZAp">
+            <node concept="3cpWsn" id="w6MstBY8gf" role="3cpWs9">
+              <property role="TrG5h" value="lhs" />
+              <node concept="17QB3L" id="w6MstBY8ga" role="1tU5fm" />
+              <node concept="10Nm6u" id="w6MstBY8h3" role="33vP2m" />
+            </node>
+          </node>
+          <node concept="3cpWs8" id="w6MstBY8eg" role="3cqZAp">
+            <node concept="3cpWsn" id="w6MstBY8ej" role="3cpWs9">
+              <property role="TrG5h" value="counter" />
+              <node concept="10Oyi0" id="w6MstBY8ef" role="1tU5fm" />
+              <node concept="3cmrfG" id="w6MstBY8eV" role="33vP2m">
+                <property role="3cmrfH" value="0" />
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="w6MstBY9rF" role="3cqZAp">
+            <node concept="3cpWsn" id="w6MstBY9rG" role="3cpWs9">
+              <property role="TrG5h" value="rhs" />
+              <node concept="1ajhzC" id="w6MstBY9rD" role="1tU5fm">
+                <node concept="10Oyi0" id="w6MstBY9rE" role="1ajl9A" />
+              </node>
+              <node concept="1bVj0M" id="w6MstBY9rH" role="33vP2m">
+                <node concept="3clFbS" id="w6MstBY9rI" role="1bW5cS">
+                  <node concept="3clFbF" id="w6MstBY9rJ" role="3cqZAp">
+                    <node concept="3uNrnE" id="w6MstBY9rK" role="3clFbG">
+                      <node concept="37vLTw" id="w6MstBY9rL" role="2$L3a6">
+                        <ref role="3cqZAo" node="w6MstBY8ej" resolve="counter" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="w6MstBY9t3" role="3cqZAp" />
+          <node concept="3clFbF" id="w6MstBY9tN" role="3cqZAp">
+            <node concept="2YIFZM" id="w6MstBY9BY" role="3clFbG">
+              <ref role="37wK5l" to="96gm:w6MstBXHAP" resolve="apply" />
+              <ref role="1Pybhc" to="96gm:w6MstBXH_b" resolve="ElvisOperationUtil" />
+              <node concept="37vLTw" id="w6MstBY9Cm" role="37wK5m">
+                <ref role="3cqZAo" node="w6MstBY8gf" resolve="lhs" />
+              </node>
+              <node concept="37vLTw" id="w6MstBY9Mo" role="37wK5m">
+                <ref role="3cqZAo" node="w6MstBY9rG" resolve="rhs" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="w6MstBYdu3" role="3cqZAp" />
+          <node concept="3vlDli" id="w6MstBYdQK" role="3cqZAp">
+            <node concept="3cmrfG" id="w6MstBYefu" role="3tpDZB">
+              <property role="3cmrfH" value="1" />
+            </node>
+            <node concept="37vLTw" id="w6MstBYexV" role="3tpDZA">
+              <ref role="3cqZAo" node="w6MstBY8ej" resolve="counter" />
+            </node>
+            <node concept="3_1$Yv" id="w6MstBYvYA" role="3_9lra">
+              <node concept="Xl_RD" id="w6MstBYwoB" role="3_1BAH">
+                <property role="Xl_RC" value="right hand side was not evaluated or more than once" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3s$Bmu" id="w6MstBYeUt" role="3s_gse">
+        <property role="3s$Bm0" value="rightHandSideIsNotEvaluated" />
+        <node concept="3cqZAl" id="w6MstBYeUu" role="3clF45" />
+        <node concept="3Tm1VV" id="w6MstBYeUv" role="1B3o_S" />
+        <node concept="3clFbS" id="w6MstBYeUw" role="3clF47">
+          <node concept="3cpWs8" id="w6MstBYfis" role="3cqZAp">
+            <node concept="3cpWsn" id="w6MstBYfiv" role="3cpWs9">
+              <property role="TrG5h" value="lhs" />
+              <node concept="17QB3L" id="w6MstBYfir" role="1tU5fm" />
+              <node concept="Xl_RD" id="w6MstBYrDO" role="33vP2m">
+                <property role="Xl_RC" value="" />
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="w6MstBYfka" role="3cqZAp">
+            <node concept="3cpWsn" id="w6MstBYfkd" role="3cpWs9">
+              <property role="TrG5h" value="rhs" />
+              <node concept="1ajhzC" id="w6MstBYfk6" role="1tU5fm">
+                <node concept="10Oyi0" id="w6MstBYfko" role="1ajl9A" />
+              </node>
+              <node concept="1bVj0M" id="w6MstBYfld" role="33vP2m">
+                <node concept="3clFbS" id="w6MstBYflf" role="1bW5cS">
+                  <node concept="3xETmq" id="w6MstBYfnP" role="3cqZAp">
+                    <node concept="3_1$Yv" id="w6MstBYfoz" role="3_9lra">
+                      <node concept="Xl_RD" id="w6MstBYfr2" role="3_1BAH">
+                        <property role="Xl_RC" value="right hand side was evaluated where it shouldn't have been" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cpWs6" id="w6MstBYf_2" role="3cqZAp">
+                    <node concept="3cmrfG" id="w6MstBYfB2" role="3cqZAk">
+                      <property role="3cmrfH" value="0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="w6MstBYfBT" role="3cqZAp" />
+          <node concept="3clFbF" id="w6MstBYfCs" role="3cqZAp">
+            <node concept="2YIFZM" id="w6MstBYfCR" role="3clFbG">
+              <ref role="37wK5l" to="96gm:w6MstBXHAP" resolve="apply" />
+              <ref role="1Pybhc" to="96gm:w6MstBXH_b" resolve="ElvisOperationUtil" />
+              <node concept="37vLTw" id="w6MstBYfTz" role="37wK5m">
+                <ref role="3cqZAo" node="w6MstBYfiv" resolve="lhs" />
+              </node>
+              <node concept="37vLTw" id="w6MstBYg0t" role="37wK5m">
+                <ref role="3cqZAo" node="w6MstBYfkd" resolve="rhs" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3s$Bmu" id="w6MstBYF12" role="3s_gse">
+        <property role="3s$Bm0" value="rightHandSideIsReturned" />
+        <node concept="3cqZAl" id="w6MstBYF13" role="3clF45" />
+        <node concept="3Tm1VV" id="w6MstBYF14" role="1B3o_S" />
+        <node concept="3clFbS" id="w6MstBYF15" role="3clF47">
+          <node concept="3cpWs8" id="w6MstBYIJE" role="3cqZAp">
+            <node concept="3cpWsn" id="w6MstBYIJH" role="3cpWs9">
+              <property role="TrG5h" value="lhs" />
+              <node concept="17QB3L" id="w6MstBYIJD" role="1tU5fm" />
+              <node concept="10Nm6u" id="w6MstBYIKB" role="33vP2m" />
+            </node>
+          </node>
+          <node concept="3cpWs8" id="w6MstBYILD" role="3cqZAp">
+            <node concept="3cpWsn" id="w6MstBYILG" role="3cpWs9">
+              <property role="TrG5h" value="rhs" />
+              <node concept="10Oyi0" id="w6MstBYILB" role="1tU5fm" />
+              <node concept="3cmrfG" id="w6MstBYIMd" role="33vP2m">
+                <property role="3cmrfH" value="42" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="w6MstBYIMH" role="3cqZAp" />
+          <node concept="3cpWs8" id="w6MstBYIUL" role="3cqZAp">
+            <node concept="3cpWsn" id="w6MstBYIUM" role="3cpWs9">
+              <property role="TrG5h" value="actual" />
+              <node concept="3uibUv" id="w6MstBYIUN" role="1tU5fm">
+                <ref role="3uigEE" to="guwi:~Serializable" resolve="Serializable" />
+              </node>
+              <node concept="2YIFZM" id="w6MstBYMFS" role="33vP2m">
+                <ref role="37wK5l" to="96gm:w6MstBXHAP" resolve="apply" />
+                <ref role="1Pybhc" to="96gm:w6MstBXH_b" resolve="ElvisOperationUtil" />
+                <node concept="37vLTw" id="w6MstBYMGC" role="37wK5m">
+                  <ref role="3cqZAo" node="w6MstBYIJH" resolve="lhs" />
+                </node>
+                <node concept="1bVj0M" id="w6MstBYMJC" role="37wK5m">
+                  <node concept="3clFbS" id="w6MstBYMJE" role="1bW5cS">
+                    <node concept="3clFbF" id="w6MstBYNmB" role="3cqZAp">
+                      <node concept="37vLTw" id="w6MstBYNmA" role="3clFbG">
+                        <ref role="3cqZAo" node="w6MstBYILG" resolve="rhs" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="w6MstBYQhF" role="3cqZAp" />
+          <node concept="3vlDli" id="w6MstBYR61" role="3cqZAp">
+            <node concept="3cmrfG" id="w6MstBYRvX" role="3tpDZB">
+              <property role="3cmrfH" value="42" />
+            </node>
+            <node concept="37vLTw" id="w6MstBYRU4" role="3tpDZA">
+              <ref role="3cqZAo" node="w6MstBYIUM" resolve="actual" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3s$Bmu" id="w6MstBYSj9" role="3s_gse">
+        <property role="3s$Bm0" value="leftHandSideIsReturned" />
+        <node concept="3cqZAl" id="w6MstBYSja" role="3clF45" />
+        <node concept="3Tm1VV" id="w6MstBYSjb" role="1B3o_S" />
+        <node concept="3clFbS" id="w6MstBYSjc" role="3clF47">
+          <node concept="3cpWs8" id="w6MstBYTrV" role="3cqZAp">
+            <node concept="3cpWsn" id="w6MstBYTrY" role="3cpWs9">
+              <property role="TrG5h" value="lhs" />
+              <node concept="17QB3L" id="w6MstBYTrU" role="1tU5fm" />
+              <node concept="Xl_RD" id="w6MstBYTsp" role="33vP2m">
+                <property role="Xl_RC" value="42" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="w6MstBYTsK" role="3cqZAp" />
+          <node concept="3cpWs8" id="w6MstBYUym" role="3cqZAp">
+            <node concept="3cpWsn" id="w6MstBYUyp" role="3cpWs9">
+              <property role="TrG5h" value="actual" />
+              <node concept="17QB3L" id="w6MstBYUyk" role="1tU5fm" />
+              <node concept="2YIFZM" id="w6MstBYUzH" role="33vP2m">
+                <ref role="37wK5l" to="96gm:w6MstBXHAP" resolve="apply" />
+                <ref role="1Pybhc" to="96gm:w6MstBXH_b" resolve="ElvisOperationUtil" />
+                <node concept="37vLTw" id="w6MstBYUON" role="37wK5m">
+                  <ref role="3cqZAo" node="w6MstBYTrY" resolve="lhs" />
+                </node>
+                <node concept="1bVj0M" id="w6MstBYUPK" role="37wK5m">
+                  <node concept="3clFbS" id="w6MstBYUPM" role="1bW5cS">
+                    <node concept="3clFbF" id="w6MstBYVtw" role="3cqZAp">
+                      <node concept="10Nm6u" id="w6MstBYVtv" role="3clFbG" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="w6MstBYV$L" role="3cqZAp" />
+          <node concept="3vlDli" id="w6MstBYVCr" role="3cqZAp">
+            <node concept="Xl_RD" id="w6MstBYVE1" role="3tpDZB">
+              <property role="Xl_RC" value="42" />
+            </node>
+            <node concept="37vLTw" id="w6MstBYVHi" role="3tpDZA">
+              <ref role="3cqZAo" node="w6MstBYUyp" resolve="actual" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+</model>
+

From 00f1f5150abbe039130125f4178e5a75cf781c09 Mon Sep 17 00:00:00 2001
From: Dennis Albrecht <dalbrecht@itemis.com>
Date: Wed, 24 Sep 2025 10:56:04 +0200
Subject: [PATCH 04/18] added the ElvisOperation as base language operation

---
 .../models/de.itemis.mps.extensions.build.mps |  20 ++
 ...mis.mps.baseLanguageExtensions.sandbox.msd |   6 +
 ...mis.mps.baseLanguageExtensions.sandbox.mps | 215 +++++++++++++++++-
 .../de.itemis.mps.baseLanguageExtensions.mpl  |  17 +-
 ...tensions.generator.templates@generator.mps | 104 ++++++++-
 ...s.mps.baseLanguageExtensions.structure.mps |  29 ++-
 ....mps.baseLanguageExtensions.typesystem.mps | 185 ++++++++++++++-
 7 files changed, 568 insertions(+), 8 deletions(-)

diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
index 35d1eb4674..399805f021 100644
--- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
+++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -9807,6 +9807,21 @@
         <node concept="1E0d5M" id="vJfcQmbzfS" role="1E1XAP">
           <ref role="1E0d5P" node="vJfcQmbzfZ" resolve="de.itemis.mps.editor.pagination.runtime" />
         </node>
+        <node concept="1SiIV0" id="2o8W23R_vC7" role="3bR37C">
+          <node concept="3bR9La" id="2o8W23R_vC8" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2o8W23R_vCi" role="3bR37C">
+          <node concept="1Busua" id="2o8W23R_vCj" role="1SiIV1">
+            <ref role="1Busuk" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2o8W23R_vCk" role="3bR37C">
+          <node concept="Rbm2T" id="2o8W23R_vCl" role="1SiIV1">
+            <ref role="1E1Vl2" to="ffeo:7Kfy9QB6KZG" resolve="jetbrains.mps.baseLanguage.closures" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="vJfcQmbzfZ" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -22789,6 +22804,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="2o8W23R_v97" role="3bR37C">
+          <node concept="3bR9La" id="2o8W23R_v98" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="4zIvKyx$cVb" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/de.itemis.mps.baseLanguageExtensions.sandbox.msd b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/de.itemis.mps.baseLanguageExtensions.sandbox.msd
index 7e6246874f..5c3c6da7d4 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/de.itemis.mps.baseLanguageExtensions.sandbox.msd
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/de.itemis.mps.baseLanguageExtensions.sandbox.msd
@@ -11,11 +11,17 @@
     </facet>
   </facets>
   <sourcePath />
+  <dependencies>
+    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+  </dependencies>
   <languageVersions>
     <language slang="l:52b771c2-b79f-4f44-98f2-d24fd25a210b:de.itemis.mps.baseLanguageExtensions" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="46ef3165-951c-4ff0-9259-ca23b5717443(de.itemis.mps.baseLanguageExtensions.sandbox)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
index d5384f1224..cccb416919 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
@@ -3,8 +3,219 @@
   <persistence version="9" />
   <languages>
     <use id="52b771c2-b79f-4f44-98f2-d24fd25a210b" name="de.itemis.mps.baseLanguageExtensions" version="0" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
-  <imports />
-  <registry />
+  <imports>
+    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
+      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
+        <child id="1070534934091" name="type" index="10QFUM" />
+        <child id="1070534934092" name="expression" index="10QFUP" />
+      </concept>
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+    </language>
+    <language id="52b771c2-b79f-4f44-98f2-d24fd25a210b" name="de.itemis.mps.baseLanguageExtensions">
+      <concept id="578371460444482140" name="de.itemis.mps.baseLanguageExtensions.structure.ElvisOperation" flags="ng" index="1w0Eer" />
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="312cEu" id="w6MstC1zab">
+    <property role="TrG5h" value="ElvisOperationSandbox" />
+    <node concept="2YIFZL" id="w6MstC1zl9" role="jymVt">
+      <property role="TrG5h" value="usage" />
+      <node concept="3clFbS" id="w6MstC1zlc" role="3clF47">
+        <node concept="3cpWs8" id="w6MstC1zih" role="3cqZAp">
+          <node concept="3cpWsn" id="w6MstC1zii" role="3cpWs9">
+            <property role="TrG5h" value="result" />
+            <node concept="17QB3L" id="w6MstC1Nv0" role="1tU5fm" />
+            <node concept="1w0Eer" id="w6MstC1zbY" role="33vP2m">
+              <node concept="Xl_RD" id="w6MstC1zcA" role="3uHU7B">
+                <property role="Xl_RC" value="Hello" />
+              </node>
+              <node concept="Xl_RD" id="w6MstC1ze2" role="3uHU7w">
+                <property role="Xl_RC" value="World" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="w6MstC1D6s" role="3cqZAp">
+          <node concept="2OqwBi" id="w6MstC1DoF" role="3clFbG">
+            <node concept="10M0yZ" id="w6MstC1D79" role="2Oq$k0">
+              <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
+              <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+            </node>
+            <node concept="liA8E" id="w6MstC1DEY" role="2OqNvi">
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+              <node concept="37vLTw" id="w6MstC1DGs" role="37wK5m">
+                <ref role="3cqZAo" node="w6MstC1zii" resolve="result" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2o8W23RtbwG" role="3cqZAp">
+          <node concept="3cpWsn" id="2o8W23RtbwH" role="3cpWs9">
+            <property role="TrG5h" value="i" />
+            <node concept="10Oyi0" id="2o8W23Rtbv6" role="1tU5fm" />
+            <node concept="1w0Eer" id="2o8W23Rtdy5" role="33vP2m">
+              <node concept="3cmrfG" id="2o8W23Rtue_" role="3uHU7w">
+                <property role="3cmrfH" value="4" />
+              </node>
+              <node concept="1eOMI4" id="2o8W23Rtuj_" role="3uHU7B">
+                <node concept="10QFUN" id="2o8W23Rtujy" role="1eOMHV">
+                  <node concept="3uibUv" id="2o8W23RtvC5" role="10QFUM">
+                    <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+                  </node>
+                  <node concept="10Nm6u" id="2o8W23RtuzG" role="10QFUP" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2o8W23RtbHi" role="3cqZAp">
+          <node concept="2OqwBi" id="2o8W23RtbHj" role="3clFbG">
+            <node concept="10M0yZ" id="2o8W23RtbHk" role="2Oq$k0">
+              <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
+              <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+            </node>
+            <node concept="liA8E" id="2o8W23RtbHl" role="2OqNvi">
+              <ref role="37wK5l" to="guwi:~PrintStream.println(int)" resolve="println" />
+              <node concept="37vLTw" id="2o8W23RtbHm" role="37wK5m">
+                <ref role="3cqZAo" node="2o8W23RtbwH" resolve="i" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2o8W23RtA1Z" role="3cqZAp">
+          <node concept="3cpWsn" id="2o8W23RtA20" role="3cpWs9">
+            <property role="TrG5h" value="j" />
+            <node concept="10Oyi0" id="2o8W23Rt_Pr" role="1tU5fm" />
+            <node concept="1w0Eer" id="2o8W23RtA21" role="33vP2m">
+              <node concept="3cmrfG" id="2o8W23RtA22" role="3uHU7w">
+                <property role="3cmrfH" value="5" />
+              </node>
+              <node concept="10Nm6u" id="2o8W23RtA23" role="3uHU7B" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2o8W23R_t67" role="3cqZAp">
+          <node concept="2OqwBi" id="2o8W23R_to1" role="3clFbG">
+            <node concept="10M0yZ" id="2o8W23R_t6h" role="2Oq$k0">
+              <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
+              <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+            </node>
+            <node concept="liA8E" id="2o8W23R_tC0" role="2OqNvi">
+              <ref role="37wK5l" to="guwi:~PrintStream.println(int)" resolve="println" />
+              <node concept="37vLTw" id="2o8W23R_tKD" role="37wK5m">
+                <ref role="3cqZAo" node="2o8W23RtA20" resolve="j" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2o8W23REpHu" role="3cqZAp">
+          <node concept="3cpWsn" id="2o8W23REpHv" role="3cpWs9">
+            <property role="TrG5h" value="different" />
+            <node concept="3uibUv" id="2o8W23REpHw" role="1tU5fm">
+              <ref role="3uigEE" to="guwi:~Serializable" resolve="Serializable" />
+            </node>
+            <node concept="1w0Eer" id="2o8W23REpHx" role="33vP2m">
+              <node concept="3cmrfG" id="2o8W23REpHy" role="3uHU7w">
+                <property role="3cmrfH" value="6" />
+              </node>
+              <node concept="Xl_RD" id="2o8W23REpHz" role="3uHU7B">
+                <property role="Xl_RC" value="Hello" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2o8W23REutH" role="3cqZAp">
+          <node concept="2OqwBi" id="2o8W23REuQ2" role="3clFbG">
+            <node concept="10M0yZ" id="2o8W23REuy2" role="2Oq$k0">
+              <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
+              <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+            </node>
+            <node concept="liA8E" id="2o8W23REvaP" role="2OqNvi">
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.Object)" resolve="println" />
+              <node concept="37vLTw" id="2o8W23REveQ" role="37wK5m">
+                <ref role="3cqZAo" node="2o8W23REpHv" resolve="desc" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="w6MstC1zkD" role="1B3o_S" />
+      <node concept="3cqZAl" id="w6MstC1zkZ" role="3clF45" />
+    </node>
+    <node concept="3Tm1VV" id="w6MstC1zac" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl b/code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl
index afea30c6ba..02cf3f068f 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl
@@ -50,12 +50,20 @@
         <module reference="52b771c2-b79f-4f44-98f2-d24fd25a210b(de.itemis.mps.baseLanguageExtensions)" version="0" />
         <module reference="0c2a16a3-4205-4401-a2b4-4af76e67fa52(de.itemis.mps.baseLanguageExtensions.generator)" version="0" />
         <module reference="d91eaf6f-a378-467f-9524-0c201ee2e15f(de.itemis.mps.baseLanguageExtensions.runtime)" version="0" />
+        <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+        <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+        <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+        <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
     </generator>
   </generators>
   <sourcePath />
+  <dependencies>
+    <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
+    <dependency reexport="false" scope="generate-into">fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)</dependency>
+  </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
@@ -96,12 +104,19 @@
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="52b771c2-b79f-4f44-98f2-d24fd25a210b(de.itemis.mps.baseLanguageExtensions)" version="0" />
+    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
   <runtime>
     <dependency reexport="false">d91eaf6f-a378-467f-9524-0c201ee2e15f(de.itemis.mps.baseLanguageExtensions.runtime)</dependency>
   </runtime>
-  <extendedLanguages />
+  <extendedLanguages>
+    <extendedLanguage>f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</extendedLanguage>
+  </extendedLanguages>
 </language>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
index 8f7a495efd..d78a125920 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
@@ -2,16 +2,71 @@
 <model ref="r:e9626ecf-a0aa-465d-b5a3-3e84bb263ef5(de.itemis.mps.baseLanguageExtensions.generator.templates@generator)">
   <persistence version="9" />
   <languages>
+    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="4" />
     <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
   </languages>
   <imports>
     <import index="pkab" ref="r:63a6d225-96f6-404a-a9eb-033dc2f950a1(de.itemis.mps.baseLanguageExtensions.structure)" />
+    <import index="96gm" ref="r:2eaed950-3bc1-47cd-9b02-e917ff994d7c(de.itemis.mps.baseLanguageExtensions.runtime)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
   </imports>
   <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+    </language>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
+      <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="ln" index="29HgVG">
+        <child id="1168024447342" name="sourceNodeQuery" index="3NFExx" />
+      </concept>
+      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
+        <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
+      </concept>
+      <concept id="1177093525992" name="jetbrains.mps.lang.generator.structure.InlineTemplate_RuleConsequence" flags="lg" index="gft3U">
+        <child id="1177093586806" name="templateNode" index="gfFT$" />
+      </concept>
+      <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
+      <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
+        <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
+      </concept>
+      <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
+        <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
+      </concept>
+      <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
+        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -19,6 +74,53 @@
   </registry>
   <node concept="bUwia" id="7EVAkaCx$5S">
     <property role="TrG5h" value="main" />
+    <node concept="3aamgX" id="2o8W23R_pD2" role="3acgRq">
+      <ref role="30HIoZ" to="pkab:w6MstC16Ds" resolve="ElvisOperation" />
+      <node concept="gft3U" id="2o8W23R_q1_" role="1lVwrX">
+        <node concept="2YIFZM" id="2o8W23R_q1T" role="gfFT$">
+          <ref role="37wK5l" to="96gm:w6MstBXHAP" resolve="apply" />
+          <ref role="1Pybhc" to="96gm:w6MstBXH_b" resolve="ElvisOperationUtil" />
+          <node concept="10Nm6u" id="2o8W23R_q23" role="37wK5m">
+            <node concept="29HgVG" id="2o8W23R_qdc" role="lGtFl">
+              <node concept="3NFfHV" id="2o8W23R_qeD" role="3NFExx">
+                <node concept="3clFbS" id="2o8W23R_qeE" role="2VODD2">
+                  <node concept="3clFbF" id="2o8W23R_qih" role="3cqZAp">
+                    <node concept="2OqwBi" id="2o8W23R_qxb" role="3clFbG">
+                      <node concept="30H73N" id="2o8W23R_qig" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="2o8W23R_r1N" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tpee:fJuHU4s" resolve="leftExpression" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1bVj0M" id="2o8W23R_q2V" role="37wK5m">
+            <node concept="3clFbS" id="2o8W23R_q2X" role="1bW5cS">
+              <node concept="3clFbF" id="2o8W23R_q79" role="3cqZAp">
+                <node concept="10Nm6u" id="2o8W23R_q78" role="3clFbG">
+                  <node concept="29HgVG" id="2o8W23R_qaf" role="lGtFl">
+                    <node concept="3NFfHV" id="2o8W23R_r70" role="3NFExx">
+                      <node concept="3clFbS" id="2o8W23R_r71" role="2VODD2">
+                        <node concept="3clFbF" id="2o8W23R_raD" role="3cqZAp">
+                          <node concept="2OqwBi" id="2o8W23R_rcP" role="3clFbG">
+                            <node concept="30H73N" id="2o8W23R_raC" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="2o8W23R_rj0" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tpee:fJuHU4r" resolve="rightExpression" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
index 1ba35fe152..85ec66d5a3 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
@@ -4,7 +4,32 @@
   <languages>
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
-  <imports />
-  <registry />
+  <imports>
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+  </imports>
+  <registry>
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
+      <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
+        <property id="6714410169261853888" name="conceptId" index="EcuMT" />
+        <property id="4628067390765907488" name="conceptShortDescription" index="R4oN_" />
+        <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
+      </concept>
+      <concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
+        <reference id="1071489389519" name="extends" index="1TJDcQ" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="1TIwiD" id="w6MstC16Ds">
+    <property role="EcuMT" value="578371460444482140" />
+    <property role="TrG5h" value="ElvisOperation" />
+    <property role="34LRSv" value="?:" />
+    <property role="R4oN_" value="elvis operation" />
+    <ref role="1TJDcQ" to="tpee:fJuHJVf" resolve="BinaryOperation" />
+  </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
index 751a1bac42..fdc83af03d 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
@@ -5,7 +5,188 @@
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
-  <imports />
-  <registry />
+  <imports>
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
+    <import index="pkab" ref="r:63a6d225-96f6-404a-a9eb-033dc2f950a1(de.itemis.mps.baseLanguageExtensions.structure)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
+    </language>
+    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
+      <concept id="1766949807893567867" name="jetbrains.mps.lang.typesystem.structure.OverridesConceptFunction" flags="ig" index="bXqS6" />
+      <concept id="1185788614172" name="jetbrains.mps.lang.typesystem.structure.NormalTypeClause" flags="ng" index="mw_s8">
+        <child id="1185788644032" name="normalType" index="mwGJk" />
+      </concept>
+      <concept id="1185805035213" name="jetbrains.mps.lang.typesystem.structure.WhenConcreteStatement" flags="nn" index="nvevp">
+        <child id="1185805047793" name="body" index="nvhr_" />
+        <child id="1185805056450" name="argument" index="nvjzm" />
+        <child id="1205761991995" name="argumentRepresentator" index="2X0Ygz" />
+      </concept>
+      <concept id="1220357310820" name="jetbrains.mps.lang.typesystem.structure.AddDependencyStatement" flags="nn" index="yXGxS">
+        <child id="1220357350423" name="dependency" index="yXQkb" />
+      </concept>
+      <concept id="1205762105978" name="jetbrains.mps.lang.typesystem.structure.WhenConcreteVariableDeclaration" flags="ng" index="2X1qdy" />
+      <concept id="1205762656241" name="jetbrains.mps.lang.typesystem.structure.WhenConcreteVariableReference" flags="nn" index="2X3wrD">
+        <reference id="1205762683928" name="whenConcreteVar" index="2X3Bk0" />
+      </concept>
+      <concept id="1195213580585" name="jetbrains.mps.lang.typesystem.structure.AbstractCheckingRule" flags="ig" index="18hYwZ">
+        <child id="1195213635060" name="body" index="18ibNy" />
+      </concept>
+      <concept id="1174642788531" name="jetbrains.mps.lang.typesystem.structure.ConceptReference" flags="ig" index="1YaCAy">
+        <reference id="1174642800329" name="concept" index="1YaFvo" />
+      </concept>
+      <concept id="1174643105530" name="jetbrains.mps.lang.typesystem.structure.InferenceRule" flags="ig" index="1YbPZF">
+        <child id="422148324487088858" name="overridesFun" index="ujSXK" />
+      </concept>
+      <concept id="1174648085619" name="jetbrains.mps.lang.typesystem.structure.AbstractRule" flags="ng" index="1YuPPy">
+        <child id="1174648101952" name="applicableNode" index="1YuTPh" />
+      </concept>
+      <concept id="1174650418652" name="jetbrains.mps.lang.typesystem.structure.ApplicableNodeReference" flags="nn" index="1YBJjd">
+        <reference id="1174650432090" name="applicableNode" index="1YBMHb" />
+      </concept>
+      <concept id="1174657487114" name="jetbrains.mps.lang.typesystem.structure.TypeOfExpression" flags="nn" index="1Z2H0r">
+        <child id="1174657509053" name="term" index="1Z2MuG" />
+      </concept>
+      <concept id="1174660718586" name="jetbrains.mps.lang.typesystem.structure.AbstractEquationStatement" flags="nn" index="1Zf1VF">
+        <child id="1174660783413" name="leftExpression" index="1ZfhK$" />
+        <child id="1174660783414" name="rightExpression" index="1ZfhKB" />
+      </concept>
+      <concept id="1174663239020" name="jetbrains.mps.lang.typesystem.structure.CreateGreaterThanInequationStatement" flags="nn" index="1ZoDhX" />
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
+        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="1YbPZF" id="w6MstC1zne">
+    <property role="TrG5h" value="typeof_ElvisOperation" />
+    <node concept="3clFbS" id="w6MstC1znf" role="18ibNy">
+      <node concept="yXGxS" id="w6MstC1JR3" role="3cqZAp">
+        <node concept="2OqwBi" id="w6MstC1K1M" role="yXQkb">
+          <node concept="1YBJjd" id="w6MstC1JRd" role="2Oq$k0">
+            <ref role="1YBMHb" node="w6MstC1znh" resolve="elvisOperation" />
+          </node>
+          <node concept="3TrEf2" id="w6MstC1KEC" role="2OqNvi">
+            <ref role="3Tt5mk" to="tpee:fJuHU4s" resolve="leftExpression" />
+          </node>
+        </node>
+      </node>
+      <node concept="yXGxS" id="w6MstC1KGi" role="3cqZAp">
+        <node concept="2OqwBi" id="w6MstC1KGj" role="yXQkb">
+          <node concept="1YBJjd" id="w6MstC1KGk" role="2Oq$k0">
+            <ref role="1YBMHb" node="w6MstC1znh" resolve="elvisOperation" />
+          </node>
+          <node concept="3TrEf2" id="w6MstC1KGl" role="2OqNvi">
+            <ref role="3Tt5mk" to="tpee:fJuHU4r" resolve="rightExpression" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbH" id="w6MstC1JQY" role="3cqZAp" />
+      <node concept="nvevp" id="w6MstC1znq" role="3cqZAp">
+        <node concept="3clFbS" id="w6MstC1znr" role="nvhr_">
+          <node concept="nvevp" id="2o8W23RtBpD" role="3cqZAp">
+            <node concept="3clFbS" id="2o8W23RtBpF" role="nvhr_">
+              <node concept="1ZoDhX" id="2o8W23RtCmv" role="3cqZAp">
+                <node concept="mw_s8" id="2o8W23RtCmw" role="1ZfhK$">
+                  <node concept="1Z2H0r" id="2o8W23RtCmx" role="mwGJk">
+                    <node concept="1YBJjd" id="2o8W23RtCmy" role="1Z2MuG">
+                      <ref role="1YBMHb" node="w6MstC1znh" resolve="elvisOperation" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="mw_s8" id="2o8W23RtCmz" role="1ZfhKB">
+                  <node concept="2X3wrD" id="2o8W23RtCm$" role="mwGJk">
+                    <ref role="2X3Bk0" node="2o8W23RtBpJ" resolve="rhsType" />
+                  </node>
+                </node>
+              </node>
+              <node concept="1ZoDhX" id="w6MstC1_2G" role="3cqZAp">
+                <node concept="mw_s8" id="w6MstC1_2I" role="1ZfhK$">
+                  <node concept="1Z2H0r" id="w6MstC1_2J" role="mwGJk">
+                    <node concept="1YBJjd" id="w6MstC1_2K" role="1Z2MuG">
+                      <ref role="1YBMHb" node="w6MstC1znh" resolve="elvisOperation" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="mw_s8" id="w6MstC1_6p" role="1ZfhKB">
+                  <node concept="2X3wrD" id="w6MstC1_6n" role="mwGJk">
+                    <ref role="2X3Bk0" node="w6MstC1znt" resolve="lhsType" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1Z2H0r" id="2o8W23RtBpT" role="nvjzm">
+              <node concept="2OqwBi" id="2o8W23RtB_u" role="1Z2MuG">
+                <node concept="1YBJjd" id="2o8W23RtBqj" role="2Oq$k0">
+                  <ref role="1YBMHb" node="w6MstC1znh" resolve="elvisOperation" />
+                </node>
+                <node concept="3TrEf2" id="2o8W23RtCk2" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tpee:fJuHU4r" resolve="rightExpression" />
+                </node>
+              </node>
+            </node>
+            <node concept="2X1qdy" id="2o8W23RtBpJ" role="2X0Ygz">
+              <property role="TrG5h" value="rhsType" />
+              <node concept="2jxLKc" id="2o8W23RtBpK" role="1tU5fm" />
+            </node>
+          </node>
+        </node>
+        <node concept="1Z2H0r" id="w6MstC1znA" role="nvjzm">
+          <node concept="2OqwBi" id="w6MstC1zyR" role="1Z2MuG">
+            <node concept="1YBJjd" id="w6MstC1zo0" role="2Oq$k0">
+              <ref role="1YBMHb" node="w6MstC1znh" resolve="elvisOperation" />
+            </node>
+            <node concept="3TrEf2" id="w6MstC1$9m" role="2OqNvi">
+              <ref role="3Tt5mk" to="tpee:fJuHU4s" resolve="leftExpression" />
+            </node>
+          </node>
+        </node>
+        <node concept="2X1qdy" id="w6MstC1znt" role="2X0Ygz">
+          <property role="TrG5h" value="lhsType" />
+          <node concept="2jxLKc" id="w6MstC1znu" role="1tU5fm" />
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="w6MstC1znh" role="1YuTPh">
+      <property role="TrG5h" value="elvisOperation" />
+      <ref role="1YaFvo" to="pkab:w6MstC16Ds" resolve="ElvisOperation" />
+    </node>
+    <node concept="bXqS6" id="2o8W23REgK7" role="ujSXK">
+      <node concept="3clFbS" id="2o8W23REgK8" role="2VODD2">
+        <node concept="3clFbF" id="2o8W23REhiH" role="3cqZAp">
+          <node concept="3clFbT" id="2o8W23REhiG" role="3clFbG">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 

From 6cd848d445a80b028deb3773171410cedbeeb931 Mon Sep 17 00:00:00 2001
From: Amin <ait.amin93@gmail.com>
Date: Thu, 25 Sep 2025 10:06:34 +0200
Subject: [PATCH 05/18] Add integer sequences to the new BaseLanguage
 extensions (#2)

---------

Co-authored-by: Dennis Albrecht <dalbrecht@itemis.com>
---
 .../models/de.itemis.mps.extensions.build.mps |   2 +-
 ...mis.mps.baseLanguageExtensions.runtime.msd |   1 +
 ...mis.mps.baseLanguageExtensions.runtime.mps | 182 ++++++++
 ...mis.mps.baseLanguageExtensions.sandbox.msd |   2 +
 ...mis.mps.baseLanguageExtensions.sandbox.mps | 432 +++++++++++++++++-
 .../de.itemis.mps.baseLanguageExtensions.mpl  |   2 -
 ...tensions.generator.templates@generator.mps | 149 ++++++
 ...mps.baseLanguageExtensions.constraints.mps |  69 ++-
 ...emis.mps.baseLanguageExtensions.editor.mps | 408 ++++++++++++++++-
 ...s.mps.baseLanguageExtensions.structure.mps |  79 ++++
 ....mps.baseLanguageExtensions.typesystem.mps | 335 ++++++++++++++
 ...itemis.mps.baseLanguageExtensions.test.msd |   1 +
 ...eExtensions.test.integerSequence@tests.mps | 265 +++++++++++
 13 files changed, 1911 insertions(+), 16 deletions(-)
 create mode 100644 code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.integerSequence@tests.mps

diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
index 399805f021..0411db8f08 100644
--- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
+++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -9805,7 +9805,7 @@
           </node>
         </node>
         <node concept="1E0d5M" id="vJfcQmbzfS" role="1E1XAP">
-          <ref role="1E0d5P" node="vJfcQmbzfZ" resolve="de.itemis.mps.editor.pagination.runtime" />
+          <ref role="1E0d5P" node="vJfcQmbzfZ" resolve="de.itemis.mps.baseLanguageExtensions.runtime" />
         </node>
         <node concept="1SiIV0" id="2o8W23R_vC7" role="3bR37C">
           <node concept="3bR9La" id="2o8W23R_vC8" role="1SiIV1">
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
index 52fa4b7239..f8a57a03e0 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
@@ -14,6 +14,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
index d4fb02ee13..5c8290ecad 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
@@ -1,20 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:2eaed950-3bc1-47cd-9b02-e917ff994d7c(de.itemis.mps.baseLanguageExtensions.runtime)">
   <persistence version="9" />
+  <attribute name="doNotGenerate" value="false" />
   <languages>
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
   </languages>
   <imports />
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1153422305557" name="jetbrains.mps.baseLanguage.structure.LessThanOrEqualsExpression" flags="nn" index="2dkUwp" />
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
+      <concept id="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
+        <child id="1076505808688" name="condition" index="2$JKZa" />
+      </concept>
+      <concept id="1239714755177" name="jetbrains.mps.baseLanguage.structure.AbstractUnaryNumberOperation" flags="nn" index="2$Kvd9">
+        <child id="1239714902950" name="expression" index="2$L3a6" />
+      </concept>
+      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
+        <child id="1154032183016" name="body" index="2LFqv$" />
+      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
       <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
       <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ" />
       <concept id="1109279851642" name="jetbrains.mps.baseLanguage.structure.GenericDeclaration" flags="ng" index="16eOlS">
         <child id="1109279881614" name="typeVariableDeclaration" index="16eVyc" />
@@ -35,6 +55,9 @@
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
         <child id="1068580123160" name="condition" index="3clFbw" />
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
@@ -42,9 +65,17 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
@@ -52,15 +83,29 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
+      <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
+        <child id="1144230900587" name="variable" index="1Duv9x" />
+      </concept>
+      <concept id="1144231330558" name="jetbrains.mps.baseLanguage.structure.ForStatement" flags="nn" index="1Dw8fO">
+        <child id="1144231399730" name="condition" index="1Dwp0S" />
+        <child id="1144231408325" name="iteration" index="1Dwrff" />
+      </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1200830824066" name="jetbrains.mps.baseLanguage.closures.structure.YieldStatement" flags="nn" index="2n63Yl">
+        <child id="1200830928149" name="expression" index="2n6tg2" />
+      </concept>
       <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
         <child id="1199542457201" name="resultType" index="1ajl9A" />
       </concept>
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
       <concept id="1225797177491" name="jetbrains.mps.baseLanguage.closures.structure.InvokeFunctionOperation" flags="nn" index="1Bd96e" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@@ -68,7 +113,144 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1224414427926" name="jetbrains.mps.baseLanguage.collections.structure.SequenceCreator" flags="nn" index="kMnCb">
+        <child id="1224414456414" name="elementType" index="kMuH3" />
+        <child id="1224414466839" name="initializer" index="kMx8a" />
+      </concept>
+      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
+        <child id="1151689745422" name="elementType" index="A3Ik2" />
+      </concept>
+    </language>
   </registry>
+  <node concept="312cEu" id="vJfcQmguGr">
+    <property role="TrG5h" value="IntegerSequence" />
+    <node concept="2YIFZL" id="vJfcQmguHw" role="jymVt">
+      <property role="TrG5h" value="range" />
+      <node concept="3clFbS" id="vJfcQmguHz" role="3clF47">
+        <node concept="3clFbJ" id="vJfcQmgIkB" role="3cqZAp">
+          <node concept="3clFbS" id="vJfcQmgIkD" role="3clFbx">
+            <node concept="3cpWs6" id="6vHuLLnDz2P" role="3cqZAp">
+              <node concept="2ShNRf" id="6vHuLLnDz7Z" role="3cqZAk">
+                <node concept="kMnCb" id="6vHuLLnDzeu" role="2ShVmc">
+                  <node concept="10Oyi0" id="6vHuLLnDzgP" role="kMuH3" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3eOVzh" id="vJfcQmgJ46" role="3clFbw">
+            <node concept="37vLTw" id="vJfcQmgJ6B" role="3uHU7w">
+              <ref role="3cqZAo" node="vJfcQmguLz" resolve="from" />
+            </node>
+            <node concept="37vLTw" id="vJfcQmgInA" role="3uHU7B">
+              <ref role="3cqZAo" node="vJfcQmguMC" resolve="to" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="vJfcQmguNV" role="3cqZAp">
+          <node concept="2ShNRf" id="vJfcQmguNT" role="3clFbG">
+            <node concept="kMnCb" id="vJfcQmgwae" role="2ShVmc">
+              <node concept="10Oyi0" id="vJfcQmgwaR" role="kMuH3" />
+              <node concept="1bVj0M" id="vJfcQmgwbL" role="kMx8a">
+                <node concept="3clFbS" id="vJfcQmgwbM" role="1bW5cS">
+                  <node concept="1Dw8fO" id="vJfcQmgwez" role="3cqZAp">
+                    <node concept="3cpWsn" id="vJfcQmgwe$" role="1Duv9x">
+                      <property role="TrG5h" value="i" />
+                      <node concept="10Oyi0" id="vJfcQmgwgr" role="1tU5fm" />
+                      <node concept="37vLTw" id="vJfcQmgwmw" role="33vP2m">
+                        <ref role="3cqZAo" node="vJfcQmguLz" resolve="from" />
+                      </node>
+                    </node>
+                    <node concept="3clFbS" id="vJfcQmgwe_" role="2LFqv$">
+                      <node concept="2n63Yl" id="vJfcQmgyB5" role="3cqZAp">
+                        <node concept="37vLTw" id="vJfcQmgyCT" role="2n6tg2">
+                          <ref role="3cqZAo" node="vJfcQmgwe$" resolve="i" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2dkUwp" id="vJfcQmgJrP" role="1Dwp0S">
+                      <node concept="37vLTw" id="vJfcQmgwoG" role="3uHU7B">
+                        <ref role="3cqZAo" node="vJfcQmgwe$" resolve="i" />
+                      </node>
+                      <node concept="37vLTw" id="vJfcQmgylw" role="3uHU7w">
+                        <ref role="3cqZAo" node="vJfcQmguMC" resolve="to" />
+                      </node>
+                    </node>
+                    <node concept="3uNrnE" id="vJfcQmgy$p" role="1Dwrff">
+                      <node concept="37vLTw" id="vJfcQmgy$r" role="2$L3a6">
+                        <ref role="3cqZAo" node="vJfcQmgwe$" resolve="i" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="vJfcQmguHa" role="1B3o_S" />
+      <node concept="A3Dl8" id="vJfcQmguKG" role="3clF45">
+        <node concept="10Oyi0" id="vJfcQmguL7" role="A3Ik2" />
+      </node>
+      <node concept="37vLTG" id="vJfcQmguLz" role="3clF46">
+        <property role="TrG5h" value="from" />
+        <node concept="10Oyi0" id="vJfcQmguLy" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="vJfcQmguMC" role="3clF46">
+        <property role="TrG5h" value="to" />
+        <node concept="10Oyi0" id="vJfcQmguN7" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="vJfcQmgyF1" role="jymVt" />
+    <node concept="2YIFZL" id="vJfcQmgyHy" role="jymVt">
+      <property role="TrG5h" value="range" />
+      <node concept="3clFbS" id="vJfcQmgyH_" role="3clF47">
+        <node concept="3clFbF" id="vJfcQmgyKK" role="3cqZAp">
+          <node concept="2ShNRf" id="vJfcQmgyKI" role="3clFbG">
+            <node concept="kMnCb" id="vJfcQmgyPt" role="2ShVmc">
+              <node concept="10Oyi0" id="vJfcQmgyQ8" role="kMuH3" />
+              <node concept="1bVj0M" id="vJfcQmgyR4" role="kMx8a">
+                <node concept="3clFbS" id="vJfcQmgyR5" role="1bW5cS">
+                  <node concept="3cpWs8" id="vJfcQmgz0P" role="3cqZAp">
+                    <node concept="3cpWsn" id="vJfcQmgz0S" role="3cpWs9">
+                      <property role="TrG5h" value="i" />
+                      <node concept="10Oyi0" id="vJfcQmgz0N" role="1tU5fm" />
+                      <node concept="37vLTw" id="5IoIE_GbjpF" role="33vP2m">
+                        <ref role="3cqZAo" node="vJfcQmgyJr" resolve="from" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2$JKZl" id="vJfcQmgyUc" role="3cqZAp">
+                    <node concept="3clFbS" id="vJfcQmgyUd" role="2LFqv$">
+                      <node concept="2n63Yl" id="vJfcQmgz94" role="3cqZAp">
+                        <node concept="3uNrnE" id="vJfcQmgzHu" role="2n6tg2">
+                          <node concept="37vLTw" id="vJfcQmgzHw" role="2$L3a6">
+                            <ref role="3cqZAo" node="vJfcQmgz0S" resolve="i" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbT" id="vJfcQmgyWB" role="2$JKZa">
+                      <property role="3clFbU" value="true" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="vJfcQmgyGr" role="1B3o_S" />
+      <node concept="A3Dl8" id="vJfcQmgyHl" role="3clF45">
+        <node concept="10Oyi0" id="vJfcQmgyIX" role="A3Ik2" />
+      </node>
+      <node concept="37vLTG" id="vJfcQmgyJr" role="3clF46">
+        <property role="TrG5h" value="from" />
+        <node concept="10Oyi0" id="vJfcQmgyJq" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="vJfcQmguGs" role="1B3o_S" />
+  </node>
   <node concept="312cEu" id="w6MstBXH_b">
     <property role="TrG5h" value="ElvisOperationUtil" />
     <node concept="2YIFZL" id="w6MstBXHAP" role="jymVt">
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/de.itemis.mps.baseLanguageExtensions.sandbox.msd b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/de.itemis.mps.baseLanguageExtensions.sandbox.msd
index 5c3c6da7d4..51b8c0d923 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/de.itemis.mps.baseLanguageExtensions.sandbox.msd
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/de.itemis.mps.baseLanguageExtensions.sandbox.msd
@@ -17,6 +17,8 @@
   <languageVersions>
     <language slang="l:52b771c2-b79f-4f44-98f2-d24fd25a210b:de.itemis.mps.baseLanguageExtensions" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
index cccb416919..5d253a9b2a 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
@@ -4,6 +4,7 @@
   <languages>
     <use id="52b771c2-b79f-4f44-98f2-d24fd25a210b" name="de.itemis.mps.baseLanguageExtensions" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
   </languages>
   <imports>
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
@@ -11,7 +12,9 @@
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1224500799915" name="jetbrains.mps.baseLanguage.structure.BitwiseXorExpression" flags="nn" index="pVQyQ" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -33,6 +36,7 @@
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1092119917967" name="jetbrains.mps.baseLanguage.structure.MulExpression" flags="nn" index="17qRlL" />
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -47,12 +51,14 @@
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
+      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
@@ -78,9 +84,28 @@
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="8356039341262087992" name="line" index="1aUNEU" />
+      </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
     <language id="52b771c2-b79f-4f44-98f2-d24fd25a210b" name="de.itemis.mps.baseLanguageExtensions">
+      <concept id="571742531387676962" name="de.itemis.mps.baseLanguageExtensions.structure.IntegerRange" flags="ng" index="2hHQnJ">
+        <child id="571742531387697464" name="right" index="2hHTnP" />
+        <child id="571742531387697463" name="left" index="2hHTnU" />
+      </concept>
+      <concept id="571742531387697461" name="de.itemis.mps.baseLanguageExtensions.structure.IntegerRangeExpressionBound" flags="ng" index="2hHTnS">
+        <child id="571742531387697462" name="expression" index="2hHTnV" />
+      </concept>
+      <concept id="571742531387697460" name="de.itemis.mps.baseLanguageExtensions.structure.IntegerRangeConstantBound" flags="ng" index="2hHTnT">
+        <property id="7488777117046563852" name="value" index="KjLWg" />
+      </concept>
       <concept id="578371460444482140" name="de.itemis.mps.baseLanguageExtensions.structure.ElvisOperation" flags="ng" index="1w0Eer" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@@ -88,6 +113,28 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
+      <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
+        <property id="155656958578482949" name="value" index="3oM_SC" />
+      </concept>
+      <concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="nn" index="1PaTwC">
+        <child id="2535923850359271783" name="elements" index="1PaTwD" />
+      </concept>
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
+        <child id="1204796294226" name="closure" index="23t8la" />
+      </concept>
+      <concept id="1172664342967" name="jetbrains.mps.baseLanguage.collections.structure.TakeOperation" flags="nn" index="8ftyA">
+        <child id="1172664372046" name="elementsToTake" index="8f$Dv" />
+      </concept>
+      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
+        <child id="1151689745422" name="elementType" index="A3Ik2" />
+      </concept>
+      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+      <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
+    </language>
   </registry>
   <node concept="312cEu" id="w6MstC1zab">
     <property role="TrG5h" value="ElvisOperationSandbox" />
@@ -206,7 +253,7 @@
             <node concept="liA8E" id="2o8W23REvaP" role="2OqNvi">
               <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.Object)" resolve="println" />
               <node concept="37vLTw" id="2o8W23REveQ" role="37wK5m">
-                <ref role="3cqZAo" node="2o8W23REpHv" resolve="desc" />
+                <ref role="3cqZAo" node="2o8W23REpHv" resolve="different" />
               </node>
             </node>
           </node>
@@ -217,5 +264,388 @@
     </node>
     <node concept="3Tm1VV" id="w6MstC1zac" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="6vHuLLnBVJZ">
+    <property role="TrG5h" value="IntegerSequenceSandbox" />
+    <node concept="2YIFZL" id="6vHuLLnBZIO" role="jymVt">
+      <property role="TrG5h" value="usages" />
+      <node concept="3clFbS" id="6vHuLLnBZIR" role="3clF47">
+        <node concept="3SKdUt" id="6vHuLLnDlK9" role="3cqZAp">
+          <node concept="1PaTwC" id="6vHuLLnDlKa" role="1aUNEU">
+            <node concept="3oM_SD" id="6vHuLLnDlLm" role="1PaTwD">
+              <property role="3oM_SC" value="constant" />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlLn" role="1PaTwD">
+              <property role="3oM_SC" value="bounds" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6vHuLLnDkYI" role="3cqZAp">
+          <node concept="2OqwBi" id="6vHuLLnDkYJ" role="3clFbG">
+            <node concept="2hHQnJ" id="6vHuLLnDkYK" role="2Oq$k0">
+              <node concept="2hHTnT" id="6vHuLLnDkYL" role="2hHTnU">
+                <property role="KjLWg" value="0" />
+              </node>
+              <node concept="2hHTnT" id="6vHuLLnDkYM" role="2hHTnP">
+                <property role="KjLWg" value="10" />
+              </node>
+            </node>
+            <node concept="3$u5V9" id="6vHuLLnDkYN" role="2OqNvi">
+              <node concept="1bVj0M" id="6vHuLLnDkYO" role="23t8la">
+                <node concept="3clFbS" id="6vHuLLnDkYP" role="1bW5cS">
+                  <node concept="3clFbF" id="6vHuLLnDkYQ" role="3cqZAp">
+                    <node concept="17qRlL" id="6vHuLLnDkYR" role="3clFbG">
+                      <node concept="3cmrfG" id="6vHuLLnDkYS" role="3uHU7w">
+                        <property role="3cmrfH" value="2" />
+                      </node>
+                      <node concept="37vLTw" id="6vHuLLnDkYT" role="3uHU7B">
+                        <ref role="3cqZAo" node="6vHuLLnDkYU" resolve="it" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="6vHuLLnDkYU" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="6vHuLLnDkYV" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="6vHuLLnDlBC" role="3cqZAp">
+          <node concept="1PaTwC" id="6vHuLLnDlBD" role="1aUNEU">
+            <node concept="3oM_SD" id="6vHuLLnDlMO" role="1PaTwD">
+              <property role="3oM_SC" value="yields" />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlMP" role="1PaTwD">
+              <property role="3oM_SC" value="[0," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlCS" role="1PaTwD">
+              <property role="3oM_SC" value="2," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlCT" role="1PaTwD">
+              <property role="3oM_SC" value="4," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlCU" role="1PaTwD">
+              <property role="3oM_SC" value="6," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlCV" role="1PaTwD">
+              <property role="3oM_SC" value="8," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlCW" role="1PaTwD">
+              <property role="3oM_SC" value="10," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlCX" role="1PaTwD">
+              <property role="3oM_SC" value="12," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlCY" role="1PaTwD">
+              <property role="3oM_SC" value="14," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlD1" role="1PaTwD">
+              <property role="3oM_SC" value="16," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlCZ" role="1PaTwD">
+              <property role="3oM_SC" value="18," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlD0" role="1PaTwD">
+              <property role="3oM_SC" value="20]" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6vHuLLnDlLp" role="3cqZAp" />
+        <node concept="3SKdUt" id="6vHuLLnDlOw" role="3cqZAp">
+          <node concept="1PaTwC" id="6vHuLLnDlOx" role="1aUNEU">
+            <node concept="3oM_SD" id="6vHuLLnDlPH" role="1PaTwD">
+              <property role="3oM_SC" value="infinite" />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlPI" role="1PaTwD">
+              <property role="3oM_SC" value="range" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6vHuLLnDl8D" role="3cqZAp">
+          <node concept="2OqwBi" id="6vHuLLnDl8E" role="3clFbG">
+            <node concept="2OqwBi" id="6vHuLLnDl8F" role="2Oq$k0">
+              <node concept="2hHQnJ" id="6vHuLLnDl8G" role="2Oq$k0">
+                <node concept="2hHTnT" id="6vHuLLnDl8H" role="2hHTnU">
+                  <property role="KjLWg" value="0" />
+                </node>
+              </node>
+              <node concept="8ftyA" id="6vHuLLnDl8I" role="2OqNvi">
+                <node concept="3cmrfG" id="6vHuLLnDl8J" role="8f$Dv">
+                  <property role="3cmrfH" value="12" />
+                </node>
+              </node>
+            </node>
+            <node concept="3$u5V9" id="6vHuLLnDl8K" role="2OqNvi">
+              <node concept="1bVj0M" id="6vHuLLnDl8L" role="23t8la">
+                <node concept="3clFbS" id="6vHuLLnDl8M" role="1bW5cS">
+                  <node concept="3clFbF" id="6vHuLLnDl8N" role="3cqZAp">
+                    <node concept="pVQyQ" id="6vHuLLnDl8O" role="3clFbG">
+                      <node concept="3cmrfG" id="6vHuLLnDl8P" role="3uHU7w">
+                        <property role="3cmrfH" value="10" />
+                      </node>
+                      <node concept="37vLTw" id="6vHuLLnDl8Q" role="3uHU7B">
+                        <ref role="3cqZAo" node="6vHuLLnDl8R" resolve="it" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="6vHuLLnDl8R" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="6vHuLLnDl8S" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="6vHuLLnDlEs" role="3cqZAp">
+          <node concept="1PaTwC" id="6vHuLLnDlEt" role="1aUNEU">
+            <node concept="3oM_SD" id="6vHuLLnDlFD" role="1PaTwD">
+              <property role="3oM_SC" value="yields" />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlPJ" role="1PaTwD">
+              <property role="3oM_SC" value="[10," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlFE" role="1PaTwD">
+              <property role="3oM_SC" value="11," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlFF" role="1PaTwD">
+              <property role="3oM_SC" value="8," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlFI" role="1PaTwD">
+              <property role="3oM_SC" value="9," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlFJ" role="1PaTwD">
+              <property role="3oM_SC" value="14," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlFK" role="1PaTwD">
+              <property role="3oM_SC" value="15," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlFL" role="1PaTwD">
+              <property role="3oM_SC" value="12," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlFM" role="1PaTwD">
+              <property role="3oM_SC" value="13," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlFN" role="1PaTwD">
+              <property role="3oM_SC" value="2," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlFO" role="1PaTwD">
+              <property role="3oM_SC" value="3," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlFR" role="1PaTwD">
+              <property role="3oM_SC" value="0," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlFS" role="1PaTwD">
+              <property role="3oM_SC" value="1]" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6vHuLLnDlQ1" role="3cqZAp" />
+        <node concept="3SKdUt" id="6vHuLLnDlS_" role="3cqZAp">
+          <node concept="1PaTwC" id="6vHuLLnDlSA" role="1aUNEU">
+            <node concept="3oM_SD" id="6vHuLLnDlTM" role="1PaTwD">
+              <property role="3oM_SC" value="expression" />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlTN" role="1PaTwD">
+              <property role="3oM_SC" value="bounds" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6vHuLLnDlnU" role="3cqZAp">
+          <node concept="2OqwBi" id="6vHuLLnDlnV" role="3clFbG">
+            <node concept="2hHQnJ" id="6vHuLLnDlnW" role="2Oq$k0">
+              <node concept="2hHTnT" id="6vHuLLnDlnX" role="2hHTnU">
+                <property role="KjLWg" value="0" />
+              </node>
+              <node concept="2hHTnS" id="6vHuLLnDlnY" role="2hHTnP">
+                <node concept="17qRlL" id="6vHuLLnDlnZ" role="2hHTnV">
+                  <node concept="3cmrfG" id="6vHuLLnDlo0" role="3uHU7w">
+                    <property role="3cmrfH" value="2" />
+                  </node>
+                  <node concept="3cmrfG" id="6vHuLLnDlo1" role="3uHU7B">
+                    <property role="3cmrfH" value="3" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3$u5V9" id="6vHuLLnDlo2" role="2OqNvi">
+              <node concept="1bVj0M" id="6vHuLLnDlo3" role="23t8la">
+                <node concept="3clFbS" id="6vHuLLnDlo4" role="1bW5cS">
+                  <node concept="3clFbF" id="6vHuLLnDlo5" role="3cqZAp">
+                    <node concept="3cpWs3" id="6vHuLLnDlo6" role="3clFbG">
+                      <node concept="3cmrfG" id="6vHuLLnDlo7" role="3uHU7w">
+                        <property role="3cmrfH" value="2" />
+                      </node>
+                      <node concept="37vLTw" id="6vHuLLnDlo8" role="3uHU7B">
+                        <ref role="3cqZAo" node="6vHuLLnDlo9" resolve="it" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="6vHuLLnDlo9" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="6vHuLLnDloa" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="6vHuLLnDlHj" role="3cqZAp">
+          <node concept="1PaTwC" id="6vHuLLnDlHk" role="1aUNEU">
+            <node concept="3oM_SD" id="6vHuLLnDlIC" role="1PaTwD">
+              <property role="3oM_SC" value="[2," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlII" role="1PaTwD">
+              <property role="3oM_SC" value="3," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlIH" role="1PaTwD">
+              <property role="3oM_SC" value="4," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlIG" role="1PaTwD">
+              <property role="3oM_SC" value="5," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlIF" role="1PaTwD">
+              <property role="3oM_SC" value="6," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlIE" role="1PaTwD">
+              <property role="3oM_SC" value="7," />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDlID" role="1PaTwD">
+              <property role="3oM_SC" value="8]" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6vHuLLnDpXJ" role="3cqZAp" />
+        <node concept="3cpWs8" id="6vHuLLnDq4D" role="3cqZAp">
+          <node concept="3cpWsn" id="6vHuLLnDq4E" role="3cpWs9">
+            <property role="TrG5h" value="from0To100" />
+            <node concept="A3Dl8" id="6vHuLLnDq3i" role="1tU5fm">
+              <node concept="10Oyi0" id="6vHuLLnDq3l" role="A3Ik2" />
+            </node>
+            <node concept="2hHQnJ" id="6vHuLLnDq4F" role="33vP2m">
+              <node concept="2hHTnT" id="6vHuLLnDq4G" role="2hHTnU">
+                <property role="KjLWg" value="0" />
+              </node>
+              <node concept="2hHTnT" id="6vHuLLnDq4H" role="2hHTnP">
+                <property role="KjLWg" value="100" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6vHuLLnDqk$" role="3cqZAp">
+          <node concept="3cpWsn" id="6vHuLLnDqk_" role="3cpWs9">
+            <property role="TrG5h" value="from10ToInfinite" />
+            <node concept="A3Dl8" id="6vHuLLnDqjh" role="1tU5fm">
+              <node concept="10Oyi0" id="6vHuLLnDqjk" role="A3Ik2" />
+            </node>
+            <node concept="2hHQnJ" id="6vHuLLnDqkA" role="33vP2m">
+              <node concept="2hHTnT" id="6vHuLLnDqkB" role="2hHTnU">
+                <property role="KjLWg" value="10" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6vHuLLnDrgh" role="3cqZAp">
+          <node concept="3cpWsn" id="6vHuLLnDrgi" role="3cpWs9">
+            <property role="TrG5h" value="from6to16" />
+            <node concept="A3Dl8" id="6vHuLLnDreW" role="1tU5fm">
+              <node concept="10Oyi0" id="6vHuLLnDreZ" role="A3Ik2" />
+            </node>
+            <node concept="2hHQnJ" id="6vHuLLnDrgj" role="33vP2m">
+              <node concept="2hHTnS" id="6vHuLLnDrgk" role="2hHTnU">
+                <node concept="17qRlL" id="6vHuLLnDrgl" role="2hHTnV">
+                  <node concept="3cmrfG" id="6vHuLLnDrgm" role="3uHU7w">
+                    <property role="3cmrfH" value="2" />
+                  </node>
+                  <node concept="3cmrfG" id="6vHuLLnDrgn" role="3uHU7B">
+                    <property role="3cmrfH" value="3" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2hHTnS" id="6vHuLLnDrgo" role="2hHTnP">
+                <node concept="17qRlL" id="6vHuLLnDrgp" role="2hHTnV">
+                  <node concept="3cmrfG" id="6vHuLLnDrgq" role="3uHU7w">
+                    <property role="3cmrfH" value="4" />
+                  </node>
+                  <node concept="3cmrfG" id="6vHuLLnDrgr" role="3uHU7B">
+                    <property role="3cmrfH" value="4" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6vHuLLnDzWa" role="3cqZAp" />
+        <node concept="3SKdUt" id="6vHuLLnDsGg" role="3cqZAp">
+          <node concept="1PaTwC" id="6vHuLLnDsGh" role="1aUNEU">
+            <node concept="3oM_SD" id="6vHuLLnDsH_" role="1PaTwD">
+              <property role="3oM_SC" value="this" />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDsHA" role="1PaTwD">
+              <property role="3oM_SC" value="will" />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDsHB" role="1PaTwD">
+              <property role="3oM_SC" value="return" />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDzV3" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDzV4" role="1PaTwD">
+              <property role="3oM_SC" value="empty" />
+            </node>
+            <node concept="3oM_SD" id="6vHuLLnDzVT" role="1PaTwD">
+              <property role="3oM_SC" value="sequence" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6vHuLLnDO0a" role="3cqZAp">
+          <node concept="3cpWsn" id="6vHuLLnDO0b" role="3cpWs9">
+            <property role="TrG5h" value="invalidRangeStatic" />
+            <node concept="A3Dl8" id="6vHuLLnDNYJ" role="1tU5fm">
+              <node concept="10Oyi0" id="6vHuLLnDNYM" role="A3Ik2" />
+            </node>
+            <node concept="2hHQnJ" id="6vHuLLnDO0c" role="33vP2m">
+              <node concept="2hHTnT" id="6vHuLLnDO0d" role="2hHTnU">
+                <property role="KjLWg" value="10" />
+              </node>
+              <node concept="2hHTnT" id="6vHuLLnDO0e" role="2hHTnP">
+                <property role="KjLWg" value="9" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6vHuLLnDsrn" role="3cqZAp">
+          <node concept="3cpWsn" id="6vHuLLnDsro" role="3cpWs9">
+            <property role="TrG5h" value="invalidRangeDynamic" />
+            <node concept="A3Dl8" id="6vHuLLnDspR" role="1tU5fm">
+              <node concept="10Oyi0" id="6vHuLLnDspU" role="A3Ik2" />
+            </node>
+            <node concept="2hHQnJ" id="6vHuLLnDsrp" role="33vP2m">
+              <node concept="2hHTnS" id="6vHuLLnDsrq" role="2hHTnU">
+                <node concept="2OqwBi" id="6vHuLLnDsrr" role="2hHTnV">
+                  <node concept="37vLTw" id="6vHuLLnDsrs" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6vHuLLnDqk_" resolve="from10ToInfinite" />
+                  </node>
+                  <node concept="1uHKPH" id="6vHuLLnDsrt" role="2OqNvi" />
+                </node>
+              </node>
+              <node concept="2hHTnS" id="6vHuLLnDsru" role="2hHTnP">
+                <node concept="2OqwBi" id="6vHuLLnDsrv" role="2hHTnV">
+                  <node concept="37vLTw" id="6vHuLLnDsrw" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6vHuLLnDq4E" resolve="from0To100" />
+                  </node>
+                  <node concept="1uHKPH" id="6vHuLLnDsrx" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6vHuLLnBZIk" role="1B3o_S" />
+      <node concept="3cqZAl" id="6vHuLLnBZIE" role="3clF45" />
+    </node>
+    <node concept="3Tm1VV" id="6vHuLLnBVK0" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl b/code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl
index 02cf3f068f..b1e9635e0b 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl
@@ -84,14 +84,12 @@
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
-    <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
-    <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
index d78a125920..f13f37786b 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
@@ -29,6 +29,9 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -48,10 +51,19 @@
       <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
         <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
       </concept>
+      <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="ln" index="17Uvod">
+        <child id="1167756362303" name="propertyValueFunction" index="3zH0cK" />
+      </concept>
       <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
         <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
       </concept>
+      <concept id="1167756080639" name="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue" flags="in" index="3zFVjK" />
+      <concept id="1167945743726" name="jetbrains.mps.lang.generator.structure.IfMacro_Condition" flags="in" index="3IZrLx" />
       <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
+      <concept id="1118773211870" name="jetbrains.mps.lang.generator.structure.IfMacro" flags="ln" index="1W57fq">
+        <child id="1194989344771" name="alternativeConsequence" index="UU_$l" />
+        <child id="1167945861827" name="conditionFunction" index="3IZSJc" />
+      </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
@@ -59,6 +71,10 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
+      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
+        <reference id="1138056395725" name="property" index="3TsBF5" />
+      </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
@@ -67,6 +83,10 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
+      <concept id="3364660638048049750" name="jetbrains.mps.lang.core.structure.PropertyAttribute" flags="ng" index="A9Btg">
+        <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
+        <property id="1341860900487648621" name="propertyId" index="P4ACc" />
+      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -121,6 +141,135 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="6vHuLLnCYXz" role="3acgRq">
+      <ref role="30HIoZ" to="pkab:vJfcQmm5$y" resolve="IntegerRange" />
+      <node concept="gft3U" id="6vHuLLnCZ3c" role="1lVwrX">
+        <node concept="2YIFZM" id="6vHuLLnCZ3r" role="gfFT$">
+          <ref role="37wK5l" to="96gm:vJfcQmguHw" resolve="range" />
+          <ref role="1Pybhc" to="96gm:vJfcQmguGr" resolve="IntegerSequence" />
+          <node concept="3cmrfG" id="6vHuLLnCZ4h" role="37wK5m">
+            <property role="3cmrfH" value="0" />
+            <node concept="29HgVG" id="6vHuLLnCZJf" role="lGtFl">
+              <node concept="3NFfHV" id="6vHuLLnCZJJ" role="3NFExx">
+                <node concept="3clFbS" id="6vHuLLnCZJK" role="2VODD2">
+                  <node concept="3clFbF" id="6vHuLLnCZMq" role="3cqZAp">
+                    <node concept="2OqwBi" id="6vHuLLnCZPD" role="3clFbG">
+                      <node concept="30H73N" id="6vHuLLnCZMp" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="6vHuLLnCZQY" role="2OqNvi">
+                        <ref role="3Tt5mk" to="pkab:vJfcQmma$R" resolve="left" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cmrfG" id="6vHuLLnCZ5h" role="37wK5m">
+            <property role="3cmrfH" value="0" />
+            <node concept="29HgVG" id="6vHuLLnCZTW" role="lGtFl">
+              <node concept="3NFfHV" id="6vHuLLnCZV7" role="3NFExx">
+                <node concept="3clFbS" id="6vHuLLnCZV8" role="2VODD2">
+                  <node concept="3clFbF" id="6vHuLLnCZWP" role="3cqZAp">
+                    <node concept="2OqwBi" id="6vHuLLnCZXm" role="3clFbG">
+                      <node concept="30H73N" id="6vHuLLnCZWO" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="6vHuLLnCZYF" role="2OqNvi">
+                        <ref role="3Tt5mk" to="pkab:vJfcQmma$S" resolve="right" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1W57fq" id="6vHuLLnD1RL" role="lGtFl">
+            <node concept="3IZrLx" id="6vHuLLnD1RM" role="3IZSJc">
+              <node concept="3clFbS" id="6vHuLLnD1RN" role="2VODD2">
+                <node concept="3clFbF" id="6vHuLLnD1Yv" role="3cqZAp">
+                  <node concept="2OqwBi" id="6vHuLLnD2Du" role="3clFbG">
+                    <node concept="2OqwBi" id="6vHuLLnD2ie" role="2Oq$k0">
+                      <node concept="30H73N" id="6vHuLLnD1Yu" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="6vHuLLnD2tc" role="2OqNvi">
+                        <ref role="3Tt5mk" to="pkab:vJfcQmma$S" resolve="right" />
+                      </node>
+                    </node>
+                    <node concept="3x8VRR" id="6vHuLLnD2O2" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="gft3U" id="6vHuLLnD2S_" role="UU_$l">
+              <node concept="2YIFZM" id="6vHuLLnD2Vq" role="gfFT$">
+                <ref role="37wK5l" to="96gm:vJfcQmgyHy" resolve="range" />
+                <ref role="1Pybhc" to="96gm:vJfcQmguGr" resolve="IntegerSequence" />
+                <node concept="3cmrfG" id="6vHuLLnD2VO" role="37wK5m">
+                  <property role="3cmrfH" value="0" />
+                  <node concept="29HgVG" id="6vHuLLnD2WI" role="lGtFl">
+                    <node concept="3NFfHV" id="6vHuLLnD2X9" role="3NFExx">
+                      <node concept="3clFbS" id="6vHuLLnD2Xa" role="2VODD2">
+                        <node concept="3clFbF" id="6vHuLLnD31n" role="3cqZAp">
+                          <node concept="2OqwBi" id="6vHuLLnD3f4" role="3clFbG">
+                            <node concept="30H73N" id="6vHuLLnD31m" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="6vHuLLnD3q8" role="2OqNvi">
+                              <ref role="3Tt5mk" to="pkab:vJfcQmma$R" resolve="left" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="6vHuLLnD017" role="3acgRq">
+      <ref role="30HIoZ" to="pkab:vJfcQmma$O" resolve="IntegerRangeConstantBound" />
+      <node concept="gft3U" id="6vHuLLnD0dX" role="1lVwrX">
+        <node concept="3cmrfG" id="6vHuLLnD0e1" role="gfFT$">
+          <property role="3cmrfH" value="0" />
+          <node concept="17Uvod" id="6vHuLLnD0e8" role="lGtFl">
+            <property role="2qtEX9" value="value" />
+            <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
+            <node concept="3zFVjK" id="6vHuLLnD0e9" role="3zH0cK">
+              <node concept="3clFbS" id="6vHuLLnD0ea" role="2VODD2">
+                <node concept="3clFbF" id="6vHuLLnD0eE" role="3cqZAp">
+                  <node concept="2OqwBi" id="6vHuLLnD0A4" role="3clFbG">
+                    <node concept="30H73N" id="6vHuLLnD0eD" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="6vHuLLnD0Vx" role="2OqNvi">
+                      <ref role="3TsBF5" to="pkab:6vHuLLnCAgc" resolve="value" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="6vHuLLnD0Yv" role="3acgRq">
+      <ref role="30HIoZ" to="pkab:vJfcQmma$P" resolve="IntegerRangeExpressionBound" />
+      <node concept="gft3U" id="6vHuLLnD1gc" role="1lVwrX">
+        <node concept="3cmrfG" id="6vHuLLnD1gg" role="gfFT$">
+          <property role="3cmrfH" value="0" />
+          <node concept="29HgVG" id="6vHuLLnD1gr" role="lGtFl">
+            <node concept="3NFfHV" id="6vHuLLnD1gv" role="3NFExx">
+              <node concept="3clFbS" id="6vHuLLnD1gw" role="2VODD2">
+                <node concept="3clFbF" id="6vHuLLnD1km" role="3cqZAp">
+                  <node concept="2OqwBi" id="6vHuLLnD1y3" role="3clFbG">
+                    <node concept="30H73N" id="6vHuLLnD1kl" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="6vHuLLnD1H7" role="2OqNvi">
+                      <ref role="3Tt5mk" to="pkab:vJfcQmma$Q" resolve="expression" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.constraints.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.constraints.mps
index 679c51f0a5..1abf125080 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.constraints.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.constraints.mps
@@ -2,18 +2,67 @@
 <model ref="r:ef77ae2b-58ea-4c2a-9bab-de7fe5ec2b15(de.itemis.mps.baseLanguageExtensions.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="5dae8159-ab99-46bb-a40d-0cee30ee7018" name="jetbrains.mps.lang.constraints.rules.kinds" version="0" />
-    <use id="ea3159bf-f48e-4720-bde2-86dba75f0d34" name="jetbrains.mps.lang.context.defs" version="0" />
-    <use id="e51810c5-7308-4642-bcb6-469e61b5dd18" name="jetbrains.mps.lang.constraints.msg.specification" version="0" />
-    <use id="134c38d4-e3af-4d9e-b069-1c7df0a4005d" name="jetbrains.mps.lang.constraints.rules.skeleton" version="0" />
-    <use id="b3551702-269c-4f05-ba61-58060cef4292" name="jetbrains.mps.lang.rulesAndMessages" version="0" />
     <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="6" />
-    <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
-    <use id="3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7" name="jetbrains.mps.lang.context" version="0" />
-    <use id="ad93155d-79b2-4759-b10c-55123e763903" name="jetbrains.mps.lang.messages" version="0" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
-  <imports />
-  <registry />
+  <imports>
+    <import index="pkab" ref="r:63a6d225-96f6-404a-a9eb-033dc2f950a1(de.itemis.mps.baseLanguageExtensions.structure)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+    </language>
+    <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints">
+      <concept id="6702802731807351367" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_CanBeAChild" flags="in" index="9S07l" />
+      <concept id="1202989658459" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_parentNode" flags="nn" index="nLn13" />
+      <concept id="1213093968558" name="jetbrains.mps.lang.constraints.structure.ConceptConstraints" flags="ng" index="1M2fIO">
+        <reference id="1213093996982" name="concept" index="1M2myG" />
+        <child id="6702802731807737306" name="canBeChild" index="9Vyp8" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
+        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
+      </concept>
+      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
+        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="1M2fIO" id="vJfcQmmcil">
+    <property role="3GE5qa" value="integerRange" />
+    <ref role="1M2myG" to="pkab:vJfcQmma$M" resolve="IntegerRangeBound" />
+    <node concept="9S07l" id="vJfcQmmcim" role="9Vyp8">
+      <node concept="3clFbS" id="vJfcQmmcin" role="2VODD2">
+        <node concept="3clFbF" id="vJfcQmmcnd" role="3cqZAp">
+          <node concept="2OqwBi" id="vJfcQmmcAz" role="3clFbG">
+            <node concept="nLn13" id="vJfcQmmcnc" role="2Oq$k0" />
+            <node concept="1mIQ4w" id="vJfcQmmcNB" role="2OqNvi">
+              <node concept="chp4Y" id="vJfcQmmcQ7" role="cj9EA">
+                <ref role="cht4Q" to="pkab:vJfcQmm5$y" resolve="IntegerRange" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.editor.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.editor.mps
index 53986484dd..3f7449b55d 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.editor.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.editor.mps
@@ -6,7 +6,411 @@
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
-  <imports />
-  <registry />
+  <imports>
+    <import index="pkab" ref="r:63a6d225-96f6-404a-a9eb-033dc2f950a1(de.itemis.mps.baseLanguageExtensions.structure)" implicit="true" />
+    <import index="tpen" ref="r:00000000-0000-4000-0000-011c895902c3(jetbrains.mps.baseLanguage.editor)" implicit="true" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
+      <concept id="5991739802479784074" name="jetbrains.mps.lang.editor.structure.MenuTypeNamed" flags="ng" index="22hDWg" />
+      <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+        <child id="414384289274416996" name="parts" index="3ft7WO" />
+      </concept>
+      <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
+      <concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi" />
+      <concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
+      <concept id="6089045305654894367" name="jetbrains.mps.lang.editor.structure.SubstituteMenuReference_Named" flags="ng" index="2kknPI">
+        <reference id="6089045305654944382" name="menu" index="2kkw0f" />
+      </concept>
+      <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
+      <concept id="1177327274449" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_pattern" flags="nn" index="ub8z3" />
+      <concept id="1177327570013" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Substitute" flags="in" index="ucgPf" />
+      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
+        <child id="8478191136883534238" name="features" index="upBLP" />
+      </concept>
+      <concept id="1177335944525" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_SubstituteString" flags="in" index="uGdhv" />
+      <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
+        <child id="1080736633877" name="cellModel" index="2wV5jI" />
+      </concept>
+      <concept id="615427434521884870" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Subconcepts" flags="ng" index="2VfDsV" />
+      <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
+        <property id="1186414551515" name="flag" index="VOm3f" />
+      </concept>
+      <concept id="1186414949600" name="jetbrains.mps.lang.editor.structure.AutoDeletableStyleClassItem" flags="ln" index="VPRnO" />
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+        <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
+        <child id="5991739802479788259" name="type" index="22hAXT" />
+      </concept>
+      <concept id="8998492695583109601" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_CanSubstitute" flags="ig" index="16Na2f" />
+      <concept id="8998492695583125082" name="jetbrains.mps.lang.editor.structure.SubstituteFeature_MatchingText" flags="ng" index="16NfWO">
+        <child id="8998492695583129244" name="query" index="16NeZM" />
+      </concept>
+      <concept id="8998492695583129991" name="jetbrains.mps.lang.editor.structure.SubstituteFeature_CanSubstitute" flags="ng" index="16NL3D">
+        <child id="8998492695583129992" name="query" index="16NL3A" />
+      </concept>
+      <concept id="7342352913006985483" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Action" flags="ng" index="3eGOop">
+        <child id="8612453216082699922" name="substituteHandler" index="3aKz83" />
+      </concept>
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+        <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
+      </concept>
+      <concept id="7580468736840446506" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_model" flags="nn" index="1rpKSd" />
+      <concept id="730181322658904464" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_IncludeMenu" flags="ng" index="1s_PAr">
+        <child id="730181322658904467" name="menuReference" index="1s_PAo" />
+      </concept>
+      <concept id="5425882385312046132" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_SubstituteMenu_CurrentTargetNode" flags="nn" index="1yR$tW" />
+      <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
+        <property id="1139852716018" name="noTargetText" index="1$x2rV" />
+        <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
+      </concept>
+      <concept id="7991336459489871999" name="jetbrains.mps.lang.editor.structure.IOutputConceptSubstituteMenuPart" flags="ng" index="3EoQpk">
+        <reference id="7991336459489872009" name="outputConcept" index="3EoQqy" />
+      </concept>
+      <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
+        <child id="1106270802874" name="cellLayout" index="2iSdaV" />
+        <child id="1073389446424" name="childCellModel" index="3EZMnx" />
+      </concept>
+      <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
+        <property id="1073389577007" name="text" index="3F0ifm" />
+      </concept>
+      <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+        <child id="1219418656006" name="styleItem" index="3F10Kt" />
+      </concept>
+      <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
+        <property id="16410578721444372" name="customizeEmptyCell" index="2ru_X1" />
+        <child id="16410578721629643" name="emptyCellModel" index="2ruayu" />
+      </concept>
+      <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
+        <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
+      </concept>
+    </language>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="8118189177080264853" name="jetbrains.mps.baseLanguage.structure.AlternativeType" flags="ig" index="nSUau">
+        <child id="8118189177080264854" name="alternative" index="nSUat" />
+      </concept>
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="4952749571008284462" name="jetbrains.mps.baseLanguage.structure.CatchVariable" flags="ng" index="XOnhg" />
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
+      <concept id="3093926081414150598" name="jetbrains.mps.baseLanguage.structure.MultipleCatchClause" flags="ng" index="3uVAMA">
+        <child id="8276990574895933173" name="catchBody" index="1zc67A" />
+        <child id="8276990574895933172" name="throwable" index="1zc67B" />
+      </concept>
+      <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
+        <child id="8276990574886367510" name="catchClause" index="1zxBo5" />
+        <child id="8276990574886367508" name="body" index="1zxBo7" />
+      </concept>
+    </language>
+    <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
+      <concept id="5480835971642155304" name="jetbrains.mps.lang.actions.structure.NF_Model_CreateNewNodeOperation" flags="nn" index="15TzpJ" />
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
+        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
+      </concept>
+      <concept id="1143235216708" name="jetbrains.mps.lang.smodel.structure.Model_CreateNewNodeOperation" flags="nn" index="I8ghe">
+        <reference id="1143235391024" name="concept" index="I8UWU" />
+      </concept>
+      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
+        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
+      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
+      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
+        <reference id="1138056395725" name="property" index="3TsBF5" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="24kQdi" id="vJfcQmmcTO">
+    <property role="3GE5qa" value="integerRange" />
+    <ref role="1XX52x" to="pkab:vJfcQmma$P" resolve="IntegerRangeExpressionBound" />
+    <node concept="3EZMnI" id="vJfcQmmcTQ" role="2wV5jI">
+      <node concept="3F0ifn" id="vJfcQmmcTU" role="3EZMnx">
+        <property role="3F0ifm" value="#" />
+        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
+      </node>
+      <node concept="3F1sOY" id="vJfcQmmcTX" role="3EZMnx">
+        <ref role="1NtTu8" to="pkab:vJfcQmma$Q" resolve="expression" />
+      </node>
+      <node concept="2iRfu4" id="vJfcQmmcTT" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="6vHuLLnBMBC">
+    <property role="3GE5qa" value="integerRange" />
+    <ref role="1XX52x" to="pkab:vJfcQmm5$y" resolve="IntegerRange" />
+    <node concept="3EZMnI" id="6vHuLLnBMBE" role="2wV5jI">
+      <node concept="3F0ifn" id="6vHuLLnBMBI" role="3EZMnx">
+        <property role="3F0ifm" value="[" />
+        <ref role="1k5W1q" to="tpen:hFCSAw$" resolve="LeftParen" />
+      </node>
+      <node concept="3F1sOY" id="6vHuLLnBMBQ" role="3EZMnx">
+        <ref role="1NtTu8" to="pkab:vJfcQmma$R" resolve="left" />
+      </node>
+      <node concept="3F0ifn" id="6vHuLLnBMBT" role="3EZMnx">
+        <property role="3F0ifm" value=".." />
+        <ref role="1k5W1q" to="tpen:hFDnyG9" resolve="Dot" />
+      </node>
+      <node concept="3F1sOY" id="6vHuLLnBMBY" role="3EZMnx">
+        <property role="2ru_X1" value="true" />
+        <ref role="1NtTu8" to="pkab:vJfcQmma$S" resolve="right" />
+        <node concept="3F0ifn" id="6vHuLLnC3wX" role="2ruayu">
+          <property role="3F0ifm" value="inf" />
+          <ref role="1k5W1q" to="tpen:4vDGnVWLnSS" resolve="Placeholder" />
+        </node>
+      </node>
+      <node concept="3F0ifn" id="6vHuLLnBMBL" role="3EZMnx">
+        <property role="3F0ifm" value="]" />
+        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
+      </node>
+      <node concept="l2Vlx" id="6vHuLLnBMBH" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="6vHuLLnCAgd">
+    <property role="3GE5qa" value="integerRange" />
+    <ref role="1XX52x" to="pkab:vJfcQmma$O" resolve="IntegerRangeConstantBound" />
+    <node concept="3F0A7n" id="6vHuLLnCAgf" role="2wV5jI">
+      <property role="1$x2rV" value="&lt;int constant&gt;" />
+      <ref role="1NtTu8" to="pkab:6vHuLLnCAgc" resolve="value" />
+      <ref role="1k5W1q" to="tpen:hshT4rC" resolve="NumericLiteral" />
+      <node concept="VPRnO" id="6vHuLLnCAV1" role="3F10Kt">
+        <property role="VOm3f" value="true" />
+      </node>
+    </node>
+  </node>
+  <node concept="22mcaB" id="6vHuLLnCBGS">
+    <property role="3GE5qa" value="integerRange" />
+    <ref role="aqKnT" to="pkab:vJfcQmma$M" resolve="IntegerRangeBound" />
+    <node concept="22hDWg" id="6vHuLLnCBIn" role="22hAXT">
+      <property role="TrG5h" value="constant" />
+    </node>
+    <node concept="3eGOop" id="6vHuLLnCBIo" role="3ft7WO">
+      <ref role="3EoQqy" to="pkab:vJfcQmma$O" resolve="IntegerRangeConstantBound" />
+      <node concept="ucgPf" id="6vHuLLnCBIp" role="3aKz83">
+        <node concept="3clFbS" id="6vHuLLnCBIq" role="2VODD2">
+          <node concept="3cpWs8" id="6vHuLLnCC8f" role="3cqZAp">
+            <node concept="3cpWsn" id="6vHuLLnCC8g" role="3cpWs9">
+              <property role="TrG5h" value="constBound" />
+              <node concept="3Tqbb2" id="6vHuLLnCC7Q" role="1tU5fm">
+                <ref role="ehGHo" to="pkab:vJfcQmma$O" resolve="IntegerRangeConstantBound" />
+              </node>
+              <node concept="2OqwBi" id="6vHuLLnCC8h" role="33vP2m">
+                <node concept="1rpKSd" id="6vHuLLnCC8i" role="2Oq$k0" />
+                <node concept="15TzpJ" id="6vHuLLnCC8j" role="2OqNvi">
+                  <ref role="I8UWU" to="pkab:vJfcQmma$O" resolve="IntegerRangeConstantBound" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3J1_TO" id="6vHuLLnCCyz" role="3cqZAp">
+            <node concept="3uVAMA" id="6vHuLLnCCzw" role="1zxBo5">
+              <node concept="XOnhg" id="6vHuLLnCCzx" role="1zc67B">
+                <property role="TrG5h" value="e" />
+                <node concept="nSUau" id="6vHuLLnCCzy" role="1tU5fm">
+                  <node concept="3uibUv" id="6vHuLLnCC$t" role="nSUat">
+                    <ref role="3uigEE" to="wyt6:~NumberFormatException" resolve="NumberFormatException" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbS" id="6vHuLLnCCzz" role="1zc67A">
+                <node concept="3clFbF" id="6vHuLLnCG_Z" role="3cqZAp">
+                  <node concept="37vLTI" id="6vHuLLnCIZ$" role="3clFbG">
+                    <node concept="2OqwBi" id="6vHuLLnCGLw" role="37vLTJ">
+                      <node concept="37vLTw" id="6vHuLLnCG_Y" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6vHuLLnCC8g" resolve="constBound" />
+                      </node>
+                      <node concept="3TrcHB" id="6vHuLLnCGZM" role="2OqNvi">
+                        <ref role="3TsBF5" to="pkab:6vHuLLnCAgc" resolve="value" />
+                      </node>
+                    </node>
+                    <node concept="3cmrfG" id="6vHuLLnCJrt" role="37vLTx">
+                      <property role="3cmrfH" value="0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="6vHuLLnCCy_" role="1zxBo7">
+              <node concept="3cpWs8" id="6vHuLLnCDMf" role="3cqZAp">
+                <node concept="3cpWsn" id="6vHuLLnCDMg" role="3cpWs9">
+                  <property role="TrG5h" value="value" />
+                  <node concept="10Oyi0" id="6vHuLLnCD$x" role="1tU5fm" />
+                  <node concept="2YIFZM" id="6vHuLLnCDMh" role="33vP2m">
+                    <ref role="37wK5l" to="wyt6:~Integer.parseInt(java.lang.String)" resolve="parseInt" />
+                    <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
+                    <node concept="ub8z3" id="6vHuLLnCDMi" role="37wK5m" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="6vHuLLnCDVv" role="3cqZAp">
+                <node concept="37vLTI" id="6vHuLLnCGxE" role="3clFbG">
+                  <node concept="37vLTw" id="6vHuLLnCG$v" role="37vLTx">
+                    <ref role="3cqZAo" node="6vHuLLnCDMg" resolve="value" />
+                  </node>
+                  <node concept="2OqwBi" id="6vHuLLnCEaG" role="37vLTJ">
+                    <node concept="37vLTw" id="6vHuLLnCDVt" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6vHuLLnCC8g" resolve="constBound" />
+                    </node>
+                    <node concept="3TrcHB" id="6vHuLLnCEtn" role="2OqNvi">
+                      <ref role="3TsBF5" to="pkab:6vHuLLnCAgc" resolve="value" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6vHuLLnCBNQ" role="3cqZAp">
+            <node concept="37vLTw" id="6vHuLLnCC8k" role="3clFbG">
+              <ref role="3cqZAo" node="6vHuLLnCC8g" resolve="constBound" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="16NL3D" id="6vHuLLnCJXB" role="upBLP">
+        <node concept="16Na2f" id="6vHuLLnCJXD" role="16NL3A">
+          <node concept="3clFbS" id="6vHuLLnCJXF" role="2VODD2">
+            <node concept="3clFbJ" id="6vHuLLnCK40" role="3cqZAp">
+              <node concept="2OqwBi" id="6vHuLLnCKe_" role="3clFbw">
+                <node concept="1yR$tW" id="6vHuLLnCK4$" role="2Oq$k0" />
+                <node concept="1mIQ4w" id="6vHuLLnCKpp" role="2OqNvi">
+                  <node concept="chp4Y" id="6vHuLLnCKs6" role="cj9EA">
+                    <ref role="cht4Q" to="pkab:vJfcQmma$O" resolve="IntegerRangeConstantBound" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbS" id="6vHuLLnCK42" role="3clFbx">
+                <node concept="3cpWs6" id="6vHuLLnCKtG" role="3cqZAp">
+                  <node concept="3clFbT" id="6vHuLLnCKuF" role="3cqZAk" />
+                </node>
+              </node>
+            </node>
+            <node concept="3J1_TO" id="6vHuLLnCKB4" role="3cqZAp">
+              <node concept="3uVAMA" id="6vHuLLnCKB5" role="1zxBo5">
+                <node concept="XOnhg" id="6vHuLLnCKB6" role="1zc67B">
+                  <property role="TrG5h" value="e" />
+                  <node concept="nSUau" id="6vHuLLnCKB7" role="1tU5fm">
+                    <node concept="3uibUv" id="6vHuLLnCKB8" role="nSUat">
+                      <ref role="3uigEE" to="wyt6:~NumberFormatException" resolve="NumberFormatException" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbS" id="6vHuLLnCKB9" role="1zc67A">
+                  <node concept="3cpWs6" id="6vHuLLnCL3_" role="3cqZAp">
+                    <node concept="3clFbT" id="6vHuLLnCL3N" role="3cqZAk" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbS" id="6vHuLLnCKBg" role="1zxBo7">
+                <node concept="3cpWs8" id="6vHuLLnCKBh" role="3cqZAp">
+                  <node concept="3cpWsn" id="6vHuLLnCKBi" role="3cpWs9">
+                    <property role="TrG5h" value="value" />
+                    <node concept="10Oyi0" id="6vHuLLnCKBj" role="1tU5fm" />
+                    <node concept="2YIFZM" id="6vHuLLnCKBk" role="33vP2m">
+                      <ref role="37wK5l" to="wyt6:~Integer.parseInt(java.lang.String)" resolve="parseInt" />
+                      <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
+                      <node concept="ub8z3" id="6vHuLLnCKBl" role="37wK5m" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWs6" id="6vHuLLnCL1F" role="3cqZAp">
+                  <node concept="3clFbT" id="6vHuLLnCL1S" role="3cqZAk">
+                    <property role="3clFbU" value="true" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="16NfWO" id="6vHuLLnCJDC" role="upBLP">
+        <node concept="uGdhv" id="6vHuLLnCJF5" role="16NeZM">
+          <node concept="3clFbS" id="6vHuLLnCJF7" role="2VODD2">
+            <node concept="3clFbF" id="6vHuLLnCJLo" role="3cqZAp">
+              <node concept="ub8z3" id="6vHuLLnCJLn" role="3clFbG" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="22mcaB" id="6vHuLLnCSxf">
+    <property role="3GE5qa" value="integerRange" />
+    <ref role="aqKnT" to="pkab:vJfcQmma$M" resolve="IntegerRangeBound" />
+    <node concept="22hDWj" id="6vHuLLnCSxg" role="22hAXT" />
+    <node concept="1s_PAr" id="6vHuLLnCSxh" role="3ft7WO">
+      <node concept="2kknPI" id="6vHuLLnCSxi" role="1s_PAo">
+        <ref role="2kkw0f" node="6vHuLLnCBGS" resolve="constant" />
+      </node>
+    </node>
+    <node concept="2VfDsV" id="6vHuLLnCSxk" role="3ft7WO" />
+  </node>
+  <node concept="22mcaB" id="6vHuLLnCVGo">
+    <property role="3GE5qa" value="integerRange" />
+    <ref role="aqKnT" to="pkab:vJfcQmma$O" resolve="IntegerRangeConstantBound" />
+    <node concept="22hDWj" id="6vHuLLnCVGp" role="22hAXT" />
+  </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
index 85ec66d5a3..bc011b659b 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
@@ -6,6 +6,7 @@
   </languages>
   <imports>
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
@@ -13,12 +14,33 @@
         <property id="6714410169261853888" name="conceptId" index="EcuMT" />
         <property id="4628067390765907488" name="conceptShortDescription" index="R4oN_" />
         <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
+        <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
+        <child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
+      </concept>
+      <concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ" />
+      <concept id="1169127622168" name="jetbrains.mps.lang.structure.structure.InterfaceConceptReference" flags="ig" index="PrWs8">
+        <reference id="1169127628841" name="intfc" index="PrY4T" />
       </concept>
       <concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
         <reference id="1071489389519" name="extends" index="1TJDcQ" />
+        <child id="1169129564478" name="implements" index="PzmwI" />
+      </concept>
+      <concept id="1071489288299" name="jetbrains.mps.lang.structure.structure.PropertyDeclaration" flags="ig" index="1TJgyi">
+        <property id="241647608299431129" name="propertyId" index="IQ2nx" />
+        <reference id="1082985295845" name="dataType" index="AX2Wp" />
+      </concept>
+      <concept id="1071489288298" name="jetbrains.mps.lang.structure.structure.LinkDeclaration" flags="ig" index="1TJgyj">
+        <property id="1071599776563" name="role" index="20kJfa" />
+        <property id="1071599893252" name="sourceCardinality" index="20lbJX" />
+        <property id="1071599937831" name="metaClass" index="20lmBu" />
+        <property id="241647608299431140" name="linkId" index="IQ2ns" />
+        <reference id="1071599976176" name="target" index="20lvS9" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -31,5 +53,62 @@
     <property role="R4oN_" value="elvis operation" />
     <ref role="1TJDcQ" to="tpee:fJuHJVf" resolve="BinaryOperation" />
   </node>
+  <node concept="1TIwiD" id="vJfcQmm5$y">
+    <property role="EcuMT" value="571742531387676962" />
+    <property role="TrG5h" value="IntegerRange" />
+    <property role="34LRSv" value="[n..m]" />
+    <property role="R4oN_" value="integer range from n to m" />
+    <property role="3GE5qa" value="integerRange" />
+    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
+    <node concept="1TJgyj" id="vJfcQmma$R" role="1TKVEi">
+      <property role="IQ2ns" value="571742531387697463" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="left" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" node="vJfcQmma$M" resolve="IntegerRangeBound" />
+    </node>
+    <node concept="1TJgyj" id="vJfcQmma$S" role="1TKVEi">
+      <property role="IQ2ns" value="571742531387697464" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="right" />
+      <ref role="20lvS9" node="vJfcQmma$M" resolve="IntegerRangeBound" />
+    </node>
+  </node>
+  <node concept="PlHQZ" id="vJfcQmma$M">
+    <property role="EcuMT" value="571742531387697458" />
+    <property role="TrG5h" value="IntegerRangeBound" />
+    <property role="3GE5qa" value="integerRange" />
+  </node>
+  <node concept="1TIwiD" id="vJfcQmma$O">
+    <property role="EcuMT" value="571742531387697460" />
+    <property role="TrG5h" value="IntegerRangeConstantBound" />
+    <property role="R4oN_" value="integer constant bound" />
+    <property role="3GE5qa" value="integerRange" />
+    <node concept="PrWs8" id="6vHuLLnBZL$" role="PzmwI">
+      <ref role="PrY4T" node="vJfcQmma$M" resolve="IntegerRangeBound" />
+    </node>
+    <node concept="1TJgyi" id="6vHuLLnCAgc" role="1TKVEl">
+      <property role="IQ2nx" value="7488777117046563852" />
+      <property role="TrG5h" value="value" />
+      <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="vJfcQmma$P">
+    <property role="EcuMT" value="571742531387697461" />
+    <property role="TrG5h" value="IntegerRangeExpressionBound" />
+    <property role="34LRSv" value="#" />
+    <property role="3GE5qa" value="integerRange" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="vJfcQmma$Q" role="1TKVEi">
+      <property role="IQ2ns" value="571742531387697462" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="expression" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+    <node concept="PrWs8" id="6vHuLLnBZL_" role="PzmwI">
+      <ref role="PrY4T" node="vJfcQmma$M" resolve="IntegerRangeBound" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
index fdc83af03d..9b61803993 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
@@ -19,6 +19,16 @@
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -26,14 +36,36 @@
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
       <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
+    </language>
+    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
+      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
+        <child id="1196350785114" name="quotedNode" index="2c44tc" />
+      </concept>
     </language>
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
+      <concept id="1207055528241" name="jetbrains.mps.lang.typesystem.structure.WarningStatement" flags="nn" index="a7r0C">
+        <child id="1207055552304" name="warningText" index="a7wSD" />
+      </concept>
       <concept id="1766949807893567867" name="jetbrains.mps.lang.typesystem.structure.OverridesConceptFunction" flags="ig" index="bXqS6" />
       <concept id="1185788614172" name="jetbrains.mps.lang.typesystem.structure.NormalTypeClause" flags="ng" index="mw_s8">
         <child id="1185788644032" name="normalType" index="mwGJk" />
@@ -46,6 +78,9 @@
       <concept id="1220357310820" name="jetbrains.mps.lang.typesystem.structure.AddDependencyStatement" flags="nn" index="yXGxS">
         <child id="1220357350423" name="dependency" index="yXQkb" />
       </concept>
+      <concept id="1224760201579" name="jetbrains.mps.lang.typesystem.structure.InfoStatement" flags="nn" index="Dpp1Q">
+        <child id="1224760230762" name="infoText" index="Dpw9R" />
+      </concept>
       <concept id="1205762105978" name="jetbrains.mps.lang.typesystem.structure.WhenConcreteVariableDeclaration" flags="ng" index="2X1qdy" />
       <concept id="1205762656241" name="jetbrains.mps.lang.typesystem.structure.WhenConcreteVariableReference" flags="nn" index="2X3wrD">
         <reference id="1205762683928" name="whenConcreteVar" index="2X3Bk0" />
@@ -53,6 +88,10 @@
       <concept id="1195213580585" name="jetbrains.mps.lang.typesystem.structure.AbstractCheckingRule" flags="ig" index="18hYwZ">
         <child id="1195213635060" name="body" index="18ibNy" />
       </concept>
+      <concept id="1195214364922" name="jetbrains.mps.lang.typesystem.structure.NonTypesystemRule" flags="ig" index="18kY7G" />
+      <concept id="3937244445246642777" name="jetbrains.mps.lang.typesystem.structure.AbstractReportStatement" flags="ng" index="1urrMJ">
+        <child id="3937244445246642781" name="nodeToReport" index="1urrMF" />
+      </concept>
       <concept id="1174642788531" name="jetbrains.mps.lang.typesystem.structure.ConceptReference" flags="ig" index="1YaCAy">
         <reference id="1174642800329" name="concept" index="1YaFvo" />
       </concept>
@@ -68,22 +107,49 @@
       <concept id="1174657487114" name="jetbrains.mps.lang.typesystem.structure.TypeOfExpression" flags="nn" index="1Z2H0r">
         <child id="1174657509053" name="term" index="1Z2MuG" />
       </concept>
+      <concept id="1174658326157" name="jetbrains.mps.lang.typesystem.structure.CreateEquationStatement" flags="nn" index="1Z5TYs" />
       <concept id="1174660718586" name="jetbrains.mps.lang.typesystem.structure.AbstractEquationStatement" flags="nn" index="1Zf1VF">
         <child id="1174660783413" name="leftExpression" index="1ZfhK$" />
         <child id="1174660783414" name="rightExpression" index="1ZfhKB" />
       </concept>
+      <concept id="1174663118805" name="jetbrains.mps.lang.typesystem.structure.CreateLessThanInequationStatement" flags="nn" index="1ZobV4" />
       <concept id="1174663239020" name="jetbrains.mps.lang.typesystem.structure.CreateGreaterThanInequationStatement" flags="nn" index="1ZoDhX" />
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
+        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
+      </concept>
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
+      </concept>
+      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
+        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
+      </concept>
+      <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
+        <property id="1238684351431" name="asCast" index="1BlNFB" />
+      </concept>
+      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
+        <reference id="1138056395725" name="property" index="3TsBF5" />
+      </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
+        <child id="1151689745422" name="elementType" index="A3Ik2" />
+      </concept>
+    </language>
   </registry>
   <node concept="1YbPZF" id="w6MstC1zne">
     <property role="TrG5h" value="typeof_ElvisOperation" />
@@ -188,5 +254,274 @@
       </node>
     </node>
   </node>
+  <node concept="1YbPZF" id="vJfcQmmdaT">
+    <property role="TrG5h" value="typeof_IntegerRangeExpressionBound" />
+    <property role="3GE5qa" value="integerRange" />
+    <node concept="3clFbS" id="vJfcQmmdaU" role="18ibNy">
+      <node concept="1Z5TYs" id="vJfcQmmdwd" role="3cqZAp">
+        <node concept="mw_s8" id="vJfcQmmdwp" role="1ZfhKB">
+          <node concept="1Z2H0r" id="vJfcQmmdwl" role="mwGJk">
+            <node concept="2OqwBi" id="vJfcQmmdCm" role="1Z2MuG">
+              <node concept="1YBJjd" id="vJfcQmmdwB" role="2Oq$k0">
+                <ref role="1YBMHb" node="vJfcQmmdaW" resolve="expressionBound" />
+              </node>
+              <node concept="3TrEf2" id="vJfcQmmdN7" role="2OqNvi">
+                <ref role="3Tt5mk" to="pkab:vJfcQmma$Q" resolve="expression" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="vJfcQmmdwg" role="1ZfhK$">
+          <node concept="1Z2H0r" id="vJfcQmmdb2" role="mwGJk">
+            <node concept="1YBJjd" id="vJfcQmmdcT" role="1Z2MuG">
+              <ref role="1YBMHb" node="vJfcQmmdaW" resolve="expressionBound" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="vJfcQmmdaW" role="1YuTPh">
+      <property role="TrG5h" value="expressionBound" />
+      <ref role="1YaFvo" to="pkab:vJfcQmma$P" resolve="IntegerRangeExpressionBound" />
+    </node>
+  </node>
+  <node concept="1YbPZF" id="6vHuLLnC1v$">
+    <property role="TrG5h" value="typeof_IntegerRange" />
+    <property role="3GE5qa" value="integerRange" />
+    <node concept="3clFbS" id="6vHuLLnC1v_" role="18ibNy">
+      <node concept="1ZobV4" id="6vHuLLnC2eG" role="3cqZAp">
+        <node concept="mw_s8" id="6vHuLLnC2eS" role="1ZfhKB">
+          <node concept="2c44tf" id="6vHuLLnC2eO" role="mwGJk">
+            <node concept="10Oyi0" id="6vHuLLnC2fS" role="2c44tc" />
+          </node>
+        </node>
+        <node concept="mw_s8" id="6vHuLLnC2eJ" role="1ZfhK$">
+          <node concept="1Z2H0r" id="6vHuLLnC1vJ" role="mwGJk">
+            <node concept="2OqwBi" id="6vHuLLnC1Fv" role="1Z2MuG">
+              <node concept="1YBJjd" id="6vHuLLnC1xA" role="2Oq$k0">
+                <ref role="1YBMHb" node="6vHuLLnC1vB" resolve="integerRange" />
+              </node>
+              <node concept="3TrEf2" id="6vHuLLnC1S9" role="2OqNvi">
+                <ref role="3Tt5mk" to="pkab:vJfcQmma$R" resolve="left" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1ZobV4" id="6vHuLLnC2h9" role="3cqZAp">
+        <node concept="mw_s8" id="6vHuLLnC2ha" role="1ZfhKB">
+          <node concept="2c44tf" id="6vHuLLnC2hb" role="mwGJk">
+            <node concept="10Oyi0" id="6vHuLLnC2hc" role="2c44tc" />
+          </node>
+        </node>
+        <node concept="mw_s8" id="6vHuLLnC2hd" role="1ZfhK$">
+          <node concept="1Z2H0r" id="6vHuLLnC2he" role="mwGJk">
+            <node concept="2OqwBi" id="6vHuLLnC2hf" role="1Z2MuG">
+              <node concept="1YBJjd" id="6vHuLLnC2hg" role="2Oq$k0">
+                <ref role="1YBMHb" node="6vHuLLnC1vB" resolve="integerRange" />
+              </node>
+              <node concept="3TrEf2" id="6vHuLLnC2ym" role="2OqNvi">
+                <ref role="3Tt5mk" to="pkab:vJfcQmma$S" resolve="right" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1Z5TYs" id="6vHuLLnC2F2" role="3cqZAp">
+        <node concept="mw_s8" id="6vHuLLnC2Fe" role="1ZfhKB">
+          <node concept="2c44tf" id="6vHuLLnC2Fa" role="mwGJk">
+            <node concept="A3Dl8" id="6vHuLLnC2Ge" role="2c44tc">
+              <node concept="10Oyi0" id="6vHuLLnC2HJ" role="A3Ik2" />
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="6vHuLLnC2F5" role="1ZfhK$">
+          <node concept="1Z2H0r" id="6vHuLLnC2yI" role="mwGJk">
+            <node concept="1YBJjd" id="6vHuLLnC2$B" role="1Z2MuG">
+              <ref role="1YBMHb" node="6vHuLLnC1vB" resolve="integerRange" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="6vHuLLnC1vB" role="1YuTPh">
+      <property role="TrG5h" value="integerRange" />
+      <ref role="1YaFvo" to="pkab:vJfcQmm5$y" resolve="IntegerRange" />
+    </node>
+  </node>
+  <node concept="1YbPZF" id="6vHuLLnCAgh">
+    <property role="TrG5h" value="typeof_IntegerRangeConstantBound" />
+    <property role="3GE5qa" value="integerRange" />
+    <node concept="3clFbS" id="6vHuLLnCAgi" role="18ibNy">
+      <node concept="1ZobV4" id="6vHuLLnCASp" role="3cqZAp">
+        <node concept="mw_s8" id="6vHuLLnCAS_" role="1ZfhKB">
+          <node concept="2c44tf" id="6vHuLLnCASx" role="mwGJk">
+            <node concept="10Oyi0" id="6vHuLLnCAT_" role="2c44tc" />
+          </node>
+        </node>
+        <node concept="mw_s8" id="6vHuLLnCASs" role="1ZfhK$">
+          <node concept="1Z2H0r" id="6vHuLLnCAgy" role="mwGJk">
+            <node concept="1YBJjd" id="6vHuLLnCAip" role="1Z2MuG">
+              <ref role="1YBMHb" node="6vHuLLnCAgk" resolve="constantBound" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="6vHuLLnCAgk" role="1YuTPh">
+      <property role="TrG5h" value="constantBound" />
+      <ref role="1YaFvo" to="pkab:vJfcQmma$O" resolve="IntegerRangeConstantBound" />
+    </node>
+  </node>
+  <node concept="18kY7G" id="6vHuLLnDBCI">
+    <property role="TrG5h" value="check_InfiniteIntegerRange" />
+    <property role="3GE5qa" value="integerRange" />
+    <node concept="3clFbS" id="6vHuLLnDBCJ" role="18ibNy">
+      <node concept="3clFbJ" id="6vHuLLnDBCU" role="3cqZAp">
+        <node concept="2OqwBi" id="6vHuLLnDCcU" role="3clFbw">
+          <node concept="2OqwBi" id="6vHuLLnDBNJ" role="2Oq$k0">
+            <node concept="1YBJjd" id="6vHuLLnDBD3" role="2Oq$k0">
+              <ref role="1YBMHb" node="6vHuLLnDBCL" resolve="integerRange" />
+            </node>
+            <node concept="3TrEf2" id="6vHuLLnDC0m" role="2OqNvi">
+              <ref role="3Tt5mk" to="pkab:vJfcQmma$S" resolve="right" />
+            </node>
+          </node>
+          <node concept="3w_OXm" id="6vHuLLnDCoS" role="2OqNvi" />
+        </node>
+        <node concept="3clFbS" id="6vHuLLnDBCW" role="3clFbx">
+          <node concept="Dpp1Q" id="2leJi_I92sT" role="3cqZAp">
+            <node concept="1YBJjd" id="2leJi_I92tk" role="1urrMF">
+              <ref role="1YBMHb" node="6vHuLLnDBCL" resolve="integerRange" />
+            </node>
+            <node concept="Xl_RD" id="6vHuLLnDCta" role="Dpw9R">
+              <property role="Xl_RC" value="This sequence in infinite" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="6vHuLLnDBCL" role="1YuTPh">
+      <property role="TrG5h" value="integerRange" />
+      <ref role="1YaFvo" to="pkab:vJfcQmm5$y" resolve="IntegerRange" />
+    </node>
+  </node>
+  <node concept="18kY7G" id="6vHuLLnDF3b">
+    <property role="TrG5h" value="check_InvalidIntegerRange" />
+    <property role="3GE5qa" value="integerRange" />
+    <node concept="3clFbS" id="6vHuLLnDF3c" role="18ibNy">
+      <node concept="3clFbJ" id="6vHuLLnDF3u" role="3cqZAp">
+        <node concept="1Wc70l" id="6vHuLLnDH9G" role="3clFbw">
+          <node concept="2OqwBi" id="6vHuLLnDHIn" role="3uHU7w">
+            <node concept="2OqwBi" id="6vHuLLnDHo8" role="2Oq$k0">
+              <node concept="1YBJjd" id="6vHuLLnDHeO" role="2Oq$k0">
+                <ref role="1YBMHb" node="6vHuLLnDF3e" resolve="integerRange" />
+              </node>
+              <node concept="3TrEf2" id="6vHuLLnDH_g" role="2OqNvi">
+                <ref role="3Tt5mk" to="pkab:vJfcQmma$S" resolve="right" />
+              </node>
+            </node>
+            <node concept="1mIQ4w" id="6vHuLLnDHUQ" role="2OqNvi">
+              <node concept="chp4Y" id="6vHuLLnDHVP" role="cj9EA">
+                <ref role="cht4Q" to="pkab:vJfcQmma$O" resolve="IntegerRangeConstantBound" />
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="6vHuLLnDFBu" role="3uHU7B">
+            <node concept="2OqwBi" id="6vHuLLnDFej" role="2Oq$k0">
+              <node concept="1YBJjd" id="6vHuLLnDF3B" role="2Oq$k0">
+                <ref role="1YBMHb" node="6vHuLLnDF3e" resolve="integerRange" />
+              </node>
+              <node concept="3TrEf2" id="6vHuLLnDFqU" role="2OqNvi">
+                <ref role="3Tt5mk" to="pkab:vJfcQmma$R" resolve="left" />
+              </node>
+            </node>
+            <node concept="1mIQ4w" id="6vHuLLnDG4P" role="2OqNvi">
+              <node concept="chp4Y" id="6vHuLLnDG7e" role="cj9EA">
+                <ref role="cht4Q" to="pkab:vJfcQmma$O" resolve="IntegerRangeConstantBound" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbS" id="6vHuLLnDF3w" role="3clFbx">
+          <node concept="3cpWs8" id="6vHuLLnDJaI" role="3cqZAp">
+            <node concept="3cpWsn" id="6vHuLLnDJaJ" role="3cpWs9">
+              <property role="TrG5h" value="leftValue" />
+              <node concept="10Oyi0" id="6vHuLLnDJ8K" role="1tU5fm" />
+              <node concept="2OqwBi" id="6vHuLLnDJaK" role="33vP2m">
+                <node concept="1PxgMI" id="6vHuLLnDJaL" role="2Oq$k0">
+                  <property role="1BlNFB" value="true" />
+                  <node concept="chp4Y" id="6vHuLLnDJaM" role="3oSUPX">
+                    <ref role="cht4Q" to="pkab:vJfcQmma$O" resolve="IntegerRangeConstantBound" />
+                  </node>
+                  <node concept="2OqwBi" id="6vHuLLnDJaN" role="1m5AlR">
+                    <node concept="1YBJjd" id="6vHuLLnDJaO" role="2Oq$k0">
+                      <ref role="1YBMHb" node="6vHuLLnDF3e" resolve="integerRange" />
+                    </node>
+                    <node concept="3TrEf2" id="6vHuLLnDJaP" role="2OqNvi">
+                      <ref role="3Tt5mk" to="pkab:vJfcQmma$R" resolve="left" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3TrcHB" id="6vHuLLnDJaQ" role="2OqNvi">
+                  <ref role="3TsBF5" to="pkab:6vHuLLnCAgc" resolve="value" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="6vHuLLnDJcY" role="3cqZAp">
+            <node concept="3cpWsn" id="6vHuLLnDJcZ" role="3cpWs9">
+              <property role="TrG5h" value="rightValue" />
+              <node concept="10Oyi0" id="6vHuLLnDJd0" role="1tU5fm" />
+              <node concept="2OqwBi" id="6vHuLLnDJd1" role="33vP2m">
+                <node concept="1PxgMI" id="6vHuLLnDJd2" role="2Oq$k0">
+                  <property role="1BlNFB" value="true" />
+                  <node concept="chp4Y" id="6vHuLLnDJd3" role="3oSUPX">
+                    <ref role="cht4Q" to="pkab:vJfcQmma$O" resolve="IntegerRangeConstantBound" />
+                  </node>
+                  <node concept="2OqwBi" id="6vHuLLnDJd4" role="1m5AlR">
+                    <node concept="1YBJjd" id="6vHuLLnDJd5" role="2Oq$k0">
+                      <ref role="1YBMHb" node="6vHuLLnDF3e" resolve="integerRange" />
+                    </node>
+                    <node concept="3TrEf2" id="6vHuLLnDJEl" role="2OqNvi">
+                      <ref role="3Tt5mk" to="pkab:vJfcQmma$S" resolve="right" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3TrcHB" id="6vHuLLnDJd7" role="2OqNvi">
+                  <ref role="3TsBF5" to="pkab:6vHuLLnCAgc" resolve="value" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbJ" id="6vHuLLnDJFa" role="3cqZAp">
+            <node concept="3clFbS" id="6vHuLLnDJFc" role="3clFbx">
+              <node concept="a7r0C" id="6vHuLLnDMqM" role="3cqZAp">
+                <node concept="Xl_RD" id="6vHuLLnDMqY" role="a7wSD">
+                  <property role="Xl_RC" value="Left bound greater than right bound" />
+                </node>
+                <node concept="1YBJjd" id="6vHuLLnDMsg" role="1urrMF">
+                  <ref role="1YBMHb" node="6vHuLLnDF3e" resolve="integerRange" />
+                </node>
+              </node>
+            </node>
+            <node concept="3eOSWO" id="5IoIE_Gblbx" role="3clFbw">
+              <node concept="37vLTw" id="6vHuLLnDJFl" role="3uHU7B">
+                <ref role="3cqZAo" node="6vHuLLnDJaJ" resolve="leftValue" />
+              </node>
+              <node concept="37vLTw" id="6vHuLLnDMjW" role="3uHU7w">
+                <ref role="3cqZAo" node="6vHuLLnDJcZ" resolve="rightValue" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="6vHuLLnDJcR" role="3cqZAp" />
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="6vHuLLnDF3e" role="1YuTPh">
+      <property role="TrG5h" value="integerRange" />
+      <ref role="1YaFvo" to="pkab:vJfcQmm5$y" resolve="IntegerRange" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd
index 9dfa590493..096dc7144e 100644
--- a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd
+++ b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd
@@ -19,6 +19,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
diff --git a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.integerSequence@tests.mps b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.integerSequence@tests.mps
new file mode 100644
index 0000000000..52a53e3ce2
--- /dev/null
+++ b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.integerSequence@tests.mps
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:e932e1bd-ff59-4a9b-a3c3-091902687aa2(de.itemis.mps.baseLanguageExtensions.test.integerSequence@tests)">
+  <persistence version="9" />
+  <languages>
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
+    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+  </languages>
+  <imports>
+    <import index="96gm" ref="r:2eaed950-3bc1-47cd-9b02-e917ff994d7c(de.itemis.mps.baseLanguageExtensions.runtime)" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
+    </language>
+    <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
+      <concept id="1171931690126" name="jetbrains.mps.baseLanguage.unitTest.structure.TestMethod" flags="ig" index="3s$Bmu">
+        <property id="1171931690128" name="methodName" index="3s$Bm0" />
+      </concept>
+      <concept id="1171931851043" name="jetbrains.mps.baseLanguage.unitTest.structure.BTestCase" flags="ig" index="3s_ewN">
+        <property id="1171931851045" name="testCaseName" index="3s_ewP" />
+        <child id="1171931851044" name="testMethodList" index="3s_ewO" />
+      </concept>
+      <concept id="1171931858461" name="jetbrains.mps.baseLanguage.unitTest.structure.TestMethodList" flags="ng" index="3s_gsd">
+        <child id="1171931858462" name="testMethod" index="3s_gse" />
+      </concept>
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
+        <child id="540871147943773366" name="argument" index="25WWJ7" />
+      </concept>
+      <concept id="1172650591544" name="jetbrains.mps.baseLanguage.collections.structure.SkipOperation" flags="nn" index="7r0gD">
+        <child id="1172658456740" name="elementsToSkip" index="7T0AP" />
+      </concept>
+      <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
+        <child id="1151688676805" name="elementType" index="_ZDj9" />
+      </concept>
+      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
+        <child id="1151689745422" name="elementType" index="A3Ik2" />
+      </concept>
+      <concept id="6126991172893676625" name="jetbrains.mps.baseLanguage.collections.structure.ContainsAllOperation" flags="nn" index="BjQpj" />
+      <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
+        <child id="1237721435808" name="initValue" index="HW$Y0" />
+        <child id="1237721435807" name="elementType" index="HW$YZ" />
+      </concept>
+      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
+      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+      <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
+    </language>
+  </registry>
+  <node concept="3s_ewN" id="vJfcQmh5uk">
+    <property role="3s_ewP" value="IntegerSequence" />
+    <node concept="3Tm1VV" id="vJfcQmh5ul" role="1B3o_S" />
+    <node concept="3s_gsd" id="vJfcQmh5um" role="3s_ewO">
+      <node concept="3s$Bmu" id="vJfcQmh6Ps" role="3s_gse">
+        <property role="3s$Bm0" value="finiteRange" />
+        <node concept="3cqZAl" id="vJfcQmh6Pt" role="3clF45" />
+        <node concept="3Tm1VV" id="vJfcQmh6Pu" role="1B3o_S" />
+        <node concept="3clFbS" id="vJfcQmh6Pv" role="3clF47">
+          <node concept="3cpWs8" id="vJfcQmh6Py" role="3cqZAp">
+            <node concept="3cpWsn" id="vJfcQmh6Pz" role="3cpWs9">
+              <property role="TrG5h" value="expected" />
+              <node concept="_YKpA" id="vJfcQmh6P$" role="1tU5fm">
+                <node concept="10Oyi0" id="vJfcQmh6P_" role="_ZDj9" />
+              </node>
+              <node concept="2ShNRf" id="vJfcQmh6PA" role="33vP2m">
+                <node concept="Tc6Ow" id="vJfcQmh6PB" role="2ShVmc">
+                  <node concept="10Oyi0" id="vJfcQmh6PC" role="HW$YZ" />
+                  <node concept="3cmrfG" id="vJfcQmh6PD" role="HW$Y0">
+                    <property role="3cmrfH" value="1" />
+                  </node>
+                  <node concept="3cmrfG" id="vJfcQmh6PE" role="HW$Y0">
+                    <property role="3cmrfH" value="2" />
+                  </node>
+                  <node concept="3cmrfG" id="vJfcQmh6PF" role="HW$Y0">
+                    <property role="3cmrfH" value="3" />
+                  </node>
+                  <node concept="3cmrfG" id="vJfcQmh6PG" role="HW$Y0">
+                    <property role="3cmrfH" value="4" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="vJfcQmh6PH" role="3cqZAp">
+            <node concept="3cpWsn" id="vJfcQmh6PI" role="3cpWs9">
+              <property role="TrG5h" value="actual" />
+              <node concept="A3Dl8" id="vJfcQmh6PJ" role="1tU5fm">
+                <node concept="10Oyi0" id="vJfcQmh6PK" role="A3Ik2" />
+              </node>
+              <node concept="2YIFZM" id="vJfcQmh6PL" role="33vP2m">
+                <ref role="37wK5l" to="96gm:vJfcQmguHw" resolve="range" />
+                <ref role="1Pybhc" to="96gm:vJfcQmguGr" resolve="IntegerSequence" />
+                <node concept="3cmrfG" id="vJfcQmh6PM" role="37wK5m">
+                  <property role="3cmrfH" value="1" />
+                </node>
+                <node concept="3cmrfG" id="vJfcQmh6PN" role="37wK5m">
+                  <property role="3cmrfH" value="4" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3vwNmj" id="vJfcQmh6PO" role="3cqZAp">
+            <node concept="1Wc70l" id="vJfcQmh6PP" role="3vwVQn">
+              <node concept="2OqwBi" id="vJfcQmh6PQ" role="3uHU7w">
+                <node concept="37vLTw" id="vJfcQmh6PR" role="2Oq$k0">
+                  <ref role="3cqZAo" node="vJfcQmh6Pz" resolve="expected" />
+                </node>
+                <node concept="BjQpj" id="vJfcQmh6PS" role="2OqNvi">
+                  <node concept="37vLTw" id="vJfcQmh6PT" role="25WWJ7">
+                    <ref role="3cqZAo" node="vJfcQmh6PI" resolve="actual" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="vJfcQmh6PU" role="3uHU7B">
+                <node concept="37vLTw" id="vJfcQmh6PV" role="2Oq$k0">
+                  <ref role="3cqZAo" node="vJfcQmh6PI" resolve="actual" />
+                </node>
+                <node concept="BjQpj" id="vJfcQmh6PW" role="2OqNvi">
+                  <node concept="37vLTw" id="vJfcQmh6PX" role="25WWJ7">
+                    <ref role="3cqZAo" node="vJfcQmh6Pz" resolve="expected" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3s$Bmu" id="vJfcQmh9iS" role="3s_gse">
+        <property role="3s$Bm0" value="infiniteRange" />
+        <node concept="3cqZAl" id="vJfcQmh9iT" role="3clF45" />
+        <node concept="3Tm1VV" id="vJfcQmh9iU" role="1B3o_S" />
+        <node concept="3clFbS" id="vJfcQmh9iV" role="3clF47">
+          <node concept="3cpWs8" id="vJfcQmh9nX" role="3cqZAp">
+            <node concept="3cpWsn" id="vJfcQmh9nY" role="3cpWs9">
+              <property role="TrG5h" value="infiniteRange" />
+              <node concept="A3Dl8" id="vJfcQmh9nP" role="1tU5fm">
+                <node concept="10Oyi0" id="vJfcQmh9nS" role="A3Ik2" />
+              </node>
+              <node concept="2YIFZM" id="vJfcQmh9nZ" role="33vP2m">
+                <ref role="37wK5l" to="96gm:vJfcQmgyHy" resolve="range" />
+                <ref role="1Pybhc" to="96gm:vJfcQmguGr" resolve="IntegerSequence" />
+                <node concept="3cmrfG" id="vJfcQmh9o0" role="37wK5m">
+                  <property role="3cmrfH" value="0" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3vwNmj" id="vJfcQmhvUG" role="3cqZAp">
+            <node concept="17R0WA" id="vJfcQmhca_" role="3vwVQn">
+              <node concept="3cmrfG" id="vJfcQmhcc_" role="3uHU7w">
+                <property role="3cmrfH" value="0" />
+              </node>
+              <node concept="2OqwBi" id="vJfcQmhaOo" role="3uHU7B">
+                <node concept="37vLTw" id="vJfcQmhaOp" role="2Oq$k0">
+                  <ref role="3cqZAo" node="vJfcQmh9nY" resolve="infiniteRange" />
+                </node>
+                <node concept="1uHKPH" id="vJfcQmhaOq" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+          <node concept="3vwNmj" id="vJfcQmhw4x" role="3cqZAp">
+            <node concept="17R0WA" id="vJfcQmheLG" role="3vwVQn">
+              <node concept="3cmrfG" id="vJfcQmheOi" role="3uHU7w">
+                <property role="3cmrfH" value="100" />
+              </node>
+              <node concept="2OqwBi" id="vJfcQmhh6D" role="3uHU7B">
+                <node concept="2OqwBi" id="vJfcQmhd0V" role="2Oq$k0">
+                  <node concept="37vLTw" id="vJfcQmhcPT" role="2Oq$k0">
+                    <ref role="3cqZAo" node="vJfcQmh9nY" resolve="infiniteRange" />
+                  </node>
+                  <node concept="7r0gD" id="vJfcQmhddk" role="2OqNvi">
+                    <node concept="3cmrfG" id="vJfcQmhdhM" role="7T0AP">
+                      <property role="3cmrfH" value="100" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="1uHKPH" id="vJfcQmhhJw" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3s$Bmu" id="vJfcQmm4Jw" role="3s_gse">
+        <property role="3s$Bm0" value="emptySeqOnInvalidArguments" />
+        <node concept="3cqZAl" id="vJfcQmm4Jx" role="3clF45" />
+        <node concept="3Tm1VV" id="vJfcQmm4Jy" role="1B3o_S" />
+        <node concept="3clFbS" id="vJfcQmm4Jz" role="3clF47">
+          <node concept="3vwNmj" id="6vHuLLnDA9b" role="3cqZAp">
+            <node concept="2OqwBi" id="6vHuLLnDAgR" role="3vwVQn">
+              <node concept="2YIFZM" id="vJfcQmm4V7" role="2Oq$k0">
+                <ref role="37wK5l" to="96gm:vJfcQmguHw" resolve="range" />
+                <ref role="1Pybhc" to="96gm:vJfcQmguGr" resolve="IntegerSequence" />
+                <node concept="3cmrfG" id="vJfcQmm4V8" role="37wK5m">
+                  <property role="3cmrfH" value="10" />
+                </node>
+                <node concept="3cmrfG" id="vJfcQmm4V9" role="37wK5m">
+                  <property role="3cmrfH" value="9" />
+                </node>
+              </node>
+              <node concept="1v1jN8" id="6vHuLLnDAsU" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+</model>
+

From 2beee3089ec2968cc9d11766ed877f4b4df6abd5 Mon Sep 17 00:00:00 2001
From: Amin Ait Lamqadem <alamqadem@itemis.de>
Date: Wed, 24 Sep 2025 17:04:33 +0200
Subject: [PATCH 06/18] Add zip operator

---
 .../models/de.itemis.mps.extensions.build.mps |  10 +
 ...mis.mps.baseLanguageExtensions.runtime.msd |   2 +
 ...mis.mps.baseLanguageExtensions.runtime.mps | 186 ++++++
 ...mis.mps.baseLanguageExtensions.sandbox.msd |   1 +
 ...mis.mps.baseLanguageExtensions.sandbox.mps | 298 +++++++++
 .../de.itemis.mps.baseLanguageExtensions.mpl  |   5 +
 ...tensions.generator.templates@generator.mps |  87 +++
 ...s.mps.baseLanguageExtensions.structure.mps |  10 +
 ....mps.baseLanguageExtensions.typesystem.mps | 197 ++++++
 ...itemis.mps.baseLanguageExtensions.test.msd |   1 +
 ...guageExtensions.test.zipOperator@tests.mps | 605 ++++++++++++++++++
 11 files changed, 1402 insertions(+)
 create mode 100644 code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.zipOperator@tests.mps

diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
index 0411db8f08..035056d4fc 100644
--- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
+++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -9822,6 +9822,16 @@
             <ref role="1E1Vl2" to="ffeo:7Kfy9QB6KZG" resolve="jetbrains.mps.baseLanguage.closures" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5IoIE_Gg3X3" role="3bR37C">
+          <node concept="3bR9La" id="5IoIE_Gg3X4" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6L0h" resolve="jetbrains.mps.baseLanguage.collections" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="5IoIE_Gg3Xe" role="3bR37C">
+          <node concept="1Busua" id="5IoIE_Gg3Xf" role="1SiIV1">
+            <ref role="1Busuk" to="ffeo:7Kfy9QB6L0h" resolve="jetbrains.mps.baseLanguage.collections" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="vJfcQmbzfZ" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
index f8a57a03e0..9c9eff1de1 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
@@ -13,8 +13,10 @@
   <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
+    <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
index 5c8290ecad..a022226819 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
@@ -6,10 +6,25 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
+    <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
   </languages>
   <imports />
   <registry>
+    <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
+      <concept id="1238852151516" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleType" flags="in" index="1LlUBW">
+        <child id="1238852204892" name="componentType" index="1Lm7xW" />
+      </concept>
+      <concept id="1238853782547" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleLiteral" flags="nn" index="1Ls8ON">
+        <child id="1238853845806" name="component" index="1Lso8e" />
+      </concept>
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
       <concept id="1153422305557" name="jetbrains.mps.baseLanguage.structure.LessThanOrEqualsExpression" flags="nn" index="2dkUwp" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
       <concept id="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
@@ -46,7 +61,9 @@
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
       <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="1225271221393" name="jetbrains.mps.baseLanguage.structure.NPENotEqualsExpression" flags="nn" index="17QLQc" />
+      <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -68,6 +85,9 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
@@ -95,6 +115,7 @@
         <child id="1144231408325" name="iteration" index="1Dwrff" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1200830824066" name="jetbrains.mps.baseLanguage.closures.structure.YieldStatement" flags="nn" index="2n63Yl">
@@ -114,6 +135,9 @@
       </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1172650591544" name="jetbrains.mps.baseLanguage.collections.structure.SkipOperation" flags="nn" index="7r0gD">
+        <child id="1172658456740" name="elementsToSkip" index="7T0AP" />
+      </concept>
       <concept id="1224414427926" name="jetbrains.mps.baseLanguage.collections.structure.SequenceCreator" flags="nn" index="kMnCb">
         <child id="1224414456414" name="elementType" index="kMuH3" />
         <child id="1224414466839" name="initializer" index="kMx8a" />
@@ -121,6 +145,8 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
+      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+      <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
   </registry>
   <node concept="312cEu" id="vJfcQmguGr">
@@ -304,5 +330,165 @@
     </node>
     <node concept="3Tm1VV" id="w6MstBXH_c" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="6vHuLLnJvpc">
+    <property role="TrG5h" value="ZipOperatorUtil" />
+    <node concept="2YIFZL" id="6vHuLLnJvrd" role="jymVt">
+      <property role="TrG5h" value="zip" />
+      <node concept="3clFbS" id="6vHuLLnJvrg" role="3clF47">
+        <node concept="3clFbJ" id="6vHuLLnJMdN" role="3cqZAp">
+          <node concept="3clFbS" id="6vHuLLnJMdP" role="3clFbx">
+            <node concept="3cpWs6" id="6vHuLLnJOkQ" role="3cqZAp">
+              <node concept="2ShNRf" id="6vHuLLnJOwn" role="3cqZAk">
+                <node concept="kMnCb" id="6vHuLLnJOEq" role="2ShVmc">
+                  <node concept="1LlUBW" id="6vHuLLnJOKi" role="kMuH3">
+                    <node concept="16syzq" id="6vHuLLnJOKj" role="1Lm7xW">
+                      <ref role="16sUi3" node="6vHuLLnJvrH" resolve="T1" />
+                    </node>
+                    <node concept="16syzq" id="6vHuLLnJOKk" role="1Lm7xW">
+                      <ref role="16sUi3" node="6vHuLLnJvvz" resolve="T2" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="22lmx$" id="6vHuLLnJNqj" role="3clFbw">
+            <node concept="17R0WA" id="6vHuLLnJSvk" role="3uHU7w">
+              <node concept="37vLTw" id="6vHuLLnJNxk" role="3uHU7B">
+                <ref role="3cqZAo" node="6vHuLLnJvyb" resolve="s2" />
+              </node>
+              <node concept="10Nm6u" id="6vHuLLnJOdj" role="3uHU7w" />
+            </node>
+            <node concept="17R0WA" id="6vHuLLnJSn$" role="3uHU7B">
+              <node concept="37vLTw" id="6vHuLLnJMkj" role="3uHU7B">
+                <ref role="3cqZAo" node="6vHuLLnJvwJ" resolve="s1" />
+              </node>
+              <node concept="10Nm6u" id="6vHuLLnJNk4" role="3uHU7w" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6vHuLLnJv_f" role="3cqZAp">
+          <node concept="2ShNRf" id="6vHuLLnJv_d" role="3clFbG">
+            <node concept="kMnCb" id="6vHuLLnJvEh" role="2ShVmc">
+              <node concept="1LlUBW" id="6vHuLLnJvFi" role="kMuH3">
+                <node concept="16syzq" id="6vHuLLnJvIu" role="1Lm7xW">
+                  <ref role="16sUi3" node="6vHuLLnJvrH" resolve="T1" />
+                </node>
+                <node concept="16syzq" id="6vHuLLnJvMN" role="1Lm7xW">
+                  <ref role="16sUi3" node="6vHuLLnJvvz" resolve="T2" />
+                </node>
+              </node>
+              <node concept="1bVj0M" id="6vHuLLnJvOY" role="kMx8a">
+                <node concept="3clFbS" id="6vHuLLnJvOZ" role="1bW5cS">
+                  <node concept="2$JKZl" id="6vHuLLnJvUc" role="3cqZAp">
+                    <node concept="3clFbS" id="6vHuLLnJvUd" role="2LFqv$">
+                      <node concept="2n63Yl" id="6vHuLLnJzKH" role="3cqZAp">
+                        <node concept="1Ls8ON" id="6vHuLLnJzOz" role="2n6tg2">
+                          <node concept="2OqwBi" id="6vHuLLnJ$wI" role="1Lso8e">
+                            <node concept="37vLTw" id="6vHuLLnJ$fE" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6vHuLLnJvwJ" resolve="s1" />
+                            </node>
+                            <node concept="1uHKPH" id="6vHuLLnJ$E3" role="2OqNvi" />
+                          </node>
+                          <node concept="2OqwBi" id="6vHuLLnJ_56" role="1Lso8e">
+                            <node concept="37vLTw" id="6vHuLLnJ$N8" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6vHuLLnJvyb" resolve="s2" />
+                            </node>
+                            <node concept="1uHKPH" id="6vHuLLnJ_f8" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="6vHuLLnJxGa" role="3cqZAp">
+                        <node concept="37vLTI" id="6vHuLLnJyvD" role="3clFbG">
+                          <node concept="2OqwBi" id="6vHuLLnJyEn" role="37vLTx">
+                            <node concept="37vLTw" id="6vHuLLnJy_r" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6vHuLLnJvwJ" resolve="s1" />
+                            </node>
+                            <node concept="7r0gD" id="6vHuLLnJyOe" role="2OqNvi">
+                              <node concept="3cmrfG" id="6vHuLLnJyTj" role="7T0AP">
+                                <property role="3cmrfH" value="1" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="37vLTw" id="6vHuLLnJxG9" role="37vLTJ">
+                            <ref role="3cqZAo" node="6vHuLLnJvwJ" resolve="s1" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="6vHuLLnJz2l" role="3cqZAp">
+                        <node concept="37vLTI" id="6vHuLLnJzg2" role="3clFbG">
+                          <node concept="2OqwBi" id="6vHuLLnJzph" role="37vLTx">
+                            <node concept="37vLTw" id="6vHuLLnJzkl" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6vHuLLnJvyb" resolve="s2" />
+                            </node>
+                            <node concept="7r0gD" id="6vHuLLnJzz8" role="2OqNvi">
+                              <node concept="3cmrfG" id="6vHuLLnJzCd" role="7T0AP">
+                                <property role="3cmrfH" value="1" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="37vLTw" id="6vHuLLnJz2j" role="37vLTJ">
+                            <ref role="3cqZAo" node="6vHuLLnJvyb" resolve="s2" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1Wc70l" id="6vHuLLnJx3h" role="2$JKZa">
+                      <node concept="2OqwBi" id="6vHuLLnJM1h" role="3uHU7w">
+                        <node concept="37vLTw" id="6vHuLLnJxcz" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6vHuLLnJvyb" resolve="s2" />
+                        </node>
+                        <node concept="3GX2aA" id="6vHuLLnJxAZ" role="2OqNvi" />
+                      </node>
+                      <node concept="2OqwBi" id="6vHuLLnJLV6" role="3uHU7B">
+                        <node concept="37vLTw" id="6vHuLLnJvYJ" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6vHuLLnJvwJ" resolve="s1" />
+                        </node>
+                        <node concept="3GX2aA" id="6vHuLLnJwot" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6vHuLLnJvqR" role="1B3o_S" />
+      <node concept="16euLQ" id="6vHuLLnJvrH" role="16eVyc">
+        <property role="TrG5h" value="T1" />
+      </node>
+      <node concept="16euLQ" id="6vHuLLnJvvz" role="16eVyc">
+        <property role="TrG5h" value="T2" />
+      </node>
+      <node concept="A3Dl8" id="6vHuLLnJvsn" role="3clF45">
+        <node concept="1LlUBW" id="6vHuLLnJvu2" role="A3Ik2">
+          <node concept="16syzq" id="6vHuLLnJvuu" role="1Lm7xW">
+            <ref role="16sUi3" node="6vHuLLnJvrH" resolve="T1" />
+          </node>
+          <node concept="16syzq" id="6vHuLLnJvv1" role="1Lm7xW">
+            <ref role="16sUi3" node="6vHuLLnJvvz" resolve="T2" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="6vHuLLnJvwJ" role="3clF46">
+        <property role="TrG5h" value="s1" />
+        <node concept="A3Dl8" id="6vHuLLnJvwH" role="1tU5fm">
+          <node concept="16syzq" id="6vHuLLnJvxj" role="A3Ik2">
+            <ref role="16sUi3" node="6vHuLLnJvrH" resolve="T1" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="6vHuLLnJvyb" role="3clF46">
+        <property role="TrG5h" value="s2" />
+        <node concept="A3Dl8" id="6vHuLLnJvyG" role="1tU5fm">
+          <node concept="16syzq" id="6vHuLLnJvze" role="A3Ik2">
+            <ref role="16sUi3" node="6vHuLLnJvvz" resolve="T2" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="6vHuLLnJvpd" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/de.itemis.mps.baseLanguageExtensions.sandbox.msd b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/de.itemis.mps.baseLanguageExtensions.sandbox.msd
index 51b8c0d923..5e0ea8a61f 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/de.itemis.mps.baseLanguageExtensions.sandbox.msd
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/de.itemis.mps.baseLanguageExtensions.sandbox.msd
@@ -19,6 +19,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
index 5d253a9b2a..cf0da2dd45 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
@@ -5,20 +5,34 @@
     <use id="52b771c2-b79f-4f44-98f2-d24fd25a210b" name="de.itemis.mps.baseLanguageExtensions" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
   </languages>
   <imports>
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
+    <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
+      <concept id="1238852151516" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleType" flags="in" index="1LlUBW">
+        <child id="1238852204892" name="componentType" index="1Lm7xW" />
+      </concept>
+      <concept id="1238857743184" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleMemberAccessExpression" flags="nn" index="1LFfDK">
+        <child id="1238857764950" name="tuple" index="1LFl5Q" />
+        <child id="1238857834412" name="index" index="1LF_Uc" />
+      </concept>
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1224500799915" name="jetbrains.mps.baseLanguage.structure.BitwiseXorExpression" flags="nn" index="pVQyQ" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <property id="2523873803623706117" name="isMultiline" index="hSjvv" />
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
@@ -106,6 +120,7 @@
       <concept id="571742531387697460" name="de.itemis.mps.baseLanguageExtensions.structure.IntegerRangeConstantBound" flags="ng" index="2hHTnT">
         <property id="7488777117046563852" name="value" index="KjLWg" />
       </concept>
+      <concept id="7488777117048605758" name="de.itemis.mps.baseLanguageExtensions.structure.ZipOperation" flags="ng" index="Kbfsy" />
       <concept id="578371460444482140" name="de.itemis.mps.baseLanguageExtensions.structure.ElvisOperation" flags="ng" index="1w0Eer" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@@ -125,14 +140,25 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
+      <concept id="1176906603202" name="jetbrains.mps.baseLanguage.collections.structure.BinaryOperation" flags="nn" index="56pJg">
+        <child id="1176906787974" name="rightExpression" index="576Qk" />
+      </concept>
       <concept id="1172664342967" name="jetbrains.mps.baseLanguage.collections.structure.TakeOperation" flags="nn" index="8ftyA">
         <child id="1172664372046" name="elementsToTake" index="8f$Dv" />
       </concept>
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
+      <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
+        <child id="1237721435808" name="initValue" index="HW$Y0" />
+        <child id="1237721435807" name="elementType" index="HW$YZ" />
+      </concept>
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+      <concept id="1240687580870" name="jetbrains.mps.baseLanguage.collections.structure.JoinOperation" flags="nn" index="3uJxvA">
+        <child id="1240687658305" name="delimiter" index="3uJOhx" />
+      </concept>
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
   </registry>
@@ -647,5 +673,277 @@
     </node>
     <node concept="3Tm1VV" id="6vHuLLnBVK0" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="6vHuLLnKQWc">
+    <property role="TrG5h" value="ZipOperationSandbox" />
+    <node concept="2YIFZL" id="6vHuLLnKQXT" role="jymVt">
+      <property role="TrG5h" value="usages" />
+      <node concept="3clFbS" id="6vHuLLnKQXW" role="3clF47">
+        <node concept="3cpWs8" id="6vHuLLnL9CB" role="3cqZAp">
+          <node concept="3cpWsn" id="6vHuLLnL9CC" role="3cpWs9">
+            <property role="TrG5h" value="numAndLabels" />
+            <node concept="A3Dl8" id="6vHuLLnL9Bt" role="1tU5fm">
+              <node concept="1LlUBW" id="6vHuLLnL9BC" role="A3Ik2">
+                <node concept="10Oyi0" id="6vHuLLnL9BD" role="1Lm7xW" />
+                <node concept="17QB3L" id="6vHuLLnL9BE" role="1Lm7xW" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="6vHuLLnL9CD" role="33vP2m">
+              <property role="hSjvv" value="true" />
+              <node concept="2ShNRf" id="6vHuLLnL9CE" role="2Oq$k0">
+                <node concept="Tc6Ow" id="6vHuLLnL9CF" role="2ShVmc">
+                  <node concept="3cmrfG" id="6vHuLLnL9CG" role="HW$Y0">
+                    <property role="3cmrfH" value="1" />
+                  </node>
+                  <node concept="3cmrfG" id="6vHuLLnL9CH" role="HW$Y0">
+                    <property role="3cmrfH" value="2" />
+                  </node>
+                  <node concept="3cmrfG" id="6vHuLLnL9CI" role="HW$Y0">
+                    <property role="3cmrfH" value="3" />
+                  </node>
+                  <node concept="10Oyi0" id="6vHuLLnL9CJ" role="HW$YZ" />
+                </node>
+              </node>
+              <node concept="Kbfsy" id="6vHuLLnL9CK" role="2OqNvi">
+                <node concept="2ShNRf" id="6vHuLLnL9CL" role="576Qk">
+                  <node concept="Tc6Ow" id="6vHuLLnL9CM" role="2ShVmc">
+                    <node concept="Xl_RD" id="6vHuLLnL9CN" role="HW$Y0">
+                      <property role="Xl_RC" value="one" />
+                    </node>
+                    <node concept="Xl_RD" id="6vHuLLnL9CO" role="HW$Y0">
+                      <property role="Xl_RC" value="two" />
+                    </node>
+                    <node concept="Xl_RD" id="6vHuLLnL9CP" role="HW$Y0">
+                      <property role="Xl_RC" value="three" />
+                    </node>
+                    <node concept="17QB3L" id="6vHuLLnL9CQ" role="HW$YZ" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6vHuLLnLdZP" role="3cqZAp">
+          <node concept="2OqwBi" id="6vHuLLnLlLu" role="3clFbG">
+            <node concept="2OqwBi" id="6vHuLLnLe8C" role="2Oq$k0">
+              <node concept="37vLTw" id="6vHuLLnLdZN" role="2Oq$k0">
+                <ref role="3cqZAo" node="6vHuLLnL9CC" resolve="numAndLabels" />
+              </node>
+              <node concept="3$u5V9" id="6vHuLLnLejB" role="2OqNvi">
+                <node concept="1bVj0M" id="6vHuLLnLejD" role="23t8la">
+                  <node concept="3clFbS" id="6vHuLLnLejE" role="1bW5cS">
+                    <node concept="3clFbF" id="6vHuLLnLeoo" role="3cqZAp">
+                      <node concept="3cpWs3" id="6vHuLLnLkx7" role="3clFbG">
+                        <node concept="1LFfDK" id="6vHuLLnLlmj" role="3uHU7w">
+                          <node concept="3cmrfG" id="6vHuLLnLls6" role="1LF_Uc">
+                            <property role="3cmrfH" value="1" />
+                          </node>
+                          <node concept="37vLTw" id="6vHuLLnLl2E" role="1LFl5Q">
+                            <ref role="3cqZAo" node="6vHuLLnLejF" resolve="it" />
+                          </node>
+                        </node>
+                        <node concept="3cpWs3" id="6vHuLLnLisO" role="3uHU7B">
+                          <node concept="1LFfDK" id="6vHuLLnLfOp" role="3uHU7B">
+                            <node concept="3cmrfG" id="6vHuLLnLfTA" role="1LF_Uc">
+                              <property role="3cmrfH" value="0" />
+                            </node>
+                            <node concept="37vLTw" id="6vHuLLnLeon" role="1LFl5Q">
+                              <ref role="3cqZAo" node="6vHuLLnLejF" resolve="it" />
+                            </node>
+                          </node>
+                          <node concept="Xl_RD" id="6vHuLLnLiGw" role="3uHU7w">
+                            <property role="Xl_RC" value=": " />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="6vHuLLnLejF" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="6vHuLLnLejG" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3uJxvA" id="6vHuLLnLnET" role="2OqNvi">
+              <node concept="Xl_RD" id="6vHuLLnLpz2" role="3uJOhx">
+                <property role="Xl_RC" value=", " />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6vHuLLnLqCW" role="3cqZAp" />
+        <node concept="3cpWs8" id="6vHuLLnLqjp" role="3cqZAp">
+          <node concept="3cpWsn" id="6vHuLLnLqjq" role="3cpWs9">
+            <property role="TrG5h" value="firstShorter" />
+            <node concept="A3Dl8" id="6vHuLLnLqij" role="1tU5fm">
+              <node concept="1LlUBW" id="6vHuLLnLqiu" role="A3Ik2">
+                <node concept="10Oyi0" id="6vHuLLnLqiv" role="1Lm7xW" />
+                <node concept="17QB3L" id="6vHuLLnLqiw" role="1Lm7xW" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="6vHuLLnLqjr" role="33vP2m">
+              <property role="hSjvv" value="true" />
+              <node concept="2ShNRf" id="6vHuLLnLqjs" role="2Oq$k0">
+                <node concept="Tc6Ow" id="6vHuLLnLqjt" role="2ShVmc">
+                  <node concept="3cmrfG" id="6vHuLLnLqju" role="HW$Y0">
+                    <property role="3cmrfH" value="1" />
+                  </node>
+                  <node concept="3cmrfG" id="6vHuLLnLqjv" role="HW$Y0">
+                    <property role="3cmrfH" value="2" />
+                  </node>
+                  <node concept="10Oyi0" id="6vHuLLnLqjw" role="HW$YZ" />
+                </node>
+              </node>
+              <node concept="Kbfsy" id="6vHuLLnLqjx" role="2OqNvi">
+                <node concept="2ShNRf" id="6vHuLLnLqjy" role="576Qk">
+                  <node concept="Tc6Ow" id="6vHuLLnLqjz" role="2ShVmc">
+                    <node concept="Xl_RD" id="6vHuLLnLqj$" role="HW$Y0">
+                      <property role="Xl_RC" value="one" />
+                    </node>
+                    <node concept="Xl_RD" id="6vHuLLnLqj_" role="HW$Y0">
+                      <property role="Xl_RC" value="two" />
+                    </node>
+                    <node concept="Xl_RD" id="6vHuLLnLqjA" role="HW$Y0">
+                      <property role="Xl_RC" value="three" />
+                    </node>
+                    <node concept="17QB3L" id="6vHuLLnLqjB" role="HW$YZ" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6vHuLLnLqxO" role="3cqZAp">
+          <node concept="2OqwBi" id="6vHuLLnLqxQ" role="3clFbG">
+            <node concept="2OqwBi" id="6vHuLLnLqxR" role="2Oq$k0">
+              <node concept="37vLTw" id="6vHuLLnLqxS" role="2Oq$k0">
+                <ref role="3cqZAo" node="6vHuLLnLqjq" resolve="firstShorter" />
+              </node>
+              <node concept="3$u5V9" id="6vHuLLnLqxT" role="2OqNvi">
+                <node concept="1bVj0M" id="6vHuLLnLqxU" role="23t8la">
+                  <node concept="3clFbS" id="6vHuLLnLqxV" role="1bW5cS">
+                    <node concept="3clFbF" id="6vHuLLnLqxW" role="3cqZAp">
+                      <node concept="3cpWs3" id="6vHuLLnLqxX" role="3clFbG">
+                        <node concept="1LFfDK" id="6vHuLLnLqxY" role="3uHU7w">
+                          <node concept="3cmrfG" id="6vHuLLnLqxZ" role="1LF_Uc">
+                            <property role="3cmrfH" value="1" />
+                          </node>
+                          <node concept="37vLTw" id="6vHuLLnLqy0" role="1LFl5Q">
+                            <ref role="3cqZAo" node="6vHuLLnLqy6" resolve="it" />
+                          </node>
+                        </node>
+                        <node concept="3cpWs3" id="6vHuLLnLqy1" role="3uHU7B">
+                          <node concept="1LFfDK" id="6vHuLLnLqy2" role="3uHU7B">
+                            <node concept="3cmrfG" id="6vHuLLnLqy3" role="1LF_Uc">
+                              <property role="3cmrfH" value="0" />
+                            </node>
+                            <node concept="37vLTw" id="6vHuLLnLqy4" role="1LFl5Q">
+                              <ref role="3cqZAo" node="6vHuLLnLqy6" resolve="it" />
+                            </node>
+                          </node>
+                          <node concept="Xl_RD" id="6vHuLLnLqy5" role="3uHU7w">
+                            <property role="Xl_RC" value=": " />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="6vHuLLnLqy6" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="6vHuLLnLqy7" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3uJxvA" id="6vHuLLnLqy8" role="2OqNvi">
+              <node concept="Xl_RD" id="6vHuLLnLqy9" role="3uJOhx">
+                <property role="Xl_RC" value=", " />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6vHuLLnLroB" role="3cqZAp" />
+        <node concept="3cpWs8" id="6vHuLLnLrdW" role="3cqZAp">
+          <node concept="3cpWsn" id="6vHuLLnLrdX" role="3cpWs9">
+            <property role="TrG5h" value="oneNull" />
+            <node concept="A3Dl8" id="6vHuLLnLrdY" role="1tU5fm">
+              <node concept="1LlUBW" id="6vHuLLnLrdZ" role="A3Ik2">
+                <node concept="10Oyi0" id="6vHuLLnLre0" role="1Lm7xW" />
+                <node concept="17QB3L" id="6vHuLLnLre1" role="1Lm7xW" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="6vHuLLnLre2" role="33vP2m">
+              <node concept="2ShNRf" id="6vHuLLnLre3" role="2Oq$k0">
+                <node concept="Tc6Ow" id="6vHuLLnLre4" role="2ShVmc">
+                  <node concept="3cmrfG" id="6vHuLLnLre5" role="HW$Y0">
+                    <property role="3cmrfH" value="1" />
+                  </node>
+                  <node concept="3cmrfG" id="6vHuLLnLre6" role="HW$Y0">
+                    <property role="3cmrfH" value="2" />
+                  </node>
+                  <node concept="10Oyi0" id="6vHuLLnLre7" role="HW$YZ" />
+                </node>
+              </node>
+              <node concept="Kbfsy" id="6vHuLLnLre8" role="2OqNvi">
+                <node concept="10Nm6u" id="6vHuLLnLrDL" role="576Qk" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6vHuLLnLrdB" role="3cqZAp">
+          <node concept="2OqwBi" id="6vHuLLnLrdC" role="3clFbG">
+            <node concept="2OqwBi" id="6vHuLLnLrdD" role="2Oq$k0">
+              <node concept="37vLTw" id="6vHuLLnLrdE" role="2Oq$k0">
+                <ref role="3cqZAo" node="6vHuLLnLrdX" resolve="oneNull" />
+              </node>
+              <node concept="3$u5V9" id="6vHuLLnLrdF" role="2OqNvi">
+                <node concept="1bVj0M" id="6vHuLLnLrdG" role="23t8la">
+                  <node concept="3clFbS" id="6vHuLLnLrdH" role="1bW5cS">
+                    <node concept="3clFbF" id="6vHuLLnLrdI" role="3cqZAp">
+                      <node concept="3cpWs3" id="6vHuLLnLrdJ" role="3clFbG">
+                        <node concept="1LFfDK" id="6vHuLLnLrdK" role="3uHU7w">
+                          <node concept="3cmrfG" id="6vHuLLnLrdL" role="1LF_Uc">
+                            <property role="3cmrfH" value="1" />
+                          </node>
+                          <node concept="37vLTw" id="6vHuLLnLrdM" role="1LFl5Q">
+                            <ref role="3cqZAo" node="6vHuLLnLrdS" resolve="it" />
+                          </node>
+                        </node>
+                        <node concept="3cpWs3" id="6vHuLLnLrdN" role="3uHU7B">
+                          <node concept="1LFfDK" id="6vHuLLnLrdO" role="3uHU7B">
+                            <node concept="3cmrfG" id="6vHuLLnLrdP" role="1LF_Uc">
+                              <property role="3cmrfH" value="0" />
+                            </node>
+                            <node concept="37vLTw" id="6vHuLLnLrdQ" role="1LFl5Q">
+                              <ref role="3cqZAo" node="6vHuLLnLrdS" resolve="it" />
+                            </node>
+                          </node>
+                          <node concept="Xl_RD" id="6vHuLLnLrdR" role="3uHU7w">
+                            <property role="Xl_RC" value=": " />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="6vHuLLnLrdS" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="6vHuLLnLrdT" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3uJxvA" id="6vHuLLnLrdU" role="2OqNvi">
+              <node concept="Xl_RD" id="6vHuLLnLrdV" role="3uJOhx">
+                <property role="Xl_RC" value=", " />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6vHuLLnKQXp" role="1B3o_S" />
+      <node concept="3cqZAl" id="6vHuLLnKQXJ" role="3clF45" />
+    </node>
+    <node concept="3Tm1VV" id="6vHuLLnKQWd" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl b/code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl
index b1e9635e0b..d4201a47a3 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl
@@ -51,6 +51,8 @@
         <module reference="0c2a16a3-4205-4401-a2b4-4af76e67fa52(de.itemis.mps.baseLanguageExtensions.generator)" version="0" />
         <module reference="d91eaf6f-a378-467f-9524-0c201ee2e15f(de.itemis.mps.baseLanguageExtensions.runtime)" version="0" />
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+        <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+        <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
@@ -63,6 +65,7 @@
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false" scope="generate-into">fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)</dependency>
+    <dependency reexport="false">83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -104,6 +107,7 @@
     <module reference="52b771c2-b79f-4f44-98f2-d24fd25a210b(de.itemis.mps.baseLanguageExtensions)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+    <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
@@ -115,6 +119,7 @@
   </runtime>
   <extendedLanguages>
     <extendedLanguage>f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</extendedLanguage>
+    <extendedLanguage>83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)</extendedLanguage>
   </extendedLanguages>
 </language>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
index f13f37786b..14e3ad255d 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
@@ -9,6 +9,7 @@
     <import index="pkab" ref="r:63a6d225-96f6-404a-a9eb-033dc2f950a1(de.itemis.mps.baseLanguageExtensions.structure)" />
     <import index="96gm" ref="r:2eaed950-3bc1-47cd-9b02-e917ff994d7c(de.itemis.mps.baseLanguageExtensions.runtime)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
+    <import index="tp2q" ref="r:00000000-0000-4000-0000-011c8959032e(jetbrains.mps.baseLanguage.collections.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -47,9 +48,11 @@
       <concept id="1177093525992" name="jetbrains.mps.lang.generator.structure.InlineTemplate_RuleConsequence" flags="lg" index="gft3U">
         <child id="1177093586806" name="templateNode" index="gfFT$" />
       </concept>
+      <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
       <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
       <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
         <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
+        <child id="1167169362365" name="conditionFunction" index="30HLyM" />
       </concept>
       <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="ln" index="17Uvod">
         <child id="1167756362303" name="propertyValueFunction" index="3zH0cK" />
@@ -71,7 +74,20 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
+        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
+      </concept>
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
+      </concept>
+      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
+        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
+      </concept>
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
+        <property id="1238684351431" name="asCast" index="1BlNFB" />
+      </concept>
       <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
         <reference id="1138056395725" name="property" index="3TsBF5" />
       </concept>
@@ -270,6 +286,77 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="6vHuLLnKKMP" role="3acgRq">
+      <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
+      <node concept="gft3U" id="6vHuLLnKKZS" role="1lVwrX">
+        <node concept="2YIFZM" id="6vHuLLnKL0J" role="gfFT$">
+          <ref role="37wK5l" to="96gm:6vHuLLnJvrd" resolve="zip" />
+          <ref role="1Pybhc" to="96gm:6vHuLLnJvpc" resolve="ZipOperatorUtil" />
+          <node concept="10Nm6u" id="6vHuLLnKL2p" role="37wK5m">
+            <node concept="29HgVG" id="6vHuLLnKL8Z" role="lGtFl">
+              <node concept="3NFfHV" id="6vHuLLnKL90" role="3NFExx">
+                <node concept="3clFbS" id="6vHuLLnKL91" role="2VODD2">
+                  <node concept="3clFbF" id="6vHuLLnKL97" role="3cqZAp">
+                    <node concept="2OqwBi" id="6vHuLLnKM4G" role="3clFbG">
+                      <node concept="3TrEf2" id="6vHuLLnKMn4" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                      </node>
+                      <node concept="30H73N" id="6vHuLLnL1p$" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="10Nm6u" id="6vHuLLnKL6R" role="37wK5m">
+            <node concept="29HgVG" id="6vHuLLnKMu8" role="lGtFl">
+              <node concept="3NFfHV" id="6vHuLLnKMu9" role="3NFExx">
+                <node concept="3clFbS" id="6vHuLLnKMua" role="2VODD2">
+                  <node concept="3clFbF" id="6vHuLLnKMug" role="3cqZAp">
+                    <node concept="2OqwBi" id="6vHuLLnL2uY" role="3clFbG">
+                      <node concept="1PxgMI" id="6vHuLLnL2dZ" role="2Oq$k0">
+                        <property role="1BlNFB" value="true" />
+                        <node concept="chp4Y" id="6vHuLLnL2gQ" role="3oSUPX">
+                          <ref role="cht4Q" to="pkab:6vHuLLnKoKY" resolve="ZipOperation" />
+                        </node>
+                        <node concept="2OqwBi" id="6vHuLLnKMub" role="1m5AlR">
+                          <node concept="30H73N" id="6vHuLLnKMuf" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="6vHuLLnL1IJ" role="2OqNvi">
+                            <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3TrEf2" id="6vHuLLnL2Kc" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tp2q:h8576M6" resolve="rightExpression" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="6vHuLLnL054" role="30HLyM">
+        <node concept="3clFbS" id="6vHuLLnL055" role="2VODD2">
+          <node concept="3clFbF" id="6vHuLLnL09g" role="3cqZAp">
+            <node concept="2OqwBi" id="6vHuLLnL0Ux" role="3clFbG">
+              <node concept="2OqwBi" id="6vHuLLnL0oQ" role="2Oq$k0">
+                <node concept="30H73N" id="6vHuLLnL09f" role="2Oq$k0" />
+                <node concept="3TrEf2" id="6vHuLLnL0G6" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                </node>
+              </node>
+              <node concept="1mIQ4w" id="6vHuLLnL1gy" role="2OqNvi">
+                <node concept="chp4Y" id="6vHuLLnL1jq" role="cj9EA">
+                  <ref role="cht4Q" to="pkab:6vHuLLnKoKY" resolve="ZipOperation" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
index bc011b659b..686cf01b6d 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
@@ -6,6 +6,7 @@
   </languages>
   <imports>
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="tp2q" ref="r:00000000-0000-4000-0000-011c8959032e(jetbrains.mps.baseLanguage.collections.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
@@ -51,6 +52,7 @@
     <property role="TrG5h" value="ElvisOperation" />
     <property role="34LRSv" value="?:" />
     <property role="R4oN_" value="elvis operation" />
+    <property role="3GE5qa" value="elvisOperation" />
     <ref role="1TJDcQ" to="tpee:fJuHJVf" resolve="BinaryOperation" />
   </node>
   <node concept="1TIwiD" id="vJfcQmm5$y">
@@ -110,5 +112,13 @@
       <ref role="PrY4T" node="vJfcQmma$M" resolve="IntegerRangeBound" />
     </node>
   </node>
+  <node concept="1TIwiD" id="6vHuLLnKoKY">
+    <property role="EcuMT" value="7488777117048605758" />
+    <property role="TrG5h" value="ZipOperation" />
+    <property role="34LRSv" value="zip" />
+    <property role="R4oN_" value="maps a tuple of sequences into a sequence of tuples" />
+    <property role="3GE5qa" value="zipOperation" />
+    <ref role="1TJDcQ" to="tp2q:h856pF2" resolve="BinaryOperation" />
+  </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
index 9b61803993..8ec5778047 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
@@ -6,10 +6,17 @@
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports>
+    <import index="tp2v" ref="r:00000000-0000-4000-0000-011c8959032b(jetbrains.mps.baseLanguage.collections.typesystem)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
     <import index="pkab" ref="r:63a6d225-96f6-404a-a9eb-033dc2f950a1(de.itemis.mps.baseLanguageExtensions.structure)" implicit="true" />
+    <import index="tp2q" ref="r:00000000-0000-4000-0000-011c8959032e(jetbrains.mps.baseLanguage.collections.structure)" implicit="true" />
   </imports>
   <registry>
+    <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
+      <concept id="1238852151516" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleType" flags="in" index="1LlUBW">
+        <child id="1238852204892" name="componentType" index="1Lm7xW" />
+      </concept>
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -22,13 +29,18 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
+      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -51,6 +63,10 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
@@ -58,6 +74,10 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
+      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ng" index="2c44t0">
+        <child id="1196350785111" name="expression" index="2c44t1" />
+      </concept>
+      <concept id="1196350785112" name="jetbrains.mps.lang.quotation.structure.Antiquotation" flags="ng" index="2c44te" />
       <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
         <child id="1196350785114" name="quotedNode" index="2c44tc" />
       </concept>
@@ -114,6 +134,10 @@
       </concept>
       <concept id="1174663118805" name="jetbrains.mps.lang.typesystem.structure.CreateLessThanInequationStatement" flags="nn" index="1ZobV4" />
       <concept id="1174663239020" name="jetbrains.mps.lang.typesystem.structure.CreateGreaterThanInequationStatement" flags="nn" index="1ZoDhX" />
+      <concept id="1174665551739" name="jetbrains.mps.lang.typesystem.structure.TypeVarDeclaration" flags="ng" index="1ZxtTE" />
+      <concept id="1174666260556" name="jetbrains.mps.lang.typesystem.structure.TypeVarReference" flags="nn" index="1Z$b5t">
+        <reference id="1174666276259" name="typeVarDeclaration" index="1Z$eMM" />
+      </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
@@ -130,6 +154,9 @@
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
         <property id="1238684351431" name="asCast" index="1BlNFB" />
       </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
       <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
         <reference id="1138056395725" name="property" index="3TsBF5" />
       </concept>
@@ -140,6 +167,7 @@
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
@@ -153,6 +181,7 @@
   </registry>
   <node concept="1YbPZF" id="w6MstC1zne">
     <property role="TrG5h" value="typeof_ElvisOperation" />
+    <property role="3GE5qa" value="elvisOperation" />
     <node concept="3clFbS" id="w6MstC1znf" role="18ibNy">
       <node concept="yXGxS" id="w6MstC1JR3" role="3cqZAp">
         <node concept="2OqwBi" id="w6MstC1K1M" role="yXQkb">
@@ -523,5 +552,173 @@
       <ref role="1YaFvo" to="pkab:vJfcQmm5$y" resolve="IntegerRange" />
     </node>
   </node>
+  <node concept="1YbPZF" id="6vHuLLnKpbX">
+    <property role="TrG5h" value="typeof_ZipOperation" />
+    <property role="3GE5qa" value="zipOperation" />
+    <node concept="3clFbS" id="6vHuLLnKpbY" role="18ibNy">
+      <node concept="3cpWs8" id="hfuuj28" role="3cqZAp">
+        <node concept="3cpWsn" id="hfuuj29" role="3cpWs9">
+          <property role="TrG5h" value="lValue" />
+          <node concept="3Tqbb2" id="hfuuj2a" role="1tU5fm">
+            <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
+          </node>
+          <node concept="2YIFZM" id="hfuuhBT" role="33vP2m">
+            <ref role="37wK5l" to="tp2v:hfqBL0x" resolve="getInput" />
+            <ref role="1Pybhc" to="tp2v:h9LxIeJ" resolve="RulesFunctions_Collections" />
+            <node concept="1YBJjd" id="6vHuLLnKqTu" role="37wK5m">
+              <ref role="1YBMHb" node="6vHuLLnKpc0" resolve="zipOperation" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cpWs8" id="hfuuke_" role="3cqZAp">
+        <node concept="3cpWsn" id="hfuukeA" role="3cpWs9">
+          <property role="TrG5h" value="rValue" />
+          <node concept="3Tqbb2" id="hfuukeB" role="1tU5fm">
+            <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
+          </node>
+          <node concept="2OqwBi" id="hxx$Y8m" role="33vP2m">
+            <node concept="1YBJjd" id="6vHuLLnKqUv" role="2Oq$k0">
+              <ref role="1YBMHb" node="6vHuLLnKpc0" resolve="zipOperation" />
+            </node>
+            <node concept="3TrEf2" id="hfuuoHR" role="2OqNvi">
+              <ref role="3Tt5mk" to="tp2q:h8576M6" resolve="rightExpression" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="nvevp" id="rneXz5IrqF" role="3cqZAp">
+        <node concept="3clFbS" id="rneXz5IrqH" role="nvhr_">
+          <node concept="nvevp" id="rneXz5Isk6" role="3cqZAp">
+            <node concept="3clFbS" id="rneXz5Isk7" role="nvhr_">
+              <node concept="1ZxtTE" id="hfutWjW" role="3cqZAp">
+                <property role="TrG5h" value="elementTypeLeft" />
+              </node>
+              <node concept="1ZxtTE" id="6vHuLLnKr96" role="3cqZAp">
+                <property role="TrG5h" value="elementTypeRight" />
+              </node>
+              <node concept="1ZxtTE" id="hfutZkF" role="3cqZAp">
+                <property role="TrG5h" value="sequenceType" />
+              </node>
+              <node concept="1Z5TYs" id="hfuu7hp" role="3cqZAp">
+                <node concept="mw_s8" id="hgnxd5n" role="1ZfhKB">
+                  <node concept="2c44tf" id="hq_xCCf" role="mwGJk">
+                    <node concept="A3Dl8" id="hq_xCCg" role="2c44tc">
+                      <node concept="1LlUBW" id="6vHuLLnKrkN" role="A3Ik2">
+                        <node concept="10Oyi0" id="6vHuLLnKrtc" role="1Lm7xW">
+                          <node concept="2c44te" id="6vHuLLnKrDz" role="lGtFl">
+                            <node concept="1Z$b5t" id="6vHuLLnKrDF" role="2c44t1">
+                              <ref role="1Z$eMM" node="hfutWjW" resolve="elementTypeLeft" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="17QB3L" id="6vHuLLnKrDx" role="1Lm7xW">
+                          <node concept="2c44te" id="6vHuLLnKrDM" role="lGtFl">
+                            <node concept="1Z$b5t" id="6vHuLLnKrDU" role="2c44t1">
+                              <ref role="1Z$eMM" node="6vHuLLnKr96" resolve="elementTypeRight" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="mw_s8" id="hgnxd5m" role="1ZfhK$">
+                  <node concept="1Z$b5t" id="hfuu7Tb" role="mwGJk">
+                    <ref role="1Z$eMM" node="hfutZkF" resolve="sequenceType" />
+                  </node>
+                </node>
+              </node>
+              <node concept="1ZobV4" id="6vHuLLnKE5P" role="3cqZAp">
+                <node concept="mw_s8" id="6vHuLLnKE5R" role="1ZfhK$">
+                  <node concept="2X3wrD" id="6vHuLLnKE5S" role="mwGJk">
+                    <ref role="2X3Bk0" node="rneXz5IrqL" resolve="lType" />
+                  </node>
+                </node>
+                <node concept="mw_s8" id="6vHuLLnKE5T" role="1ZfhKB">
+                  <node concept="2c44tf" id="6vHuLLnKE5U" role="mwGJk">
+                    <node concept="A3Dl8" id="6vHuLLnKE5V" role="2c44tc">
+                      <node concept="10P_77" id="6vHuLLnKE5W" role="A3Ik2">
+                        <node concept="2c44te" id="6vHuLLnKE5X" role="lGtFl">
+                          <node concept="1Z$b5t" id="6vHuLLnKE5Y" role="2c44t1">
+                            <ref role="1Z$eMM" node="hfutWjW" resolve="elementTypeLeft" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1ZobV4" id="6vHuLLnKE5f" role="3cqZAp">
+                <node concept="mw_s8" id="6vHuLLnKE5h" role="1ZfhK$">
+                  <node concept="2X3wrD" id="6vHuLLnKE5i" role="mwGJk">
+                    <ref role="2X3Bk0" node="rneXz5Isk9" resolve="rType" />
+                  </node>
+                </node>
+                <node concept="mw_s8" id="6vHuLLnKE5j" role="1ZfhKB">
+                  <node concept="2c44tf" id="6vHuLLnKE5k" role="mwGJk">
+                    <node concept="A3Dl8" id="6vHuLLnKE5l" role="2c44tc">
+                      <node concept="10P_77" id="6vHuLLnKE5m" role="A3Ik2">
+                        <node concept="2c44te" id="6vHuLLnKE5n" role="lGtFl">
+                          <node concept="1Z$b5t" id="6vHuLLnKE5o" role="2c44t1">
+                            <ref role="1Z$eMM" node="6vHuLLnKr96" resolve="elementTypeRight" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1Z5TYs" id="hfuu_eY" role="3cqZAp">
+                <node concept="mw_s8" id="hgnxd5t" role="1ZfhKB">
+                  <node concept="1Z$b5t" id="hfuu_Cw" role="mwGJk">
+                    <ref role="1Z$eMM" node="hfutZkF" resolve="sequenceType" />
+                  </node>
+                </node>
+                <node concept="mw_s8" id="hgnxd5s" role="1ZfhK$">
+                  <node concept="1Z2H0r" id="hfuu$r5" role="mwGJk">
+                    <node concept="1YBJjd" id="6vHuLLnKqVa" role="1Z2MuG">
+                      <ref role="1YBMHb" node="6vHuLLnKpc0" resolve="zipOperation" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1Z2H0r" id="rneXz5Isls" role="nvjzm">
+              <node concept="37vLTw" id="rneXz5Iso2" role="1Z2MuG">
+                <ref role="3cqZAo" node="hfuukeA" resolve="rValue" />
+              </node>
+            </node>
+            <node concept="2X1qdy" id="rneXz5Isk9" role="2X0Ygz">
+              <property role="TrG5h" value="rType" />
+              <node concept="2jxLKc" id="rneXz5Iska" role="1tU5fm" />
+            </node>
+          </node>
+        </node>
+        <node concept="1Z2H0r" id="rneXz5Irwm" role="nvjzm">
+          <node concept="37vLTw" id="rneXz5IrxR" role="1Z2MuG">
+            <ref role="3cqZAo" node="hfuuj29" resolve="lValue" />
+          </node>
+        </node>
+        <node concept="2X1qdy" id="rneXz5IrqL" role="2X0Ygz">
+          <property role="TrG5h" value="lType" />
+          <node concept="2jxLKc" id="rneXz5IrqM" role="1tU5fm" />
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="6vHuLLnKpc0" role="1YuTPh">
+      <property role="TrG5h" value="zipOperation" />
+      <ref role="1YaFvo" to="pkab:6vHuLLnKoKY" resolve="ZipOperation" />
+    </node>
+    <node concept="bXqS6" id="6vHuLLnKph9" role="ujSXK">
+      <node concept="3clFbS" id="6vHuLLnKpha" role="2VODD2">
+        <node concept="3clFbF" id="6vHuLLnKpi2" role="3cqZAp">
+          <node concept="3clFbT" id="6vHuLLnKpi1" role="3clFbG">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd
index 096dc7144e..c30daa90b0 100644
--- a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd
+++ b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd
@@ -20,6 +20,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
diff --git a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.zipOperator@tests.mps b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.zipOperator@tests.mps
new file mode 100644
index 0000000000..2167c5d383
--- /dev/null
+++ b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.zipOperator@tests.mps
@@ -0,0 +1,605 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:9319f43d-db2a-4dc5-bf08-cb89bcce7d89(de.itemis.mps.baseLanguageExtensions.test.zipOperator@tests)">
+  <persistence version="9" />
+  <languages>
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
+    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
+  </languages>
+  <imports>
+    <import index="96gm" ref="r:2eaed950-3bc1-47cd-9b02-e917ff994d7c(de.itemis.mps.baseLanguageExtensions.runtime)" />
+  </imports>
+  <registry>
+    <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
+      <concept id="1238852151516" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleType" flags="in" index="1LlUBW">
+        <child id="1238852204892" name="componentType" index="1Lm7xW" />
+      </concept>
+      <concept id="1238853782547" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleLiteral" flags="nn" index="1Ls8ON">
+        <child id="1238853845806" name="component" index="1Lso8e" />
+      </concept>
+    </language>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
+    </language>
+    <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
+      <concept id="1171931690126" name="jetbrains.mps.baseLanguage.unitTest.structure.TestMethod" flags="ig" index="3s$Bmu">
+        <property id="1171931690128" name="methodName" index="3s$Bm0" />
+      </concept>
+      <concept id="1171931851043" name="jetbrains.mps.baseLanguage.unitTest.structure.BTestCase" flags="ig" index="3s_ewN">
+        <property id="1171931851045" name="testCaseName" index="3s_ewP" />
+        <child id="1171931851044" name="testMethodList" index="3s_ewO" />
+      </concept>
+      <concept id="1171931858461" name="jetbrains.mps.baseLanguage.unitTest.structure.TestMethodList" flags="ng" index="3s_gsd">
+        <child id="1171931858462" name="testMethod" index="3s_gse" />
+      </concept>
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1176906603202" name="jetbrains.mps.baseLanguage.collections.structure.BinaryOperation" flags="nn" index="56pJg">
+        <child id="1176906787974" name="rightExpression" index="576Qk" />
+      </concept>
+      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
+        <child id="540871147943773366" name="argument" index="25WWJ7" />
+      </concept>
+      <concept id="1176921879268" name="jetbrains.mps.baseLanguage.collections.structure.IntersectOperation" flags="nn" index="60FfQ" />
+      <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
+        <child id="1151688676805" name="elementType" index="_ZDj9" />
+      </concept>
+      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
+        <child id="1151689745422" name="elementType" index="A3Ik2" />
+      </concept>
+      <concept id="6126991172893676625" name="jetbrains.mps.baseLanguage.collections.structure.ContainsAllOperation" flags="nn" index="BjQpj" />
+      <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
+        <child id="1237721435808" name="initValue" index="HW$Y0" />
+        <child id="1237721435807" name="elementType" index="HW$YZ" />
+      </concept>
+      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
+      <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
+    </language>
+  </registry>
+  <node concept="3s_ewN" id="6vHuLLnJ_tL">
+    <property role="3s_ewP" value="ZipOperationUtil" />
+    <node concept="3Tm1VV" id="6vHuLLnJ_tM" role="1B3o_S" />
+    <node concept="3s_gsd" id="6vHuLLnJ_tN" role="3s_ewO">
+      <node concept="3s$Bmu" id="6vHuLLnJ_uM" role="3s_gse">
+        <property role="3s$Bm0" value="zip2Lists" />
+        <node concept="3cqZAl" id="6vHuLLnJ_uN" role="3clF45" />
+        <node concept="3Tm1VV" id="6vHuLLnJ_uO" role="1B3o_S" />
+        <node concept="3clFbS" id="6vHuLLnJ_uP" role="3clF47">
+          <node concept="3cpWs8" id="6vHuLLnJV_2" role="3cqZAp">
+            <node concept="3cpWsn" id="6vHuLLnJV_3" role="3cpWs9">
+              <property role="TrG5h" value="actual" />
+              <node concept="A3Dl8" id="6vHuLLnJVsa" role="1tU5fm">
+                <node concept="1LlUBW" id="6vHuLLnJVsl" role="A3Ik2">
+                  <node concept="10Oyi0" id="6vHuLLnJVsm" role="1Lm7xW" />
+                  <node concept="17QB3L" id="6vHuLLnJVsn" role="1Lm7xW" />
+                </node>
+              </node>
+              <node concept="2YIFZM" id="6vHuLLnJV_4" role="33vP2m">
+                <ref role="37wK5l" to="96gm:6vHuLLnJvrd" resolve="zip" />
+                <ref role="1Pybhc" to="96gm:6vHuLLnJvpc" resolve="ZipOperatorUtil" />
+                <node concept="2ShNRf" id="6vHuLLnJV_5" role="37wK5m">
+                  <node concept="Tc6Ow" id="6vHuLLnJV_6" role="2ShVmc">
+                    <node concept="10Oyi0" id="6vHuLLnJV_7" role="HW$YZ" />
+                    <node concept="3cmrfG" id="6vHuLLnJV_8" role="HW$Y0">
+                      <property role="3cmrfH" value="1" />
+                    </node>
+                    <node concept="3cmrfG" id="6vHuLLnJV_9" role="HW$Y0">
+                      <property role="3cmrfH" value="2" />
+                    </node>
+                    <node concept="3cmrfG" id="6vHuLLnJV_a" role="HW$Y0">
+                      <property role="3cmrfH" value="3" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="6vHuLLnJV_b" role="37wK5m">
+                  <node concept="Tc6Ow" id="6vHuLLnJV_c" role="2ShVmc">
+                    <node concept="Xl_RD" id="6vHuLLnJV_d" role="HW$Y0">
+                      <property role="Xl_RC" value="one" />
+                    </node>
+                    <node concept="Xl_RD" id="6vHuLLnJV_e" role="HW$Y0">
+                      <property role="Xl_RC" value="two" />
+                    </node>
+                    <node concept="Xl_RD" id="6vHuLLnJV_f" role="HW$Y0">
+                      <property role="Xl_RC" value="three" />
+                    </node>
+                    <node concept="17QB3L" id="6vHuLLnJV_g" role="HW$YZ" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="6vHuLLnJZZ4" role="3cqZAp">
+            <node concept="3cpWsn" id="6vHuLLnJZZ5" role="3cpWs9">
+              <property role="TrG5h" value="expected" />
+              <node concept="_YKpA" id="6vHuLLnJZVB" role="1tU5fm">
+                <node concept="1LlUBW" id="6vHuLLnJZVM" role="_ZDj9">
+                  <node concept="10Oyi0" id="6vHuLLnJZVN" role="1Lm7xW" />
+                  <node concept="17QB3L" id="6vHuLLnJZVO" role="1Lm7xW" />
+                </node>
+              </node>
+              <node concept="2ShNRf" id="6vHuLLnJZZ6" role="33vP2m">
+                <node concept="Tc6Ow" id="6vHuLLnJZZ7" role="2ShVmc">
+                  <node concept="1LlUBW" id="6vHuLLnJZZ8" role="HW$YZ">
+                    <node concept="10Oyi0" id="6vHuLLnJZZ9" role="1Lm7xW" />
+                    <node concept="17QB3L" id="6vHuLLnJZZa" role="1Lm7xW" />
+                  </node>
+                  <node concept="1Ls8ON" id="6vHuLLnJZZb" role="HW$Y0">
+                    <node concept="3cmrfG" id="6vHuLLnJZZc" role="1Lso8e">
+                      <property role="3cmrfH" value="1" />
+                    </node>
+                    <node concept="Xl_RD" id="6vHuLLnJZZd" role="1Lso8e">
+                      <property role="Xl_RC" value="one" />
+                    </node>
+                  </node>
+                  <node concept="1Ls8ON" id="6vHuLLnJZZe" role="HW$Y0">
+                    <node concept="3cmrfG" id="6vHuLLnJZZf" role="1Lso8e">
+                      <property role="3cmrfH" value="2" />
+                    </node>
+                    <node concept="Xl_RD" id="6vHuLLnJZZg" role="1Lso8e">
+                      <property role="Xl_RC" value="two" />
+                    </node>
+                  </node>
+                  <node concept="1Ls8ON" id="6vHuLLnJZZh" role="HW$Y0">
+                    <node concept="3cmrfG" id="6vHuLLnJZZi" role="1Lso8e">
+                      <property role="3cmrfH" value="3" />
+                    </node>
+                    <node concept="Xl_RD" id="6vHuLLnJZZj" role="1Lso8e">
+                      <property role="Xl_RC" value="three" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3vwNmj" id="6vHuLLnK0nI" role="3cqZAp">
+            <node concept="1Wc70l" id="6vHuLLnK2iw" role="3vwVQn">
+              <node concept="2OqwBi" id="6vHuLLnK3zb" role="3uHU7w">
+                <node concept="37vLTw" id="6vHuLLnK2IO" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6vHuLLnJZZ5" resolve="expected" />
+                </node>
+                <node concept="BjQpj" id="6vHuLLnK4ld" role="2OqNvi">
+                  <node concept="37vLTw" id="6vHuLLnK4wA" role="25WWJ7">
+                    <ref role="3cqZAo" node="6vHuLLnJV_3" resolve="actual" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6vHuLLnK0VU" role="3uHU7B">
+                <node concept="37vLTw" id="6vHuLLnK0sx" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6vHuLLnJV_3" resolve="actual" />
+                </node>
+                <node concept="BjQpj" id="6vHuLLnK1fK" role="2OqNvi">
+                  <node concept="37vLTw" id="6vHuLLnK1mR" role="25WWJ7">
+                    <ref role="3cqZAo" node="6vHuLLnJZZ5" resolve="expected" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3s$Bmu" id="6vHuLLnK4E$" role="3s_gse">
+        <property role="3s$Bm0" value="zip2ListsOneShorter" />
+        <node concept="3cqZAl" id="6vHuLLnK4E_" role="3clF45" />
+        <node concept="3Tm1VV" id="6vHuLLnK4EA" role="1B3o_S" />
+        <node concept="3clFbS" id="6vHuLLnK4EB" role="3clF47">
+          <node concept="3cpWs8" id="6vHuLLnK4EC" role="3cqZAp">
+            <node concept="3cpWsn" id="6vHuLLnK4ED" role="3cpWs9">
+              <property role="TrG5h" value="actual1" />
+              <node concept="A3Dl8" id="6vHuLLnK4EE" role="1tU5fm">
+                <node concept="1LlUBW" id="6vHuLLnK4EF" role="A3Ik2">
+                  <node concept="10Oyi0" id="6vHuLLnK4EG" role="1Lm7xW" />
+                  <node concept="17QB3L" id="6vHuLLnK4EH" role="1Lm7xW" />
+                </node>
+              </node>
+              <node concept="2YIFZM" id="6vHuLLnK4EI" role="33vP2m">
+                <ref role="37wK5l" to="96gm:6vHuLLnJvrd" resolve="zip" />
+                <ref role="1Pybhc" to="96gm:6vHuLLnJvpc" resolve="ZipOperatorUtil" />
+                <node concept="2ShNRf" id="6vHuLLnK4EJ" role="37wK5m">
+                  <node concept="Tc6Ow" id="6vHuLLnK4EK" role="2ShVmc">
+                    <node concept="10Oyi0" id="6vHuLLnK4EL" role="HW$YZ" />
+                    <node concept="3cmrfG" id="6vHuLLnK4EM" role="HW$Y0">
+                      <property role="3cmrfH" value="1" />
+                    </node>
+                    <node concept="3cmrfG" id="6vHuLLnK4EN" role="HW$Y0">
+                      <property role="3cmrfH" value="2" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="6vHuLLnK4EP" role="37wK5m">
+                  <node concept="Tc6Ow" id="6vHuLLnK4EQ" role="2ShVmc">
+                    <node concept="Xl_RD" id="6vHuLLnK4ER" role="HW$Y0">
+                      <property role="Xl_RC" value="one" />
+                    </node>
+                    <node concept="Xl_RD" id="6vHuLLnK4ES" role="HW$Y0">
+                      <property role="Xl_RC" value="two" />
+                    </node>
+                    <node concept="Xl_RD" id="6vHuLLnK4ET" role="HW$Y0">
+                      <property role="Xl_RC" value="three" />
+                    </node>
+                    <node concept="17QB3L" id="6vHuLLnK4EU" role="HW$YZ" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="6vHuLLnK4EV" role="3cqZAp">
+            <node concept="3cpWsn" id="6vHuLLnK4EW" role="3cpWs9">
+              <property role="TrG5h" value="expected1" />
+              <node concept="_YKpA" id="6vHuLLnK4EX" role="1tU5fm">
+                <node concept="1LlUBW" id="6vHuLLnK4EY" role="_ZDj9">
+                  <node concept="10Oyi0" id="6vHuLLnK4EZ" role="1Lm7xW" />
+                  <node concept="17QB3L" id="6vHuLLnK4F0" role="1Lm7xW" />
+                </node>
+              </node>
+              <node concept="2ShNRf" id="6vHuLLnK4F1" role="33vP2m">
+                <node concept="Tc6Ow" id="6vHuLLnK4F2" role="2ShVmc">
+                  <node concept="1LlUBW" id="6vHuLLnK4F3" role="HW$YZ">
+                    <node concept="10Oyi0" id="6vHuLLnK4F4" role="1Lm7xW" />
+                    <node concept="17QB3L" id="6vHuLLnK4F5" role="1Lm7xW" />
+                  </node>
+                  <node concept="1Ls8ON" id="6vHuLLnK4F6" role="HW$Y0">
+                    <node concept="3cmrfG" id="6vHuLLnK4F7" role="1Lso8e">
+                      <property role="3cmrfH" value="1" />
+                    </node>
+                    <node concept="Xl_RD" id="6vHuLLnK4F8" role="1Lso8e">
+                      <property role="Xl_RC" value="one" />
+                    </node>
+                  </node>
+                  <node concept="1Ls8ON" id="6vHuLLnK4F9" role="HW$Y0">
+                    <node concept="3cmrfG" id="6vHuLLnK4Fa" role="1Lso8e">
+                      <property role="3cmrfH" value="2" />
+                    </node>
+                    <node concept="Xl_RD" id="6vHuLLnK4Fb" role="1Lso8e">
+                      <property role="Xl_RC" value="two" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3vwNmj" id="6vHuLLnK4Ff" role="3cqZAp">
+            <node concept="1Wc70l" id="6vHuLLnK4Fg" role="3vwVQn">
+              <node concept="2OqwBi" id="6vHuLLnK4Fh" role="3uHU7w">
+                <node concept="37vLTw" id="6vHuLLnK4Fi" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6vHuLLnK4EW" resolve="expected1" />
+                </node>
+                <node concept="BjQpj" id="6vHuLLnK4Fj" role="2OqNvi">
+                  <node concept="37vLTw" id="6vHuLLnK4Fk" role="25WWJ7">
+                    <ref role="3cqZAo" node="6vHuLLnK4ED" resolve="actual1" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6vHuLLnK4Fl" role="3uHU7B">
+                <node concept="37vLTw" id="6vHuLLnK4Fm" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6vHuLLnK4ED" resolve="actual1" />
+                </node>
+                <node concept="BjQpj" id="6vHuLLnK4Fn" role="2OqNvi">
+                  <node concept="37vLTw" id="6vHuLLnK4Fo" role="25WWJ7">
+                    <ref role="3cqZAo" node="6vHuLLnK4EW" resolve="expected1" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="6vHuLLnK5Uq" role="3cqZAp" />
+          <node concept="3cpWs8" id="6vHuLLnK5zp" role="3cqZAp">
+            <node concept="3cpWsn" id="6vHuLLnK5zq" role="3cpWs9">
+              <property role="TrG5h" value="actual2" />
+              <node concept="A3Dl8" id="6vHuLLnK5zr" role="1tU5fm">
+                <node concept="1LlUBW" id="6vHuLLnK5zs" role="A3Ik2">
+                  <node concept="10Oyi0" id="6vHuLLnK5zt" role="1Lm7xW" />
+                  <node concept="17QB3L" id="6vHuLLnK5zu" role="1Lm7xW" />
+                </node>
+              </node>
+              <node concept="2YIFZM" id="6vHuLLnK5zv" role="33vP2m">
+                <ref role="37wK5l" to="96gm:6vHuLLnJvrd" resolve="zip" />
+                <ref role="1Pybhc" to="96gm:6vHuLLnJvpc" resolve="ZipOperatorUtil" />
+                <node concept="2ShNRf" id="6vHuLLnK5zw" role="37wK5m">
+                  <node concept="Tc6Ow" id="6vHuLLnK5zx" role="2ShVmc">
+                    <node concept="10Oyi0" id="6vHuLLnK5zy" role="HW$YZ" />
+                    <node concept="3cmrfG" id="6vHuLLnK5zz" role="HW$Y0">
+                      <property role="3cmrfH" value="1" />
+                    </node>
+                    <node concept="3cmrfG" id="6vHuLLnK5z$" role="HW$Y0">
+                      <property role="3cmrfH" value="2" />
+                    </node>
+                    <node concept="3cmrfG" id="6vHuLLnK9nJ" role="HW$Y0">
+                      <property role="3cmrfH" value="3" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="6vHuLLnK5z_" role="37wK5m">
+                  <node concept="Tc6Ow" id="6vHuLLnK5zA" role="2ShVmc">
+                    <node concept="Xl_RD" id="6vHuLLnK5zB" role="HW$Y0">
+                      <property role="Xl_RC" value="one" />
+                    </node>
+                    <node concept="Xl_RD" id="6vHuLLnK5zC" role="HW$Y0">
+                      <property role="Xl_RC" value="two" />
+                    </node>
+                    <node concept="17QB3L" id="6vHuLLnK5zE" role="HW$YZ" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="6vHuLLnK5z8" role="3cqZAp">
+            <node concept="3cpWsn" id="6vHuLLnK5z9" role="3cpWs9">
+              <property role="TrG5h" value="expected2" />
+              <node concept="_YKpA" id="6vHuLLnK5za" role="1tU5fm">
+                <node concept="1LlUBW" id="6vHuLLnK5zb" role="_ZDj9">
+                  <node concept="10Oyi0" id="6vHuLLnK5zc" role="1Lm7xW" />
+                  <node concept="17QB3L" id="6vHuLLnK5zd" role="1Lm7xW" />
+                </node>
+              </node>
+              <node concept="2ShNRf" id="6vHuLLnK5ze" role="33vP2m">
+                <node concept="Tc6Ow" id="6vHuLLnK5zf" role="2ShVmc">
+                  <node concept="1LlUBW" id="6vHuLLnK5zg" role="HW$YZ">
+                    <node concept="10Oyi0" id="6vHuLLnK5zh" role="1Lm7xW" />
+                    <node concept="17QB3L" id="6vHuLLnK5zi" role="1Lm7xW" />
+                  </node>
+                  <node concept="1Ls8ON" id="6vHuLLnK5zj" role="HW$Y0">
+                    <node concept="3cmrfG" id="6vHuLLnK5zk" role="1Lso8e">
+                      <property role="3cmrfH" value="1" />
+                    </node>
+                    <node concept="Xl_RD" id="6vHuLLnK5zl" role="1Lso8e">
+                      <property role="Xl_RC" value="one" />
+                    </node>
+                  </node>
+                  <node concept="1Ls8ON" id="6vHuLLnK5zm" role="HW$Y0">
+                    <node concept="3cmrfG" id="6vHuLLnK5zn" role="1Lso8e">
+                      <property role="3cmrfH" value="2" />
+                    </node>
+                    <node concept="Xl_RD" id="6vHuLLnK5zo" role="1Lso8e">
+                      <property role="Xl_RC" value="two" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3vwNmj" id="6vHuLLnK5yY" role="3cqZAp">
+            <node concept="1Wc70l" id="6vHuLLnK5yZ" role="3vwVQn">
+              <node concept="2OqwBi" id="6vHuLLnK5z0" role="3uHU7w">
+                <node concept="37vLTw" id="6vHuLLnK5z1" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6vHuLLnK5z9" resolve="expected2" />
+                </node>
+                <node concept="BjQpj" id="6vHuLLnK5z2" role="2OqNvi">
+                  <node concept="37vLTw" id="6vHuLLnK5z3" role="25WWJ7">
+                    <ref role="3cqZAo" node="6vHuLLnK5zq" resolve="actual2" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6vHuLLnK5z4" role="3uHU7B">
+                <node concept="37vLTw" id="6vHuLLnK5z5" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6vHuLLnK5zq" resolve="actual2" />
+                </node>
+                <node concept="BjQpj" id="6vHuLLnK5z6" role="2OqNvi">
+                  <node concept="37vLTw" id="6vHuLLnK5z7" role="25WWJ7">
+                    <ref role="3cqZAo" node="6vHuLLnK5z9" resolve="expected2" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6vHuLLnKmSR" role="3cqZAp">
+            <node concept="2OqwBi" id="6vHuLLnKnnJ" role="3clFbG">
+              <node concept="37vLTw" id="6vHuLLnKmSP" role="2Oq$k0">
+                <ref role="3cqZAo" node="6vHuLLnK4ED" resolve="actual1" />
+              </node>
+              <node concept="60FfQ" id="6vHuLLnKnUY" role="2OqNvi">
+                <node concept="37vLTw" id="6vHuLLnKofr" role="576Qk">
+                  <ref role="3cqZAo" node="6vHuLLnK5zq" resolve="actual2" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3s$Bmu" id="6vHuLLnKbwg" role="3s_gse">
+        <property role="3s$Bm0" value="zip2ListsOneEmpty" />
+        <node concept="3cqZAl" id="6vHuLLnKbwh" role="3clF45" />
+        <node concept="3Tm1VV" id="6vHuLLnKbwi" role="1B3o_S" />
+        <node concept="3clFbS" id="6vHuLLnKbwj" role="3clF47">
+          <node concept="3cpWs8" id="6vHuLLnKbwk" role="3cqZAp">
+            <node concept="3cpWsn" id="6vHuLLnKbwl" role="3cpWs9">
+              <property role="TrG5h" value="actual1" />
+              <node concept="A3Dl8" id="6vHuLLnKbwm" role="1tU5fm">
+                <node concept="1LlUBW" id="6vHuLLnKbwn" role="A3Ik2">
+                  <node concept="10Oyi0" id="6vHuLLnKbwo" role="1Lm7xW" />
+                  <node concept="17QB3L" id="6vHuLLnKbwp" role="1Lm7xW" />
+                </node>
+              </node>
+              <node concept="2YIFZM" id="6vHuLLnKbwq" role="33vP2m">
+                <ref role="37wK5l" to="96gm:6vHuLLnJvrd" resolve="zip" />
+                <ref role="1Pybhc" to="96gm:6vHuLLnJvpc" resolve="ZipOperatorUtil" />
+                <node concept="2ShNRf" id="6vHuLLnKbwr" role="37wK5m">
+                  <node concept="Tc6Ow" id="6vHuLLnKbws" role="2ShVmc">
+                    <node concept="10Oyi0" id="6vHuLLnKbwt" role="HW$YZ" />
+                    <node concept="3cmrfG" id="6vHuLLnKbwu" role="HW$Y0">
+                      <property role="3cmrfH" value="1" />
+                    </node>
+                    <node concept="3cmrfG" id="6vHuLLnKbwv" role="HW$Y0">
+                      <property role="3cmrfH" value="2" />
+                    </node>
+                    <node concept="3cmrfG" id="6vHuLLnKd1e" role="HW$Y0">
+                      <property role="3cmrfH" value="3" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="6vHuLLnKbww" role="37wK5m">
+                  <node concept="Tc6Ow" id="6vHuLLnKbwx" role="2ShVmc">
+                    <node concept="17QB3L" id="6vHuLLnKbw_" role="HW$YZ" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3vwNmj" id="6vHuLLnKbwR" role="3cqZAp">
+            <node concept="2OqwBi" id="6vHuLLnKbwX" role="3vwVQn">
+              <node concept="37vLTw" id="6vHuLLnKbwY" role="2Oq$k0">
+                <ref role="3cqZAo" node="6vHuLLnKbwl" resolve="actual1" />
+              </node>
+              <node concept="1v1jN8" id="6vHuLLnKfLr" role="2OqNvi" />
+            </node>
+          </node>
+          <node concept="3clFbH" id="6vHuLLnKbx1" role="3cqZAp" />
+          <node concept="3cpWs8" id="6vHuLLnKbx2" role="3cqZAp">
+            <node concept="3cpWsn" id="6vHuLLnKbx3" role="3cpWs9">
+              <property role="TrG5h" value="actual2" />
+              <node concept="A3Dl8" id="6vHuLLnKbx4" role="1tU5fm">
+                <node concept="1LlUBW" id="6vHuLLnKbx5" role="A3Ik2">
+                  <node concept="10Oyi0" id="6vHuLLnKbx6" role="1Lm7xW" />
+                  <node concept="17QB3L" id="6vHuLLnKbx7" role="1Lm7xW" />
+                </node>
+              </node>
+              <node concept="2YIFZM" id="6vHuLLnKbx8" role="33vP2m">
+                <ref role="37wK5l" to="96gm:6vHuLLnJvrd" resolve="zip" />
+                <ref role="1Pybhc" to="96gm:6vHuLLnJvpc" resolve="ZipOperatorUtil" />
+                <node concept="2ShNRf" id="6vHuLLnKbx9" role="37wK5m">
+                  <node concept="Tc6Ow" id="6vHuLLnKbxa" role="2ShVmc">
+                    <node concept="10Oyi0" id="6vHuLLnKbxb" role="HW$YZ" />
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="6vHuLLnKbxf" role="37wK5m">
+                  <node concept="Tc6Ow" id="6vHuLLnKbxg" role="2ShVmc">
+                    <node concept="17QB3L" id="6vHuLLnKbxj" role="HW$YZ" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3vwNmj" id="6vHuLLnKbx_" role="3cqZAp">
+            <node concept="2OqwBi" id="6vHuLLnKbxF" role="3vwVQn">
+              <node concept="37vLTw" id="6vHuLLnKbxG" role="2Oq$k0">
+                <ref role="3cqZAo" node="6vHuLLnKbx3" resolve="actual2" />
+              </node>
+              <node concept="1v1jN8" id="6vHuLLnKh_Z" role="2OqNvi" />
+            </node>
+          </node>
+          <node concept="3clFbH" id="6vHuLLnKhXq" role="3cqZAp" />
+          <node concept="3cpWs8" id="6vHuLLnKhJ0" role="3cqZAp">
+            <node concept="3cpWsn" id="6vHuLLnKhJ1" role="3cpWs9">
+              <property role="TrG5h" value="actual3" />
+              <node concept="A3Dl8" id="6vHuLLnKhJ2" role="1tU5fm">
+                <node concept="1LlUBW" id="6vHuLLnKhJ3" role="A3Ik2">
+                  <node concept="10Oyi0" id="6vHuLLnKhJ4" role="1Lm7xW" />
+                  <node concept="17QB3L" id="6vHuLLnKhJ5" role="1Lm7xW" />
+                </node>
+              </node>
+              <node concept="2YIFZM" id="6vHuLLnKhJ6" role="33vP2m">
+                <ref role="37wK5l" to="96gm:6vHuLLnJvrd" resolve="zip" />
+                <ref role="1Pybhc" to="96gm:6vHuLLnJvpc" resolve="ZipOperatorUtil" />
+                <node concept="2ShNRf" id="6vHuLLnKhJ7" role="37wK5m">
+                  <node concept="Tc6Ow" id="6vHuLLnKhJ8" role="2ShVmc">
+                    <node concept="10Oyi0" id="6vHuLLnKhJ9" role="HW$YZ" />
+                  </node>
+                </node>
+                <node concept="10Nm6u" id="6vHuLLnKiAj" role="37wK5m" />
+              </node>
+            </node>
+          </node>
+          <node concept="3vwNmj" id="6vHuLLnKhIW" role="3cqZAp">
+            <node concept="2OqwBi" id="6vHuLLnKhIX" role="3vwVQn">
+              <node concept="37vLTw" id="6vHuLLnKhIY" role="2Oq$k0">
+                <ref role="3cqZAo" node="6vHuLLnKhJ1" resolve="actual3" />
+              </node>
+              <node concept="1v1jN8" id="6vHuLLnKhIZ" role="2OqNvi" />
+            </node>
+          </node>
+          <node concept="3clFbH" id="6vHuLLnKj4K" role="3cqZAp" />
+          <node concept="3cpWs8" id="6vHuLLnKiNc" role="3cqZAp">
+            <node concept="3cpWsn" id="6vHuLLnKiNd" role="3cpWs9">
+              <property role="TrG5h" value="actual4" />
+              <node concept="A3Dl8" id="6vHuLLnKiNe" role="1tU5fm">
+                <node concept="1LlUBW" id="6vHuLLnKiNf" role="A3Ik2">
+                  <node concept="10Oyi0" id="6vHuLLnKiNg" role="1Lm7xW" />
+                  <node concept="17QB3L" id="6vHuLLnKiNh" role="1Lm7xW" />
+                </node>
+              </node>
+              <node concept="2YIFZM" id="6vHuLLnKiNi" role="33vP2m">
+                <ref role="37wK5l" to="96gm:6vHuLLnJvrd" resolve="zip" />
+                <ref role="1Pybhc" to="96gm:6vHuLLnJvpc" resolve="ZipOperatorUtil" />
+                <node concept="10Nm6u" id="6vHuLLnKk7S" role="37wK5m" />
+                <node concept="10Nm6u" id="6vHuLLnKiNm" role="37wK5m" />
+              </node>
+            </node>
+          </node>
+          <node concept="3vwNmj" id="6vHuLLnKiN8" role="3cqZAp">
+            <node concept="2OqwBi" id="6vHuLLnKiN9" role="3vwVQn">
+              <node concept="37vLTw" id="6vHuLLnKiNa" role="2Oq$k0">
+                <ref role="3cqZAo" node="6vHuLLnKiNd" resolve="actual4" />
+              </node>
+              <node concept="1v1jN8" id="6vHuLLnKiNb" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+</model>
+

From de71d0240a055eeadc9426e8b68b32e5ad999432 Mon Sep 17 00:00:00 2001
From: Dennis Albrecht <dalbrecht@itemis.com>
Date: Wed, 24 Sep 2025 15:33:19 +0200
Subject: [PATCH 07/18] introduced groupBy runtime

---
 .../models/de.itemis.mps.extensions.build.mps |  15 +
 ...mis.mps.baseLanguageExtensions.runtime.msd |   6 +
 ...mis.mps.baseLanguageExtensions.runtime.mps | 230 +++++++++-
 ...itemis.mps.baseLanguageExtensions.test.msd |   2 +
 ...Extensions.test.groupByOperation@tests.mps | 406 ++++++++++++++++++
 5 files changed, 657 insertions(+), 2 deletions(-)
 create mode 100644 code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.groupByOperation@tests.mps

diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
index 035056d4fc..a1451bbe8f 100644
--- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
+++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -9890,6 +9890,16 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="54jQkZ8WKrY" role="3bR37C">
+          <node concept="3bR9La" id="54jQkZ8WKrZ" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="54jQkZ8WKs0" role="3bR37C">
+          <node concept="3bR9La" id="54jQkZ8WKs1" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6L0C" resolve="collections.runtime" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="m$_wf" id="5Jv8_iJNYP8" role="3989C9">
@@ -19784,6 +19794,11 @@
             <ref role="3bR37D" node="vJfcQmbzfZ" resolve="de.itemis.mps.baseLanguageExtensions.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="54jQkZ8WJHM" role="3bR37C">
+          <node concept="3bR9La" id="54jQkZ8WJHN" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6L0C" resolve="collections.runtime" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="4JmkJs3GrYV" role="3989C9">
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
index 9c9eff1de1..40a6a90e06 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
@@ -11,6 +11,10 @@
     </facet>
   </facets>
   <sourcePath />
+  <dependencies>
+    <dependency reexport="false">9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)</dependency>
+    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+  </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
@@ -21,6 +25,8 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" version="0" />
     <module reference="d91eaf6f-a378-467f-9524-0c201ee2e15f(de.itemis.mps.baseLanguageExtensions.runtime)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
index a022226819..2e2e469ecf 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
@@ -9,7 +9,10 @@
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
   </languages>
-  <imports />
+  <imports>
+    <import index="urs3" ref="r:fc76aa36-3cff-41c7-b94b-eee0e8341932(jetbrains.mps.internal.collections.runtime)" />
+    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
+  </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
       <concept id="1238852151516" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleType" flags="in" index="1LlUBW">
@@ -26,6 +29,7 @@
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
       <concept id="1153422305557" name="jetbrains.mps.baseLanguage.structure.LessThanOrEqualsExpression" flags="nn" index="2dkUwp" />
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
       <concept id="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
         <child id="1076505808688" name="condition" index="2$JKZa" />
@@ -44,12 +48,22 @@
         <child id="1145553007750" name="creator" index="2ShVmc" />
       </concept>
       <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
+      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
+        <child id="1070534934091" name="type" index="10QFUM" />
+        <child id="1070534934092" name="expression" index="10QFUP" />
+      </concept>
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
       <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ" />
       <concept id="1109279851642" name="jetbrains.mps.baseLanguage.structure.GenericDeclaration" flags="ng" index="16eOlS">
         <child id="1109279881614" name="typeVariableDeclaration" index="16eVyc" />
@@ -95,10 +109,26 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
+      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
+        <child id="1081516765348" name="expression" index="3fr31v" />
+      </concept>
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+        <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
+      </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+        <child id="1109201940907" name="parameter" index="11_B2D" />
+      </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
@@ -123,11 +153,15 @@
       </concept>
       <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
         <child id="1199542457201" name="resultType" index="1ajl9A" />
+        <child id="1199542501692" name="parameterType" index="1ajw0F" />
       </concept>
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
-      <concept id="1225797177491" name="jetbrains.mps.baseLanguage.closures.structure.InvokeFunctionOperation" flags="nn" index="1Bd96e" />
+      <concept id="1225797177491" name="jetbrains.mps.baseLanguage.closures.structure.InvokeFunctionOperation" flags="nn" index="1Bd96e">
+        <child id="1225797361612" name="parameter" index="1BdPVh" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
@@ -490,5 +524,197 @@
     </node>
     <node concept="3Tm1VV" id="6vHuLLnJvpd" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="54jQkZ8QoGe">
+    <property role="TrG5h" value="GroupByOperationUtil" />
+    <node concept="2YIFZL" id="54jQkZ8QoHD" role="jymVt">
+      <property role="TrG5h" value="apply" />
+      <node concept="3clFbS" id="54jQkZ8QoHG" role="3clF47">
+        <node concept="3cpWs8" id="54jQkZ8R36P" role="3cqZAp">
+          <node concept="3cpWsn" id="54jQkZ8R36Q" role="3cpWs9">
+            <property role="TrG5h" value="cache" />
+            <node concept="3uibUv" id="54jQkZ8R36N" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+              <node concept="16syzq" id="54jQkZ8R3wI" role="11_B2D">
+                <ref role="16sUi3" node="54jQkZ8QpwM" resolve="K" />
+              </node>
+              <node concept="3uibUv" id="54jQkZ8R3Xb" role="11_B2D">
+                <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
+                <node concept="16syzq" id="54jQkZ8R4qE" role="11_B2D">
+                  <ref role="16sUi3" node="54jQkZ8QoI8" resolve="T" />
+                </node>
+              </node>
+            </node>
+            <node concept="2ShNRf" id="54jQkZ8R56d" role="33vP2m">
+              <node concept="1pGfFk" id="54jQkZ8R6Ug" role="2ShVmc">
+                <property role="373rjd" value="true" />
+                <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="54jQkZ8RztP" role="3cqZAp">
+          <node concept="2OqwBi" id="54jQkZ8R$PK" role="3clFbG">
+            <node concept="37vLTw" id="54jQkZ8RztN" role="2Oq$k0">
+              <ref role="3cqZAo" node="54jQkZ8QoIN" resolve="seq" />
+            </node>
+            <node concept="liA8E" id="54jQkZ8RCeI" role="2OqNvi">
+              <ref role="37wK5l" to="urs3:5Ffu4tBUx7B" resolve="visitAll" />
+              <node concept="1bVj0M" id="54jQkZ8S7B8" role="37wK5m">
+                <node concept="3clFbS" id="54jQkZ8S7B9" role="1bW5cS">
+                  <node concept="3cpWs8" id="54jQkZ8S7Ba" role="3cqZAp">
+                    <node concept="3cpWsn" id="54jQkZ8S7Bb" role="3cpWs9">
+                      <property role="TrG5h" value="key" />
+                      <node concept="16syzq" id="54jQkZ8S7Bc" role="1tU5fm">
+                        <ref role="16sUi3" node="54jQkZ8QpwM" resolve="K" />
+                      </node>
+                      <node concept="2OqwBi" id="54jQkZ8S7Bd" role="33vP2m">
+                        <node concept="37vLTw" id="54jQkZ8S7Be" role="2Oq$k0">
+                          <ref role="3cqZAo" node="54jQkZ8Qpvu" resolve="keyExtract" />
+                        </node>
+                        <node concept="1Bd96e" id="54jQkZ8S7Bf" role="2OqNvi">
+                          <node concept="37vLTw" id="54jQkZ8S7Bg" role="1BdPVh">
+                            <ref role="3cqZAo" node="54jQkZ8S7BC" resolve="elem" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbJ" id="54jQkZ8S7Bh" role="3cqZAp">
+                    <node concept="3fqX7Q" id="54jQkZ8S7Bi" role="3clFbw">
+                      <node concept="2OqwBi" id="54jQkZ8S7Bj" role="3fr31v">
+                        <node concept="37vLTw" id="54jQkZ8S7Bk" role="2Oq$k0">
+                          <ref role="3cqZAo" node="54jQkZ8R36Q" resolve="cache" />
+                        </node>
+                        <node concept="liA8E" id="54jQkZ8S7Bl" role="2OqNvi">
+                          <ref role="37wK5l" to="33ny:~Map.containsKey(java.lang.Object)" resolve="containsKey" />
+                          <node concept="37vLTw" id="54jQkZ8S7Bm" role="37wK5m">
+                            <ref role="3cqZAo" node="54jQkZ8S7Bb" resolve="key" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbS" id="54jQkZ8S7Bn" role="3clFbx">
+                      <node concept="3clFbF" id="54jQkZ8S7Bo" role="3cqZAp">
+                        <node concept="2OqwBi" id="54jQkZ8S7Bp" role="3clFbG">
+                          <node concept="37vLTw" id="54jQkZ8S7Bq" role="2Oq$k0">
+                            <ref role="3cqZAo" node="54jQkZ8R36Q" resolve="cache" />
+                          </node>
+                          <node concept="liA8E" id="54jQkZ8S7Br" role="2OqNvi">
+                            <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
+                            <node concept="37vLTw" id="54jQkZ8S7Bs" role="37wK5m">
+                              <ref role="3cqZAo" node="54jQkZ8S7Bb" resolve="key" />
+                            </node>
+                            <node concept="2YIFZM" id="54jQkZ8ST1S" role="37wK5m">
+                              <ref role="37wK5l" to="urs3:5Ffu4tBUyJX" resolve="fromArray" />
+                              <ref role="1Pybhc" to="urs3:5Ffu4tBUyJF" resolve="ListSequence" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="54jQkZ8S7Bw" role="3cqZAp">
+                    <node concept="2OqwBi" id="54jQkZ8S7Bx" role="3clFbG">
+                      <node concept="liA8E" id="54jQkZ8S7BA" role="2OqNvi">
+                        <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
+                        <node concept="37vLTw" id="54jQkZ8S7BB" role="37wK5m">
+                          <ref role="3cqZAo" node="54jQkZ8S7BC" resolve="elem" />
+                        </node>
+                      </node>
+                      <node concept="1eOMI4" id="54jQkZ8Tedk" role="2Oq$k0">
+                        <node concept="10QFUN" id="54jQkZ8Tedh" role="1eOMHV">
+                          <node concept="3uibUv" id="54jQkZ8Tg2M" role="10QFUM">
+                            <ref role="3uigEE" to="urs3:5Ffu4tBUyv1" resolve="IListSequence" />
+                            <node concept="16syzq" id="54jQkZ8TiOt" role="11_B2D">
+                              <ref role="16sUi3" node="54jQkZ8QoI8" resolve="T" />
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="54jQkZ8S7By" role="10QFUP">
+                            <node concept="37vLTw" id="54jQkZ8S7Bz" role="2Oq$k0">
+                              <ref role="3cqZAo" node="54jQkZ8R36Q" resolve="cache" />
+                            </node>
+                            <node concept="liA8E" id="54jQkZ8S7B$" role="2OqNvi">
+                              <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
+                              <node concept="37vLTw" id="54jQkZ8S7B_" role="37wK5m">
+                                <ref role="3cqZAo" node="54jQkZ8S7Bb" resolve="key" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTG" id="54jQkZ8S7BC" role="1bW2Oz">
+                  <property role="TrG5h" value="elem" />
+                  <node concept="16syzq" id="54jQkZ8S7BD" role="1tU5fm">
+                    <ref role="16sUi3" node="54jQkZ8QoI8" resolve="T" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="54jQkZ8QS3r" role="3cqZAp">
+          <node concept="2YIFZM" id="54jQkZ8SdyN" role="3clFbG">
+            <ref role="37wK5l" to="urs3:5Ffu4tBUzHn" resolve="fromMap" />
+            <ref role="1Pybhc" to="urs3:5Ffu4tBUzBg" resolve="MapSequence" />
+            <node concept="16syzq" id="54jQkZ8SdyO" role="3PaCim">
+              <ref role="16sUi3" node="54jQkZ8QpwM" resolve="K" />
+            </node>
+            <node concept="3uibUv" id="54jQkZ8Swgo" role="3PaCim">
+              <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
+              <node concept="16syzq" id="54jQkZ8SxY3" role="11_B2D">
+                <ref role="16sUi3" node="54jQkZ8QoI8" resolve="T" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="54jQkZ8Sez5" role="37wK5m">
+              <ref role="3cqZAo" node="54jQkZ8R36Q" resolve="cache" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="54jQkZ8QoH9" role="1B3o_S" />
+      <node concept="3uibUv" id="54jQkZ8QQ0a" role="3clF45">
+        <ref role="3uigEE" to="urs3:5Ffu4tBU$6H" resolve="IMapSequence" />
+        <node concept="16syzq" id="54jQkZ8QQ11" role="11_B2D">
+          <ref role="16sUi3" node="54jQkZ8QpwM" resolve="K" />
+        </node>
+        <node concept="3uibUv" id="54jQkZ8QQ1W" role="11_B2D">
+          <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
+          <node concept="16syzq" id="54jQkZ8QQ3y" role="11_B2D">
+            <ref role="16sUi3" node="54jQkZ8QoI8" resolve="T" />
+          </node>
+        </node>
+      </node>
+      <node concept="16euLQ" id="54jQkZ8QoI8" role="16eVyc">
+        <property role="TrG5h" value="T" />
+      </node>
+      <node concept="16euLQ" id="54jQkZ8QpwM" role="16eVyc">
+        <property role="TrG5h" value="K" />
+      </node>
+      <node concept="37vLTG" id="54jQkZ8QoIN" role="3clF46">
+        <property role="TrG5h" value="seq" />
+        <node concept="3uibUv" id="54jQkZ8QoIM" role="1tU5fm">
+          <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
+          <node concept="16syzq" id="54jQkZ8QpuE" role="11_B2D">
+            <ref role="16sUi3" node="54jQkZ8QoI8" resolve="T" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="54jQkZ8Qpvu" role="3clF46">
+        <property role="TrG5h" value="keyExtract" />
+        <node concept="1ajhzC" id="54jQkZ8QpvV" role="1tU5fm">
+          <node concept="16syzq" id="54jQkZ8Qpxs" role="1ajl9A">
+            <ref role="16sUi3" node="54jQkZ8QpwM" resolve="K" />
+          </node>
+          <node concept="16syzq" id="54jQkZ8Qpwm" role="1ajw0F">
+            <ref role="16sUi3" node="54jQkZ8QoI8" resolve="T" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="54jQkZ8QoGf" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd
index c30daa90b0..60a608e2ac 100644
--- a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd
+++ b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd
@@ -14,6 +14,7 @@
   <dependencies>
     <dependency reexport="false">d91eaf6f-a378-467f-9524-0c201ee2e15f(de.itemis.mps.baseLanguageExtensions.runtime)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+    <dependency reexport="false">9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -28,6 +29,7 @@
   </languageVersions>
   <dependencyVersions>
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" version="0" />
     <module reference="d91eaf6f-a378-467f-9524-0c201ee2e15f(de.itemis.mps.baseLanguageExtensions.runtime)" version="0" />
     <module reference="6f208df3-71dd-4d85-97d4-cc55c1d5b8e4(de.itemis.mps.baseLanguageExtensions.test)" version="0" />
   </dependencyVersions>
diff --git a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.groupByOperation@tests.mps b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.groupByOperation@tests.mps
new file mode 100644
index 0000000000..cb30a8a285
--- /dev/null
+++ b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.groupByOperation@tests.mps
@@ -0,0 +1,406 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:6a3a49bf-9631-499b-8ace-84153db69deb(de.itemis.mps.baseLanguageExtensions.test.groupByOperation@tests)">
+  <persistence version="9" />
+  <languages>
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
+    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+  </languages>
+  <imports>
+    <import index="urs3" ref="r:fc76aa36-3cff-41c7-b94b-eee0e8341932(jetbrains.mps.internal.collections.runtime)" />
+    <import index="96gm" ref="r:2eaed950-3bc1-47cd-9b02-e917ff994d7c(de.itemis.mps.baseLanguageExtensions.runtime)" />
+    <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
+    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
+        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
+      </concept>
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+        <child id="1188208488637" name="annotation" index="2AJF6D" />
+      </concept>
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
+        <child id="1182160096073" name="cls" index="YeSDq" />
+      </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
+      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <property id="1176718929932" name="isFinal" index="3TUv4t" />
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+        <child id="1109201940907" name="parameter" index="11_B2D" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
+        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+        <child id="1201186121363" name="typeParameter" index="2Ghqu4" />
+      </concept>
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
+        <child id="1199542457201" name="resultType" index="1ajl9A" />
+        <child id="1199542501692" name="parameterType" index="1ajw0F" />
+      </concept>
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
+    <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
+      <concept id="1171931690126" name="jetbrains.mps.baseLanguage.unitTest.structure.TestMethod" flags="ig" index="3s$Bmu">
+        <property id="1171931690128" name="methodName" index="3s$Bm0" />
+      </concept>
+      <concept id="1171931851043" name="jetbrains.mps.baseLanguage.unitTest.structure.BTestCase" flags="ig" index="3s_ewN">
+        <property id="1171931851045" name="testCaseName" index="3s_ewP" />
+        <child id="1171931851044" name="testMethodList" index="3s_ewO" />
+      </concept>
+      <concept id="1171931858461" name="jetbrains.mps.baseLanguage.unitTest.structure.TestMethodList" flags="ng" index="3s_gsd">
+        <child id="1171931858462" name="testMethod" index="3s_gse" />
+      </concept>
+      <concept id="8427750732757990717" name="jetbrains.mps.baseLanguage.unitTest.structure.BinaryAssert" flags="nn" index="3tpDYu">
+        <child id="8427750732757990725" name="actual" index="3tpDZA" />
+        <child id="8427750732757990724" name="expected" index="3tpDZB" />
+      </concept>
+      <concept id="1171978097730" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertEquals" flags="nn" index="3vlDli" />
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="3s_ewN" id="54jQkZ8THzt">
+    <property role="3s_ewP" value="GroupByOperation" />
+    <node concept="3Tm1VV" id="54jQkZ8THzu" role="1B3o_S" />
+    <node concept="3s_gsd" id="54jQkZ8THzv" role="3s_ewO">
+      <node concept="3s$Bmu" id="54jQkZ8THzS" role="3s_gse">
+        <property role="3s$Bm0" value="singleEntryListForAllUniqueKeys" />
+        <node concept="3cqZAl" id="54jQkZ8THzT" role="3clF45" />
+        <node concept="3Tm1VV" id="54jQkZ8THzU" role="1B3o_S" />
+        <node concept="3clFbS" id="54jQkZ8THzV" role="3clF47">
+          <node concept="3cpWs8" id="54jQkZ8TLD2" role="3cqZAp">
+            <node concept="3cpWsn" id="54jQkZ8TLD3" role="3cpWs9">
+              <property role="TrG5h" value="elements" />
+              <node concept="3uibUv" id="54jQkZ8TLD0" role="1tU5fm">
+                <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
+                <node concept="17QB3L" id="54jQkZ8TLDc" role="11_B2D" />
+              </node>
+              <node concept="2YIFZM" id="54jQkZ8TN5g" role="33vP2m">
+                <ref role="37wK5l" to="urs3:5Ffu4tBUyJX" resolve="fromArray" />
+                <ref role="1Pybhc" to="urs3:5Ffu4tBUyJF" resolve="ListSequence" />
+                <node concept="Xl_RD" id="54jQkZ8TNte" role="37wK5m">
+                  <property role="Xl_RC" value="One" />
+                </node>
+                <node concept="Xl_RD" id="54jQkZ8TPzs" role="37wK5m">
+                  <property role="Xl_RC" value="Four" />
+                </node>
+                <node concept="Xl_RD" id="54jQkZ8TR1$" role="37wK5m">
+                  <property role="Xl_RC" value="Seven" />
+                </node>
+                <node concept="Xl_RD" id="54jQkZ8TShh" role="37wK5m">
+                  <property role="Xl_RC" value="Hundred" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="54jQkZ8TTk7" role="3cqZAp" />
+          <node concept="3cpWs8" id="54jQkZ8TU_b" role="3cqZAp">
+            <node concept="3cpWsn" id="54jQkZ8TU_c" role="3cpWs9">
+              <property role="TrG5h" value="actual" />
+              <node concept="3uibUv" id="54jQkZ8TU_d" role="1tU5fm">
+                <ref role="3uigEE" to="urs3:5Ffu4tBU$6H" resolve="IMapSequence" />
+              </node>
+              <node concept="2YIFZM" id="54jQkZ8TW8k" role="33vP2m">
+                <ref role="37wK5l" to="96gm:54jQkZ8QoHD" resolve="apply" />
+                <ref role="1Pybhc" to="96gm:54jQkZ8QoGe" resolve="GroupByOperationUtil" />
+                <node concept="37vLTw" id="54jQkZ8TWqj" role="37wK5m">
+                  <ref role="3cqZAo" node="54jQkZ8TLD3" resolve="elements" />
+                </node>
+                <node concept="37vLTw" id="54jQkZ8VNk6" role="37wK5m">
+                  <ref role="3cqZAo" node="54jQkZ8VJJO" resolve="lengthExtractor" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="54jQkZ8U0oQ" role="3cqZAp" />
+          <node concept="3vlDli" id="54jQkZ8U1GF" role="3cqZAp">
+            <node concept="3cmrfG" id="54jQkZ8U2ck" role="3tpDZB">
+              <property role="3cmrfH" value="4" />
+            </node>
+            <node concept="2OqwBi" id="54jQkZ8U2Xl" role="3tpDZA">
+              <node concept="37vLTw" id="54jQkZ8U2wp" role="2Oq$k0">
+                <ref role="3cqZAo" node="54jQkZ8TU_c" resolve="actual" />
+              </node>
+              <node concept="liA8E" id="54jQkZ8U6ck" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Map.size()" resolve="size" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="54jQkZ8U6Kl" role="3cqZAp" />
+          <node concept="3clFbF" id="54jQkZ8U8fV" role="3cqZAp">
+            <node concept="2OqwBi" id="54jQkZ8U9dF" role="3clFbG">
+              <node concept="37vLTw" id="54jQkZ8U8fT" role="2Oq$k0">
+                <ref role="3cqZAo" node="54jQkZ8TU_c" resolve="actual" />
+              </node>
+              <node concept="liA8E" id="54jQkZ8Udsh" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Map.forEach(java.util.function.BiConsumer)" resolve="forEach" />
+                <node concept="1rXfSq" id="54jQkZ8Wh2j" role="37wK5m">
+                  <ref role="37wK5l" node="54jQkZ8VWA9" resolve="valueCountMatcher" />
+                  <node concept="3cmrfG" id="54jQkZ8W_lQ" role="37wK5m">
+                    <property role="3cmrfH" value="1" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3s$Bmu" id="54jQkZ8UY3f" role="3s_gse">
+        <property role="3s$Bm0" value="collisionsInKeysProduceCombinedValueSequences" />
+        <node concept="3cqZAl" id="54jQkZ8UY3g" role="3clF45" />
+        <node concept="3Tm1VV" id="54jQkZ8UY3h" role="1B3o_S" />
+        <node concept="3clFbS" id="54jQkZ8UY3i" role="3clF47">
+          <node concept="3cpWs8" id="54jQkZ8UZz$" role="3cqZAp">
+            <node concept="3cpWsn" id="54jQkZ8UZz_" role="3cpWs9">
+              <property role="TrG5h" value="elements" />
+              <node concept="3uibUv" id="54jQkZ8UZzA" role="1tU5fm">
+                <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
+                <node concept="17QB3L" id="54jQkZ8UZzB" role="11_B2D" />
+              </node>
+              <node concept="2YIFZM" id="54jQkZ8UZzC" role="33vP2m">
+                <ref role="37wK5l" to="urs3:5Ffu4tBUyJX" resolve="fromArray" />
+                <ref role="1Pybhc" to="urs3:5Ffu4tBUyJF" resolve="ListSequence" />
+                <node concept="Xl_RD" id="54jQkZ8UZzD" role="37wK5m">
+                  <property role="Xl_RC" value="One" />
+                </node>
+                <node concept="Xl_RD" id="54jQkZ8UZzE" role="37wK5m">
+                  <property role="Xl_RC" value="Six" />
+                </node>
+                <node concept="Xl_RD" id="54jQkZ8UZzF" role="37wK5m">
+                  <property role="Xl_RC" value="Seven" />
+                </node>
+                <node concept="Xl_RD" id="54jQkZ8UZzG" role="37wK5m">
+                  <property role="Xl_RC" value="Eight" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="54jQkZ8UZzH" role="3cqZAp" />
+          <node concept="3cpWs8" id="54jQkZ8UZzI" role="3cqZAp">
+            <node concept="3cpWsn" id="54jQkZ8UZzJ" role="3cpWs9">
+              <property role="TrG5h" value="actual" />
+              <node concept="3uibUv" id="54jQkZ8UZzK" role="1tU5fm">
+                <ref role="3uigEE" to="urs3:5Ffu4tBU$6H" resolve="IMapSequence" />
+              </node>
+              <node concept="2YIFZM" id="54jQkZ8UZzL" role="33vP2m">
+                <ref role="37wK5l" to="96gm:54jQkZ8QoHD" resolve="apply" />
+                <ref role="1Pybhc" to="96gm:54jQkZ8QoGe" resolve="GroupByOperationUtil" />
+                <node concept="37vLTw" id="54jQkZ8UZzM" role="37wK5m">
+                  <ref role="3cqZAo" node="54jQkZ8UZz_" resolve="elements" />
+                </node>
+                <node concept="37vLTw" id="54jQkZ8VOF0" role="37wK5m">
+                  <ref role="3cqZAo" node="54jQkZ8VJJO" resolve="lengthExtractor" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="54jQkZ8V1WL" role="3cqZAp" />
+          <node concept="3vlDli" id="54jQkZ8V2t6" role="3cqZAp">
+            <node concept="3cmrfG" id="54jQkZ8V2WJ" role="3tpDZB">
+              <property role="3cmrfH" value="2" />
+            </node>
+            <node concept="2OqwBi" id="54jQkZ8V3YC" role="3tpDZA">
+              <node concept="37vLTw" id="54jQkZ8V3pk" role="2Oq$k0">
+                <ref role="3cqZAo" node="54jQkZ8UZzJ" resolve="actual" />
+              </node>
+              <node concept="liA8E" id="54jQkZ8V6D7" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Map.size()" resolve="size" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="54jQkZ8V7yQ" role="3cqZAp" />
+          <node concept="3clFbF" id="54jQkZ8Vf93" role="3cqZAp">
+            <node concept="2OqwBi" id="54jQkZ8Vf94" role="3clFbG">
+              <node concept="37vLTw" id="54jQkZ8Vf95" role="2Oq$k0">
+                <ref role="3cqZAo" node="54jQkZ8UZzJ" resolve="actual" />
+              </node>
+              <node concept="liA8E" id="54jQkZ8Vf96" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Map.forEach(java.util.function.BiConsumer)" resolve="forEach" />
+                <node concept="1rXfSq" id="54jQkZ8WjRt" role="37wK5m">
+                  <ref role="37wK5l" node="54jQkZ8VWA9" resolve="valueCountMatcher" />
+                  <node concept="3cmrfG" id="54jQkZ8Wld6" role="37wK5m">
+                    <property role="3cmrfH" value="2" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="312cEg" id="54jQkZ8VJJO" role="jymVt">
+      <property role="TrG5h" value="lengthExtractor" />
+      <node concept="1ajhzC" id="54jQkZ8VGx8" role="1tU5fm">
+        <node concept="10Oyi0" id="54jQkZ8VJJM" role="1ajl9A" />
+        <node concept="17QB3L" id="54jQkZ8VJJL" role="1ajw0F" />
+      </node>
+      <node concept="1bVj0M" id="54jQkZ8VMi4" role="33vP2m">
+        <node concept="3clFbS" id="54jQkZ8VMi6" role="1bW5cS">
+          <node concept="3clFbF" id="54jQkZ8VMol" role="3cqZAp">
+            <node concept="2OqwBi" id="54jQkZ8VMKW" role="3clFbG">
+              <node concept="37vLTw" id="54jQkZ8VMok" role="2Oq$k0">
+                <ref role="3cqZAo" node="54jQkZ8VMj5" resolve="element" />
+              </node>
+              <node concept="liA8E" id="54jQkZ8VNh9" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="54jQkZ8VMj5" role="1bW2Oz">
+          <property role="TrG5h" value="element" />
+          <node concept="17QB3L" id="54jQkZ8VMj4" role="1tU5fm" />
+        </node>
+      </node>
+    </node>
+    <node concept="3clFb_" id="54jQkZ8VWA9" role="jymVt">
+      <property role="TrG5h" value="valueCountMatcher" />
+      <node concept="3clFbS" id="54jQkZ8VWAc" role="3clF47">
+        <node concept="3clFbF" id="54jQkZ8W5Rs" role="3cqZAp">
+          <node concept="2ShNRf" id="54jQkZ8Wacy" role="3clFbG">
+            <node concept="YeOm9" id="54jQkZ8Wacz" role="2ShVmc">
+              <node concept="1Y3b0j" id="54jQkZ8Wac$" role="YeSDq">
+                <property role="2bfB8j" value="true" />
+                <property role="373rjd" value="true" />
+                <ref role="1Y3XeK" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                <node concept="3Tm1VV" id="54jQkZ8Wac_" role="1B3o_S" />
+                <node concept="3clFb_" id="54jQkZ8WacA" role="jymVt">
+                  <property role="TrG5h" value="accept" />
+                  <node concept="3Tm1VV" id="54jQkZ8WacB" role="1B3o_S" />
+                  <node concept="3cqZAl" id="54jQkZ8WacC" role="3clF45" />
+                  <node concept="37vLTG" id="54jQkZ8WacD" role="3clF46">
+                    <property role="TrG5h" value="p1" />
+                    <node concept="3uibUv" id="54jQkZ8WacE" role="1tU5fm">
+                      <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+                    </node>
+                  </node>
+                  <node concept="37vLTG" id="54jQkZ8WacF" role="3clF46">
+                    <property role="TrG5h" value="p2" />
+                    <node concept="3uibUv" id="54jQkZ8WacG" role="1tU5fm">
+                      <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
+                      <node concept="17QB3L" id="54jQkZ8WacH" role="11_B2D" />
+                    </node>
+                  </node>
+                  <node concept="3clFbS" id="54jQkZ8WacI" role="3clF47">
+                    <node concept="3vlDli" id="54jQkZ8WacJ" role="3cqZAp">
+                      <node concept="37vLTw" id="54jQkZ8Wdsy" role="3tpDZB">
+                        <ref role="3cqZAo" node="54jQkZ8VZ7k" resolve="count" />
+                      </node>
+                      <node concept="2OqwBi" id="54jQkZ8WacL" role="3tpDZA">
+                        <node concept="37vLTw" id="54jQkZ8WacM" role="2Oq$k0">
+                          <ref role="3cqZAo" node="54jQkZ8WacF" resolve="p2" />
+                        </node>
+                        <node concept="liA8E" id="54jQkZ8WacN" role="2OqNvi">
+                          <ref role="37wK5l" to="urs3:5Ffu4tBUx9j" resolve="count" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2AHcQZ" id="54jQkZ8WacO" role="2AJF6D">
+                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                  </node>
+                </node>
+                <node concept="3uibUv" id="54jQkZ8WacP" role="2Ghqu4">
+                  <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+                </node>
+                <node concept="3uibUv" id="54jQkZ8WacQ" role="2Ghqu4">
+                  <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
+                  <node concept="17QB3L" id="54jQkZ8WacR" role="11_B2D" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="54jQkZ8VSlM" role="3clF45">
+        <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+        <node concept="3uibUv" id="54jQkZ8VUQm" role="11_B2D">
+          <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+        </node>
+        <node concept="3uibUv" id="54jQkZ8VVqA" role="11_B2D">
+          <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
+          <node concept="17QB3L" id="54jQkZ8VWA4" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="54jQkZ8VZ7k" role="3clF46">
+        <property role="TrG5h" value="count" />
+        <property role="3TUv4t" value="true" />
+        <node concept="10Oyi0" id="54jQkZ8VZ7j" role="1tU5fm" />
+      </node>
+    </node>
+  </node>
+</model>
+

From 029378d7f710aa26e60888c6fbaf048c678e5d28 Mon Sep 17 00:00:00 2001
From: Dennis Albrecht <dalbrecht@itemis.com>
Date: Wed, 24 Sep 2025 18:31:57 +0200
Subject: [PATCH 08/18] added the GroupByOperation as base language operation

---
 ...mis.mps.baseLanguageExtensions.sandbox.mps | 220 ++++++++++++++
 .../de.itemis.mps.baseLanguageExtensions.mpl  |   2 +
 ...tensions.generator.templates@generator.mps | 272 +++++++++++++++++-
 ...mis.mps.baseLanguageExtensions.actions.mps | 261 +++++++++++++++++
 ...s.mps.baseLanguageExtensions.structure.mps |   8 +
 ....mps.baseLanguageExtensions.typesystem.mps |  88 ++++++
 ...Extensions.test.groupByOperation@tests.mps |   4 +-
 7 files changed, 852 insertions(+), 3 deletions(-)
 create mode 100644 code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps

diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
index cf0da2dd45..23c9854c39 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
@@ -42,6 +42,7 @@
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
+      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
         <child id="1070534934091" name="type" index="10QFUM" />
         <child id="1070534934092" name="expression" index="10QFUP" />
@@ -54,7 +55,12 @@
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="1225271484915" name="jetbrains.mps.baseLanguage.structure.SubstringExpression" flags="nn" index="17RM3I">
+        <child id="1225271484916" name="operand" index="17RM3D" />
+        <child id="1225271484918" name="endIndex" index="17RM3F" />
+      </concept>
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -69,6 +75,9 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
@@ -81,6 +90,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
+      <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -120,6 +130,7 @@
       <concept id="571742531387697460" name="de.itemis.mps.baseLanguageExtensions.structure.IntegerRangeConstantBound" flags="ng" index="2hHTnT">
         <property id="7488777117046563852" name="value" index="KjLWg" />
       </concept>
+      <concept id="5842252078326680676" name="de.itemis.mps.baseLanguageExtensions.structure.GroupByOperation" flags="ng" index="2pSdkF" />
       <concept id="7488777117048605758" name="de.itemis.mps.baseLanguageExtensions.structure.ZipOperation" flags="ng" index="Kbfsy" />
       <concept id="578371460444482140" name="de.itemis.mps.baseLanguageExtensions.structure.ElvisOperation" flags="ng" index="1w0Eer" />
     </language>
@@ -155,11 +166,21 @@
       </concept>
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
+      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
+      <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
+        <child id="1197683466920" name="keyType" index="3rvQeY" />
+        <child id="1197683475734" name="valueType" index="3rvSg0" />
+      </concept>
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1240687580870" name="jetbrains.mps.baseLanguage.collections.structure.JoinOperation" flags="nn" index="3uJxvA">
         <child id="1240687658305" name="delimiter" index="3uJOhx" />
       </concept>
+      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
+      <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
+        <child id="1197932505799" name="map" index="3ElQJh" />
+        <child id="1197932525128" name="key" index="3ElVtu" />
+      </concept>
     </language>
   </registry>
   <node concept="312cEu" id="w6MstC1zab">
@@ -945,5 +966,204 @@
     </node>
     <node concept="3Tm1VV" id="6vHuLLnKQWd" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="54jQkZ8XvIU">
+    <property role="TrG5h" value="GroupByOperationSandbox" />
+    <node concept="2YIFZL" id="54jQkZ8Xzz5" role="jymVt">
+      <property role="TrG5h" value="usage" />
+      <node concept="3clFbS" id="54jQkZ8Xzz8" role="3clF47">
+        <node concept="3cpWs8" id="54jQkZ8Xz$_" role="3cqZAp">
+          <node concept="3cpWsn" id="54jQkZ8Xz$C" role="3cpWs9">
+            <property role="TrG5h" value="numbers" />
+            <node concept="A3Dl8" id="54jQkZ8Xz$z" role="1tU5fm">
+              <node concept="17QB3L" id="54jQkZ8Xz_a" role="A3Ik2" />
+            </node>
+            <node concept="2ShNRf" id="54jQkZ8XzBC" role="33vP2m">
+              <node concept="Tc6Ow" id="54jQkZ8X$7c" role="2ShVmc">
+                <node concept="17QB3L" id="54jQkZ8X$QM" role="HW$YZ" />
+                <node concept="Xl_RD" id="54jQkZ8X_n3" role="HW$Y0">
+                  <property role="Xl_RC" value="One" />
+                </node>
+                <node concept="Xl_RD" id="54jQkZ8X_rj" role="HW$Y0">
+                  <property role="Xl_RC" value="Two" />
+                </node>
+                <node concept="Xl_RD" id="54jQkZ8X_uJ" role="HW$Y0">
+                  <property role="Xl_RC" value="Three" />
+                </node>
+                <node concept="Xl_RD" id="54jQkZ8X_xf" role="HW$Y0">
+                  <property role="Xl_RC" value="Four" />
+                </node>
+                <node concept="Xl_RD" id="54jQkZ8X__9" role="HW$Y0">
+                  <property role="Xl_RC" value="Five" />
+                </node>
+                <node concept="Xl_RD" id="54jQkZ8X_AC" role="HW$Y0">
+                  <property role="Xl_RC" value="Six" />
+                </node>
+                <node concept="Xl_RD" id="54jQkZ8X_DA" role="HW$Y0">
+                  <property role="Xl_RC" value="Seven" />
+                </node>
+                <node concept="Xl_RD" id="54jQkZ8X_GI" role="HW$Y0">
+                  <property role="Xl_RC" value="Eight" />
+                </node>
+                <node concept="Xl_RD" id="54jQkZ8X_Na" role="HW$Y0">
+                  <property role="Xl_RC" value="Nine" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="54jQkZ973p6" role="3cqZAp">
+          <node concept="3cpWsn" id="54jQkZ973p7" role="3cpWs9">
+            <property role="TrG5h" value="byLength" />
+            <node concept="3rvAFt" id="54jQkZ973od" role="1tU5fm">
+              <node concept="10Oyi0" id="54jQkZ973om" role="3rvQeY" />
+              <node concept="A3Dl8" id="54jQkZ973on" role="3rvSg0">
+                <node concept="17QB3L" id="54jQkZ973oo" role="A3Ik2" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="54jQkZ973p8" role="33vP2m">
+              <node concept="37vLTw" id="54jQkZ973p9" role="2Oq$k0">
+                <ref role="3cqZAo" node="54jQkZ8Xz$C" resolve="numbers" />
+              </node>
+              <node concept="2pSdkF" id="54jQkZ973pa" role="2OqNvi">
+                <node concept="1bVj0M" id="54jQkZ973pb" role="23t8la">
+                  <node concept="37vLTG" id="54jQkZ973pc" role="1bW2Oz">
+                    <property role="TrG5h" value="elem" />
+                    <node concept="17QB3L" id="54jQkZ973pd" role="1tU5fm" />
+                  </node>
+                  <node concept="3clFbS" id="54jQkZ973pe" role="1bW5cS">
+                    <node concept="3clFbF" id="54jQkZ973pf" role="3cqZAp">
+                      <node concept="2OqwBi" id="54jQkZ9741U" role="3clFbG">
+                        <node concept="37vLTw" id="54jQkZ973Cq" role="2Oq$k0">
+                          <ref role="3cqZAo" node="54jQkZ973pc" resolve="elem" />
+                        </node>
+                        <node concept="liA8E" id="54jQkZ974dr" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="54jQkZ974jD" role="3cqZAp">
+          <node concept="2OqwBi" id="54jQkZ974AB" role="3clFbG">
+            <node concept="10M0yZ" id="54jQkZ974kU" role="2Oq$k0">
+              <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
+              <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+            </node>
+            <node concept="liA8E" id="54jQkZ974QD" role="2OqNvi">
+              <ref role="37wK5l" to="guwi:~PrintStream.println(int)" resolve="println" />
+              <node concept="2OqwBi" id="54jQkZ975LA" role="37wK5m">
+                <node concept="37vLTw" id="54jQkZ9756j" role="2Oq$k0">
+                  <ref role="3cqZAo" node="54jQkZ973p7" resolve="byLength" />
+                </node>
+                <node concept="34oBXx" id="54jQkZ976k4" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="54jQkZ9dI_W" role="3cqZAp">
+          <node concept="3cpWsn" id="54jQkZ9dI_X" role="3cpWs9">
+            <property role="TrG5h" value="isVowel" />
+            <node concept="3rvAFt" id="54jQkZ9dHNo" role="1tU5fm">
+              <node concept="10P_77" id="54jQkZ9dHNx" role="3rvQeY" />
+              <node concept="A3Dl8" id="54jQkZ9dHNy" role="3rvSg0">
+                <node concept="17QB3L" id="54jQkZ9dHNz" role="A3Ik2" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="54jQkZ9dI_Y" role="33vP2m">
+              <node concept="37vLTw" id="54jQkZ9dI_Z" role="2Oq$k0">
+                <ref role="3cqZAo" node="54jQkZ8Xz$C" resolve="numbers" />
+              </node>
+              <node concept="2pSdkF" id="54jQkZ9dIA0" role="2OqNvi">
+                <node concept="1bVj0M" id="54jQkZ9dIA1" role="23t8la">
+                  <node concept="3clFbS" id="54jQkZ9dIA2" role="1bW5cS">
+                    <node concept="3clFbF" id="54jQkZ9dIA3" role="3cqZAp">
+                      <node concept="2OqwBi" id="54jQkZ9dIA4" role="3clFbG">
+                        <node concept="17RM3I" id="54jQkZ9dIA5" role="2Oq$k0">
+                          <node concept="37vLTw" id="54jQkZ9dIA6" role="17RM3D">
+                            <ref role="3cqZAo" node="54jQkZ9dIAa" resolve="it" />
+                          </node>
+                          <node concept="3cmrfG" id="54jQkZ9dIA7" role="17RM3F">
+                            <property role="3cmrfH" value="1" />
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="54jQkZ9dIA8" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String)" resolve="matches" />
+                          <node concept="Xl_RD" id="54jQkZ9dIA9" role="37wK5m">
+                            <property role="Xl_RC" value="[AEIOU]" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="54jQkZ9dIAa" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="54jQkZ9dIAb" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="54jQkZ9dJzw" role="3cqZAp">
+          <node concept="2OqwBi" id="54jQkZ9dJUt" role="3clFbG">
+            <node concept="10M0yZ" id="54jQkZ9dJBA" role="2Oq$k0">
+              <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
+              <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+            </node>
+            <node concept="liA8E" id="54jQkZ9dKg6" role="2OqNvi">
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.Object)" resolve="println" />
+              <node concept="3EllGN" id="54jQkZ9dM$f" role="37wK5m">
+                <node concept="3clFbT" id="54jQkZ9dMKs" role="3ElVtu">
+                  <property role="3clFbU" value="true" />
+                </node>
+                <node concept="37vLTw" id="54jQkZ9dKr8" role="3ElQJh">
+                  <ref role="3cqZAo" node="54jQkZ9dI_X" resolve="isVowel" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="54jQkZ9flBs" role="3cqZAp">
+          <node concept="2OqwBi" id="54jQkZ9flM6" role="3clFbG">
+            <node concept="37vLTw" id="54jQkZ9flBq" role="2Oq$k0">
+              <ref role="3cqZAo" node="54jQkZ8Xz$C" resolve="numbers" />
+            </node>
+            <node concept="3zZkjj" id="54jQkZ9fm9E" role="2OqNvi">
+              <node concept="1bVj0M" id="54jQkZ9fm9G" role="23t8la">
+                <node concept="3clFbS" id="54jQkZ9fm9H" role="1bW5cS">
+                  <node concept="3clFbF" id="54jQkZ9fmjz" role="3cqZAp">
+                    <node concept="3eOVzh" id="54jQkZ9foYp" role="3clFbG">
+                      <node concept="3cmrfG" id="54jQkZ9foY$" role="3uHU7w">
+                        <property role="3cmrfH" value="5" />
+                      </node>
+                      <node concept="2OqwBi" id="54jQkZ9fmJT" role="3uHU7B">
+                        <node concept="37vLTw" id="54jQkZ9fmjy" role="2Oq$k0">
+                          <ref role="3cqZAo" node="54jQkZ9fm9I" resolve="it" />
+                        </node>
+                        <node concept="liA8E" id="54jQkZ9fnbj" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="54jQkZ9fm9I" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="54jQkZ9fm9J" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="54jQkZ8XzyI" role="1B3o_S" />
+      <node concept="3cqZAl" id="54jQkZ8XzyV" role="3clF45" />
+    </node>
+    <node concept="3Tm1VV" id="54jQkZ8XvIV" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl b/code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl
index d4201a47a3..934f4b7688 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/de.itemis.mps.baseLanguageExtensions.mpl
@@ -26,6 +26,7 @@
       <external-templates />
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
+        <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -41,6 +42,7 @@
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+        <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
       </languageVersions>
       <dependencyVersions>
         <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
index 14e3ad255d..8014426de8 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:e9626ecf-a0aa-465d-b5a3-3e84bb263ef5(de.itemis.mps.baseLanguageExtensions.generator.templates@generator)">
   <persistence version="9" />
+  <attribute name="doNotGenerate" value="false" />
   <languages>
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="4" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
   </languages>
   <imports>
     <import index="pkab" ref="r:63a6d225-96f6-404a-a9eb-033dc2f950a1(de.itemis.mps.baseLanguageExtensions.structure)" />
     <import index="96gm" ref="r:2eaed950-3bc1-47cd-9b02-e917ff994d7c(de.itemis.mps.baseLanguageExtensions.runtime)" />
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="tp2g" ref="r:00000000-0000-4000-0000-011c89590334(jetbrains.mps.baseLanguage.closures.constraints)" />
     <import index="tp2q" ref="r:00000000-0000-4000-0000-011c8959032e(jetbrains.mps.baseLanguage.collections.structure)" implicit="true" />
+    <import index="tp2c" ref="r:00000000-0000-4000-0000-011c89590338(jetbrains.mps.baseLanguage.closures.structure)" implicit="true" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -24,6 +29,11 @@
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
@@ -37,20 +47,40 @@
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
       <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="ln" index="29HgVG">
         <child id="1168024447342" name="sourceNodeQuery" index="3NFExx" />
       </concept>
+      <concept id="1114729360583" name="jetbrains.mps.lang.generator.structure.CopySrcListMacro" flags="ln" index="2b32R4">
+        <child id="1168278589236" name="sourceNodesQuery" index="2P8S$" />
+      </concept>
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
         <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
       </concept>
       <concept id="1177093525992" name="jetbrains.mps.lang.generator.structure.InlineTemplate_RuleConsequence" flags="lg" index="gft3U">
         <child id="1177093586806" name="templateNode" index="gfFT$" />
       </concept>
+      <concept id="1112730859144" name="jetbrains.mps.lang.generator.structure.TemplateSwitch" flags="ig" index="jVnub">
+        <child id="1168558750579" name="defaultConsequence" index="jxRDz" />
+        <child id="1167340453568" name="reductionMappingRule" index="3aUrZf" />
+      </concept>
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+        <reference id="1722980698497626483" name="template" index="v9R2y" />
+        <child id="1722980698497626405" name="actualArgument" index="v9R3O" />
+      </concept>
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
       <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
       <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
+        <property id="1167272244852" name="applyToConceptInheritors" index="36QftV" />
         <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
         <child id="1167169362365" name="conditionFunction" index="30HLyM" />
       </concept>
@@ -60,8 +90,18 @@
       <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
         <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
       </concept>
+      <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ng" index="1s_3nv">
+        <child id="982871510064032342" name="parameter" index="1s_3oS" />
+      </concept>
+      <concept id="982871510068000147" name="jetbrains.mps.lang.generator.structure.TemplateSwitchMacro" flags="lg" index="1sPUBX">
+        <child id="982871510068000158" name="sourceNodeQuery" index="1sPUBK" />
+      </concept>
       <concept id="1167756080639" name="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue" flags="in" index="3zFVjK" />
       <concept id="1167945743726" name="jetbrains.mps.lang.generator.structure.IfMacro_Condition" flags="in" index="3IZrLx" />
+      <concept id="1167951910403" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodesQuery" flags="in" index="3JmXsc" />
+      <concept id="1805153994415891174" name="jetbrains.mps.lang.generator.structure.TemplateParameterDeclaration" flags="ng" index="1N15co">
+        <child id="1805153994415893199" name="type" index="1N15GL" />
+      </concept>
       <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
       <concept id="1118773211870" name="jetbrains.mps.lang.generator.structure.IfMacro" flags="ln" index="1W57fq">
         <child id="1194989344771" name="alternativeConsequence" index="UU_$l" />
@@ -70,9 +110,13 @@
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
+      <concept id="1176544042499" name="jetbrains.mps.lang.typesystem.structure.Node_TypeOperation" flags="nn" index="3JvlWi" />
+    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
@@ -88,12 +132,18 @@
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
         <property id="1238684351431" name="asCast" index="1BlNFB" />
       </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
       <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
         <reference id="1138056395725" name="property" index="3TsBF5" />
       </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
+      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
+        <reference id="1138056546658" name="link" index="3TtcxE" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -107,6 +157,14 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
+      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+      <concept id="1225711141656" name="jetbrains.mps.baseLanguage.collections.structure.ListElementAccessExpression" flags="nn" index="1y4W85">
+        <child id="1225711182005" name="list" index="1y566C" />
+        <child id="1225711191269" name="index" index="1y58nS" />
+      </concept>
+    </language>
   </registry>
   <node concept="bUwia" id="7EVAkaCx$5S">
     <property role="TrG5h" value="main" />
@@ -357,6 +415,218 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="54jQkZ97WKE" role="3acgRq">
+      <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
+      <node concept="gft3U" id="54jQkZ986e1" role="1lVwrX">
+        <node concept="2YIFZM" id="54jQkZ986eg" role="gfFT$">
+          <ref role="37wK5l" to="96gm:54jQkZ8QoHD" resolve="apply" />
+          <ref role="1Pybhc" to="96gm:54jQkZ8QoGe" resolve="GroupByOperationUtil" />
+          <node concept="10Nm6u" id="54jQkZ9fwtV" role="37wK5m">
+            <node concept="29HgVG" id="54jQkZ9fwz6" role="lGtFl">
+              <node concept="3NFfHV" id="54jQkZ9fwz7" role="3NFExx">
+                <node concept="3clFbS" id="54jQkZ9fwz8" role="2VODD2">
+                  <node concept="3clFbF" id="54jQkZ9fwze" role="3cqZAp">
+                    <node concept="2OqwBi" id="54jQkZ9fwz9" role="3clFbG">
+                      <node concept="3TrEf2" id="54jQkZ9fwzc" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                      </node>
+                      <node concept="30H73N" id="54jQkZ9fwzd" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="10Nm6u" id="54jQkZ9fKdF" role="37wK5m">
+            <node concept="1sPUBX" id="54jQkZ9fKkf" role="lGtFl">
+              <ref role="v9R2y" node="54jQkZ9fKWX" resolve="GroupByOperation" />
+              <node concept="2OqwBi" id="54jQkZ9fMYQ" role="v9R3O">
+                <node concept="1PxgMI" id="54jQkZ9fMFx" role="2Oq$k0">
+                  <node concept="chp4Y" id="54jQkZ9fMJ0" role="3oSUPX">
+                    <ref role="cht4Q" to="pkab:54jQkZ8WKL$" resolve="GroupByOperation" />
+                  </node>
+                  <node concept="2OqwBi" id="54jQkZ9fLlS" role="1m5AlR">
+                    <node concept="30H73N" id="54jQkZ9fL5F" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="54jQkZ9fLY9" role="2OqNvi">
+                      <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3TrEf2" id="54jQkZ9fNFp" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                </node>
+              </node>
+              <node concept="3NFfHV" id="54jQkZ9ghak" role="1sPUBK">
+                <node concept="3clFbS" id="54jQkZ9ghal" role="2VODD2">
+                  <node concept="3clFbF" id="54jQkZ9ghe5" role="3cqZAp">
+                    <node concept="2OqwBi" id="54jQkZ9gi8_" role="3clFbG">
+                      <node concept="1PxgMI" id="54jQkZ9ghTt" role="2Oq$k0">
+                        <node concept="chp4Y" id="54jQkZ9ghUr" role="3oSUPX">
+                          <ref role="cht4Q" to="pkab:54jQkZ8WKL$" resolve="GroupByOperation" />
+                        </node>
+                        <node concept="2OqwBi" id="54jQkZ9ghtg" role="1m5AlR">
+                          <node concept="30H73N" id="54jQkZ9ghe4" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="54jQkZ9ghIq" role="2OqNvi">
+                            <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3TrEf2" id="54jQkZ9giOQ" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="54jQkZ988j5" role="30HLyM">
+        <node concept="3clFbS" id="54jQkZ988j6" role="2VODD2">
+          <node concept="3clFbF" id="54jQkZ988qz" role="3cqZAp">
+            <node concept="2OqwBi" id="54jQkZ989_2" role="3clFbG">
+              <node concept="2OqwBi" id="54jQkZ988Ia" role="2Oq$k0">
+                <node concept="30H73N" id="54jQkZ988qy" role="2Oq$k0" />
+                <node concept="3TrEf2" id="54jQkZ988Ze" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                </node>
+              </node>
+              <node concept="1mIQ4w" id="54jQkZ989UC" role="2OqNvi">
+                <node concept="chp4Y" id="54jQkZ989Xr" role="cj9EA">
+                  <ref role="cht4Q" to="pkab:54jQkZ8WKL$" resolve="GroupByOperation" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="jVnub" id="54jQkZ9fKWX">
+    <property role="TrG5h" value="GroupByOperation" />
+    <node concept="1N15co" id="54jQkZ9fKWY" role="1s_3oS">
+      <property role="TrG5h" value="operation" />
+      <node concept="3Tqbb2" id="54jQkZ9fKXa" role="1N15GL">
+        <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="54jQkZ9fNRG" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+      <node concept="gft3U" id="54jQkZ9g988" role="1lVwrX">
+        <node concept="1bVj0M" id="54jQkZ9grof" role="gfFT$">
+          <node concept="37vLTG" id="54jQkZ9groL" role="1bW2Oz">
+            <property role="TrG5h" value="it" />
+            <node concept="3uibUv" id="54jQkZ9grpo" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+              <node concept="29HgVG" id="54jQkZ9grrh" role="lGtFl">
+                <node concept="3NFfHV" id="54jQkZ9gAC7" role="3NFExx">
+                  <node concept="3clFbS" id="54jQkZ9gAC8" role="2VODD2">
+                    <node concept="3clFbF" id="54jQkZ9gAR4" role="3cqZAp">
+                      <node concept="2YIFZM" id="54jQkZ9gBYT" role="3clFbG">
+                        <ref role="37wK5l" to="tp2g:hwak6Ex" resolve="copyTypeRecursively" />
+                        <ref role="1Pybhc" to="tp2g:hv18zCR" resolve="ClassifierTypeUtil" />
+                        <node concept="2YIFZM" id="54jQkZ9gDaE" role="37wK5m">
+                          <ref role="37wK5l" to="tp2g:hv18AMC" resolve="getTypeCoercedToClassifierType" />
+                          <ref role="1Pybhc" to="tp2g:hv18zCR" resolve="ClassifierTypeUtil" />
+                          <node concept="2OqwBi" id="54jQkZ9hwee" role="37wK5m">
+                            <node concept="2OqwBi" id="54jQkZ9hkJ3" role="2Oq$k0">
+                              <node concept="1PxgMI" id="54jQkZ9h4c$" role="2Oq$k0">
+                                <node concept="chp4Y" id="54jQkZ9h4zP" role="3oSUPX">
+                                  <ref role="cht4Q" to="tp2c:U7sbC7HC1h" resolve="ClosureLiteralType" />
+                                </node>
+                                <node concept="2OqwBi" id="3612de$tQry" role="1m5AlR">
+                                  <node concept="30H73N" id="3612de$tQrz" role="2Oq$k0" />
+                                  <node concept="3JvlWi" id="3612de$tQr$" role="2OqNvi" />
+                                </node>
+                              </node>
+                              <node concept="3Tsc0h" id="54jQkZ9hlm3" role="2OqNvi">
+                                <ref role="3TtcxE" to="tp2c:htajw4W" resolve="parameterType" />
+                              </node>
+                            </node>
+                            <node concept="1uHKPH" id="54jQkZ9hDFi" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbS" id="54jQkZ9grog" role="1bW5cS">
+            <node concept="3clFbF" id="54jQkZ9grrZ" role="3cqZAp">
+              <node concept="10Nm6u" id="54jQkZ9grrY" role="3clFbG" />
+              <node concept="2b32R4" id="54jQkZ9grtV" role="lGtFl">
+                <node concept="3JmXsc" id="54jQkZ9grtW" role="2P8S$">
+                  <node concept="3clFbS" id="54jQkZ9grtX" role="2VODD2">
+                    <node concept="3clFbF" id="54jQkZ9grxP" role="3cqZAp">
+                      <node concept="2OqwBi" id="54jQkZ9gsEo" role="3clFbG">
+                        <node concept="2OqwBi" id="54jQkZ9grTO" role="2Oq$k0">
+                          <node concept="30H73N" id="54jQkZ9grxO" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="54jQkZ9gsl3" role="2OqNvi">
+                            <ref role="3Tt5mk" to="tp2c:htbW58J" resolve="body" />
+                          </node>
+                        </node>
+                        <node concept="3Tsc0h" id="54jQkZ9gtBb" role="2OqNvi">
+                          <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="54jQkZ9fNVy" role="30HLyM">
+        <node concept="3clFbS" id="54jQkZ9fNVz" role="2VODD2">
+          <node concept="3clFbF" id="54jQkZ9fO0o" role="3cqZAp">
+            <node concept="1Wc70l" id="54jQkZ9g42P" role="3clFbG">
+              <node concept="2OqwBi" id="54jQkZ9g5Rp" role="3uHU7w">
+                <node concept="1y4W85" id="54jQkZ9g5qE" role="2Oq$k0">
+                  <node concept="3cmrfG" id="54jQkZ9g5xw" role="1y58nS">
+                    <property role="3cmrfH" value="0" />
+                  </node>
+                  <node concept="2OqwBi" id="54jQkZ9g4oe" role="1y566C">
+                    <node concept="30H73N" id="54jQkZ9g45j" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="54jQkZ9g4vf" role="2OqNvi">
+                      <ref role="3TtcxE" to="tp2c:htbW2KO" resolve="parameter" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="1mIQ4w" id="54jQkZ9g6EK" role="2OqNvi">
+                  <node concept="chp4Y" id="54jQkZ9g8gt" role="cj9EA">
+                    <ref role="cht4Q" to="tp2q:hwRh6j$" resolve="SmartClosureParameterDeclaration" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbC" id="54jQkZ9g3lT" role="3uHU7B">
+                <node concept="2OqwBi" id="54jQkZ9fVmo" role="3uHU7B">
+                  <node concept="2OqwBi" id="54jQkZ9fOpL" role="2Oq$k0">
+                    <node concept="30H73N" id="54jQkZ9fO0n" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="54jQkZ9fOMq" role="2OqNvi">
+                      <ref role="3TtcxE" to="tp2c:htbW2KO" resolve="parameter" />
+                    </node>
+                  </node>
+                  <node concept="34oBXx" id="54jQkZ9g1zZ" role="2OqNvi" />
+                </node>
+                <node concept="3cmrfG" id="54jQkZ9g3R_" role="3uHU7w">
+                  <property role="3cmrfH" value="1" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="gft3U" id="54jQkZ9g94P" role="jxRDz">
+      <node concept="10Nm6u" id="54jQkZ9g97V" role="gfFT$">
+        <node concept="29HgVG" id="54jQkZ9g984" role="lGtFl" />
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps
new file mode 100644
index 0000000000..2d01ee8181
--- /dev/null
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:f2a647e2-c8f4-470a-b1f2-04d25cd1ccaf(de.itemis.mps.baseLanguageExtensions.actions)">
+  <persistence version="9" />
+  <languages>
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports>
+    <import index="pkab" ref="r:63a6d225-96f6-404a-a9eb-033dc2f950a1(de.itemis.mps.baseLanguageExtensions.structure)" implicit="true" />
+    <import index="tp2q" ref="r:00000000-0000-4000-0000-011c8959032e(jetbrains.mps.baseLanguage.collections.structure)" implicit="true" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
+    <import index="tp2c" ref="r:00000000-0000-4000-0000-011c89590338(jetbrains.mps.baseLanguage.closures.structure)" implicit="true" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
+        <child id="1082485599096" name="statements" index="9aQI4" />
+      </concept>
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+    </language>
+    <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
+      <concept id="767145758118872833" name="jetbrains.mps.lang.actions.structure.NF_LinkList_AddNewChildOperation" flags="nn" index="2DeJg1" />
+      <concept id="767145758118872830" name="jetbrains.mps.lang.actions.structure.NF_Link_SetNewChildOperation" flags="nn" index="2DeJnY" />
+      <concept id="1158700664498" name="jetbrains.mps.lang.actions.structure.NodeFactories" flags="ng" index="37WguZ">
+        <child id="1158700779049" name="nodeFactory" index="37WGs$" />
+      </concept>
+      <concept id="1158700725281" name="jetbrains.mps.lang.actions.structure.NodeFactory" flags="ig" index="37WvkG">
+        <reference id="1158700943156" name="applicableConcept" index="37XkoT" />
+        <child id="1158701448518" name="setupFunction" index="37ZfLb" />
+      </concept>
+      <concept id="1158701162220" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction" flags="in" index="37Y9Zx" />
+      <concept id="5584396657084912703" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction_NewNode" flags="nn" index="1r4Lsj" />
+      <concept id="5584396657084920413" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction_SampleNode" flags="nn" index="1r4N5L" />
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
+        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
+      </concept>
+      <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
+        <child id="1140725362529" name="linkTarget" index="2oxUTC" />
+      </concept>
+      <concept id="1138661924179" name="jetbrains.mps.lang.smodel.structure.Property_SetOperation" flags="nn" index="tyxLq">
+        <child id="1138662048170" name="value" index="tz02z" />
+      </concept>
+      <concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC">
+        <reference id="1139880128956" name="concept" index="1A9B2P" />
+      </concept>
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
+      </concept>
+      <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt">
+        <reference id="1139877738879" name="concept" index="1A0vxQ" />
+      </concept>
+      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
+        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
+      </concept>
+      <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
+      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
+        <reference id="1138056395725" name="property" index="3TsBF5" />
+      </concept>
+      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
+        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      </concept>
+      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
+        <reference id="1138056546658" name="link" index="3TtcxE" />
+      </concept>
+      <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="37WguZ" id="54jQkZ97q5g">
+    <property role="TrG5h" value="groupBy_operation" />
+    <property role="3GE5qa" value="groupByOperation" />
+    <node concept="37WvkG" id="54jQkZ97q5h" role="37WGs$">
+      <ref role="37XkoT" to="pkab:54jQkZ8WKL$" resolve="GroupByOperation" />
+      <node concept="37Y9Zx" id="54jQkZ97q5i" role="37ZfLb">
+        <node concept="3clFbS" id="54jQkZ97q5j" role="2VODD2">
+          <node concept="3clFbJ" id="6UAZX9kbG2k" role="3cqZAp">
+            <node concept="3clFbS" id="6UAZX9kbG2l" role="3clFbx">
+              <node concept="3clFbF" id="6UAZX9kbGjQ" role="3cqZAp">
+                <node concept="2OqwBi" id="6UAZX9kbOgC" role="3clFbG">
+                  <node concept="2OqwBi" id="6UAZX9kbGjS" role="2Oq$k0">
+                    <node concept="1r4Lsj" id="6UAZX9kbGjR" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="6UAZX9kbOgB" role="2OqNvi">
+                      <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                    </node>
+                  </node>
+                  <node concept="2oxUTD" id="6UAZX9kbOgG" role="2OqNvi">
+                    <node concept="2OqwBi" id="6UAZX9kbOh2" role="2oxUTC">
+                      <node concept="2OqwBi" id="6UAZX9kbOgV" role="2Oq$k0">
+                        <node concept="1PxgMI" id="6UAZX9kbOgR" role="2Oq$k0">
+                          <node concept="1r4N5L" id="6UAZX9kbOgJ" role="1m5AlR" />
+                          <node concept="chp4Y" id="714IaVdGYEc" role="3oSUPX">
+                            <ref role="cht4Q" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
+                          </node>
+                        </node>
+                        <node concept="3TrEf2" id="6UAZX9kbOh0" role="2OqNvi">
+                          <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                        </node>
+                      </node>
+                      <node concept="3YRAZt" id="6UAZX9kbOh7" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="6UAZX9kbG2p" role="3clFbw">
+              <node concept="1r4N5L" id="6UAZX9kbG2o" role="2Oq$k0" />
+              <node concept="1mIQ4w" id="6UAZX9kbGjJ" role="2OqNvi">
+                <node concept="chp4Y" id="6UAZX9kbGjL" role="cj9EA">
+                  <ref role="cht4Q" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
+                </node>
+              </node>
+            </node>
+            <node concept="9aQIb" id="6UAZX9kbGjM" role="9aQIa">
+              <node concept="3clFbS" id="6UAZX9kbGjN" role="9aQI4">
+                <node concept="3cpWs8" id="hOYLEwW" role="3cqZAp">
+                  <node concept="3cpWsn" id="hOYLEwX" role="3cpWs9">
+                    <property role="TrG5h" value="sel" />
+                    <node concept="3Tqbb2" id="hOYLEwY" role="1tU5fm">
+                      <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
+                    </node>
+                    <node concept="2OqwBi" id="hOYLEwZ" role="33vP2m">
+                      <node concept="1r4Lsj" id="hOYLEx0" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="hOYLEx1" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="hOYLF7B" role="3cqZAp">
+                  <node concept="3clFbS" id="hOYLF7C" role="3clFbx">
+                    <node concept="3clFbF" id="hOYLGs8" role="3cqZAp">
+                      <node concept="37vLTI" id="hOYLGMl" role="3clFbG">
+                        <node concept="2OqwBi" id="hOYLJR3" role="37vLTx">
+                          <node concept="2OqwBi" id="hOYLIy4" role="2Oq$k0">
+                            <node concept="1r4Lsj" id="hOYLIgR" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="hOYLJIO" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                            </node>
+                          </node>
+                          <node concept="2DeJnY" id="5wUAOoBBjpf" role="2OqNvi">
+                            <ref role="1A9B2P" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="3GM_nagTxRn" role="37vLTJ">
+                          <ref role="3cqZAo" node="hOYLEwX" resolve="sel" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="hOYLFmB" role="3clFbw">
+                    <node concept="37vLTw" id="3GM_nagTvxd" role="2Oq$k0">
+                      <ref role="3cqZAo" node="hOYLEwX" resolve="sel" />
+                    </node>
+                    <node concept="3w_OXm" id="hOYLFQD" role="2OqNvi" />
+                  </node>
+                </node>
+                <node concept="3cpWs8" id="hOYM1wv" role="3cqZAp">
+                  <node concept="3cpWsn" id="hOYM1ww" role="3cpWs9">
+                    <property role="TrG5h" value="pd" />
+                    <node concept="3Tqbb2" id="hOYM1wx" role="1tU5fm">
+                      <ref role="ehGHo" to="tp2q:hwRh6j$" resolve="SmartClosureParameterDeclaration" />
+                    </node>
+                    <node concept="2OqwBi" id="hOYM1wy" role="33vP2m">
+                      <node concept="2OqwBi" id="hOYM1wz" role="2Oq$k0">
+                        <node concept="1PxgMI" id="hOYM1w$" role="2Oq$k0">
+                          <node concept="37vLTw" id="3GM_nagTBT7" role="1m5AlR">
+                            <ref role="3cqZAo" node="hOYLEwX" resolve="sel" />
+                          </node>
+                          <node concept="chp4Y" id="714IaVdGYD$" role="3oSUPX">
+                            <ref role="cht4Q" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+                          </node>
+                        </node>
+                        <node concept="3Tsc0h" id="hOYM1wA" role="2OqNvi">
+                          <ref role="3TtcxE" to="tp2c:htbW2KO" resolve="parameter" />
+                        </node>
+                      </node>
+                      <node concept="2DeJg1" id="5wUAOoBBjpK" role="2OqNvi">
+                        <ref role="1A0vxQ" to="tp2q:hwRh6j$" resolve="SmartClosureParameterDeclaration" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="hOYM2aC" role="3cqZAp">
+                  <node concept="2OqwBi" id="hOYM32Q" role="3clFbG">
+                    <node concept="2OqwBi" id="hOYM2e8" role="2Oq$k0">
+                      <node concept="37vLTw" id="3GM_nagT_Pf" role="2Oq$k0">
+                        <ref role="3cqZAo" node="hOYM1ww" resolve="pd" />
+                      </node>
+                      <node concept="3TrcHB" id="hOYM2GZ" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                    <node concept="tyxLq" id="hOYM3f2" role="2OqNvi">
+                      <node concept="Xl_RD" id="hOYM3Ci" role="tz02z">
+                        <property role="Xl_RC" value="it" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+</model>
+
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
index 686cf01b6d..444382f9b0 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
@@ -120,5 +120,13 @@
     <property role="3GE5qa" value="zipOperation" />
     <ref role="1TJDcQ" to="tp2q:h856pF2" resolve="BinaryOperation" />
   </node>
+  <node concept="1TIwiD" id="54jQkZ8WKL$">
+    <property role="EcuMT" value="5842252078326680676" />
+    <property role="TrG5h" value="GroupByOperation" />
+    <property role="34LRSv" value="groupBy" />
+    <property role="R4oN_" value="identify groups of elements" />
+    <property role="3GE5qa" value="groupByOperation" />
+    <ref role="1TJDcQ" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
+  </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
index 8ec5778047..d59f4615a8 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
@@ -37,6 +37,7 @@
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1068431790189" name="jetbrains.mps.baseLanguage.structure.Type" flags="in" index="33vP2l" />
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -73,6 +74,12 @@
       </concept>
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
+        <child id="1199542457201" name="resultType" index="1ajl9A" />
+        <child id="1199542501692" name="parameterType" index="1ajw0F" />
+      </concept>
+    </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
       <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ng" index="2c44t0">
         <child id="1196350785111" name="expression" index="2c44t1" />
@@ -177,6 +184,10 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
+      <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
+        <child id="1197683466920" name="keyType" index="3rvQeY" />
+        <child id="1197683475734" name="valueType" index="3rvSg0" />
+      </concept>
     </language>
   </registry>
   <node concept="1YbPZF" id="w6MstC1zne">
@@ -720,5 +731,82 @@
       </node>
     </node>
   </node>
+  <node concept="1YbPZF" id="54jQkZ8XvFc">
+    <property role="TrG5h" value="typeof_GroupByOperation" />
+    <property role="3GE5qa" value="groupByOperation" />
+    <node concept="3clFbS" id="54jQkZ8XvFd" role="18ibNy">
+      <node concept="1ZxtTE" id="54jQkZ929lm" role="3cqZAp">
+        <property role="TrG5h" value="paramType" />
+      </node>
+      <node concept="1ZxtTE" id="54jQkZ929lY" role="3cqZAp">
+        <property role="TrG5h" value="keyType" />
+      </node>
+      <node concept="3clFbF" id="54jQkZ929oW" role="3cqZAp">
+        <node concept="2YIFZM" id="54jQkZ929Bk" role="3clFbG">
+          <ref role="37wK5l" to="tp2v:4Iwp2tSBzXf" resolve="inferInternalOperation" />
+          <ref role="1Pybhc" to="tp2v:4Iwp2tSBvWa" resolve="OperationInference" />
+          <node concept="1YBJjd" id="54jQkZ929BU" role="37wK5m">
+            <ref role="1YBMHb" node="54jQkZ8XvFf" resolve="groupByOperation" />
+          </node>
+          <node concept="1Z$b5t" id="54jQkZ929IT" role="37wK5m">
+            <ref role="1Z$eMM" node="54jQkZ929lm" resolve="paramType" />
+          </node>
+          <node concept="2c44tf" id="34jUqC_VR5$" role="37wK5m">
+            <node concept="1ajhzC" id="34jUqC_VR5_" role="2c44tc">
+              <node concept="33vP2l" id="34jUqC_VR5A" role="1ajw0F">
+                <node concept="2c44te" id="34jUqC_VR5B" role="lGtFl">
+                  <node concept="1Z$b5t" id="34jUqC_VR5C" role="2c44t1">
+                    <ref role="1Z$eMM" node="54jQkZ929lm" resolve="paramType" />
+                  </node>
+                </node>
+              </node>
+              <node concept="33vP2l" id="54jQkZ929Qy" role="1ajl9A">
+                <node concept="2c44te" id="54jQkZ929Qz" role="lGtFl">
+                  <node concept="1Z$b5t" id="54jQkZ929Q$" role="2c44t1">
+                    <ref role="1Z$eMM" node="54jQkZ929lY" resolve="keyType" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1Z5TYs" id="54jQkZ92as2" role="3cqZAp">
+        <node concept="mw_s8" id="54jQkZ92aFm" role="1ZfhKB">
+          <node concept="2c44tf" id="54jQkZ92aHD" role="mwGJk">
+            <node concept="3rvAFt" id="54jQkZ92aIn" role="2c44tc">
+              <node concept="33vP2l" id="54jQkZ92aIo" role="3rvQeY">
+                <node concept="2c44te" id="54jQkZ92aRp" role="lGtFl">
+                  <node concept="1Z$b5t" id="54jQkZ92aRx" role="2c44t1">
+                    <ref role="1Z$eMM" node="54jQkZ929lY" resolve="keyType" />
+                  </node>
+                </node>
+              </node>
+              <node concept="A3Dl8" id="54jQkZ92b18" role="3rvSg0">
+                <node concept="33vP2l" id="54jQkZ92b19" role="A3Ik2">
+                  <node concept="2c44te" id="54jQkZ92b1l" role="lGtFl">
+                    <node concept="1Z$b5t" id="54jQkZ92b1t" role="2c44t1">
+                      <ref role="1Z$eMM" node="54jQkZ929lm" resolve="paramType" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="54jQkZ92as5" role="1ZfhK$">
+          <node concept="1Z2H0r" id="54jQkZ92a4M" role="mwGJk">
+            <node concept="1YBJjd" id="54jQkZ92a8c" role="1Z2MuG">
+              <ref role="1YBMHb" node="54jQkZ8XvFf" resolve="groupByOperation" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="54jQkZ8XvFf" role="1YuTPh">
+      <property role="TrG5h" value="groupByOperation" />
+      <ref role="1YaFvo" to="pkab:54jQkZ8WKL$" resolve="GroupByOperation" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.groupByOperation@tests.mps b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.groupByOperation@tests.mps
index cb30a8a285..bc2325cc2d 100644
--- a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.groupByOperation@tests.mps
+++ b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.groupByOperation@tests.mps
@@ -335,7 +335,7 @@
                 <property role="2bfB8j" value="true" />
                 <property role="373rjd" value="true" />
                 <ref role="1Y3XeK" to="82uw:~BiConsumer" resolve="BiConsumer" />
-                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                 <node concept="3Tm1VV" id="54jQkZ8Wac_" role="1B3o_S" />
                 <node concept="3clFb_" id="54jQkZ8WacA" role="jymVt">
                   <property role="TrG5h" value="accept" />
@@ -370,7 +370,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="54jQkZ8WacO" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
                 <node concept="3uibUv" id="54jQkZ8WacP" role="2Ghqu4">

From 8f08a7e5a08a8a1f3cbcc2b57ac5e700cee42069 Mon Sep 17 00:00:00 2001
From: Dennis Albrecht <dalbrecht@itemis.com>
Date: Thu, 25 Sep 2025 12:05:44 +0200
Subject: [PATCH 09/18] fixed generator

---
 ...tensions.generator.templates@generator.mps | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
index 8014426de8..e240be1d57 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
@@ -15,6 +15,7 @@
     <import index="tp2q" ref="r:00000000-0000-4000-0000-011c8959032e(jetbrains.mps.baseLanguage.collections.structure)" implicit="true" />
     <import index="tp2c" ref="r:00000000-0000-4000-0000-011c89590338(jetbrains.mps.baseLanguage.closures.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -554,6 +555,37 @@
                 </node>
               </node>
             </node>
+            <node concept="17Uvod" id="2oJmO5LUoUC" role="lGtFl">
+              <property role="2qtEX9" value="name" />
+              <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+              <node concept="3zFVjK" id="2oJmO5LUoUD" role="3zH0cK">
+                <node concept="3clFbS" id="2oJmO5LUoUE" role="2VODD2">
+                  <node concept="3clFbF" id="2oJmO5LUpuQ" role="3cqZAp">
+                    <node concept="2OqwBi" id="2oJmO5LUz$Q" role="3clFbG">
+                      <node concept="1PxgMI" id="2oJmO5LUz43" role="2Oq$k0">
+                        <node concept="chp4Y" id="2oJmO5LUz7f" role="3oSUPX">
+                          <ref role="cht4Q" to="tp2q:hwRh6j$" resolve="SmartClosureParameterDeclaration" />
+                        </node>
+                        <node concept="1y4W85" id="2oJmO5LUwtJ" role="1m5AlR">
+                          <node concept="3cmrfG" id="2oJmO5LUwz4" role="1y58nS">
+                            <property role="3cmrfH" value="0" />
+                          </node>
+                          <node concept="2OqwBi" id="2oJmO5LUpTD" role="1y566C">
+                            <node concept="30H73N" id="2oJmO5LUpuP" role="2Oq$k0" />
+                            <node concept="3Tsc0h" id="2oJmO5LUqoj" role="2OqNvi">
+                              <ref role="3TtcxE" to="tp2c:htbW2KO" resolve="parameter" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3TrcHB" id="2oJmO5LU_Wf" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
           <node concept="3clFbS" id="54jQkZ9grog" role="1bW5cS">
             <node concept="3clFbF" id="54jQkZ9grrZ" role="3cqZAp">

From 25591484bfda248e545a7bd77b2ec14ecf0c2af2 Mon Sep 17 00:00:00 2001
From: Amin Ait Lamqadem <alamqadem@itemis.de>
Date: Thu, 25 Sep 2025 13:33:07 +0200
Subject: [PATCH 10/18] add select with index operation

---
 ...mis.mps.baseLanguageExtensions.runtime.mps | 107 +++++++
 ...tensions.generator.templates@generator.mps | 293 ++++++++++--------
 ...mis.mps.baseLanguageExtensions.actions.mps | 205 ++++++++++++
 ...s.mps.baseLanguageExtensions.structure.mps |   7 +
 ....mps.baseLanguageExtensions.typesystem.mps |  83 +++++
 ...tensions.test.withIndexOperation@tests.mps | 248 +++++++++++++++
 6 files changed, 822 insertions(+), 121 deletions(-)
 create mode 100644 code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.withIndexOperation@tests.mps

diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
index 2e2e469ecf..d468c5ee96 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
@@ -21,6 +21,10 @@
       <concept id="1238853782547" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleLiteral" flags="nn" index="1Ls8ON">
         <child id="1238853845806" name="component" index="1Lso8e" />
       </concept>
+      <concept id="1238857743184" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleMemberAccessExpression" flags="nn" index="1LFfDK">
+        <child id="1238857764950" name="tuple" index="1LFl5Q" />
+        <child id="1238857834412" name="index" index="1LF_Uc" />
+      </concept>
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
@@ -29,6 +33,7 @@
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
       <concept id="1153422305557" name="jetbrains.mps.baseLanguage.structure.LessThanOrEqualsExpression" flags="nn" index="2dkUwp" />
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
       <concept id="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
@@ -151,6 +156,10 @@
       <concept id="1200830824066" name="jetbrains.mps.baseLanguage.closures.structure.YieldStatement" flags="nn" index="2n63Yl">
         <child id="1200830928149" name="expression" index="2n6tg2" />
       </concept>
+      <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
+        <child id="1235746996653" name="function" index="2SgG2M" />
+        <child id="1235747002942" name="parameter" index="2SgHGx" />
+      </concept>
       <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
         <child id="1199542457201" name="resultType" index="1ajl9A" />
         <child id="1199542501692" name="parameterType" index="1ajw0F" />
@@ -169,6 +178,9 @@
       </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
+        <child id="1204796294226" name="closure" index="23t8la" />
+      </concept>
       <concept id="1172650591544" name="jetbrains.mps.baseLanguage.collections.structure.SkipOperation" flags="nn" index="7r0gD">
         <child id="1172658456740" name="elementsToSkip" index="7T0AP" />
       </concept>
@@ -179,7 +191,9 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
+      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+      <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
   </registry>
@@ -716,5 +730,98 @@
     </node>
     <node concept="3Tm1VV" id="54jQkZ8QoGf" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="7Ja64GBadPz">
+    <property role="TrG5h" value="SelectWithIndexOperationUtil" />
+    <node concept="2tJIrI" id="7Ja64GBah0u" role="jymVt" />
+    <node concept="2YIFZL" id="7Ja64GBadQG" role="jymVt">
+      <property role="TrG5h" value="selectWithIndex" />
+      <node concept="3clFbS" id="7Ja64GBadQJ" role="3clF47">
+        <node concept="3clFbF" id="7Ja64GBadZj" role="3cqZAp">
+          <node concept="2OqwBi" id="7Ja64GBaeQV" role="3clFbG">
+            <node concept="2YIFZM" id="7Ja64GBae0F" role="2Oq$k0">
+              <ref role="37wK5l" node="6vHuLLnJvrd" resolve="zip" />
+              <ref role="1Pybhc" node="6vHuLLnJvpc" resolve="ZipOperatorUtil" />
+              <node concept="37vLTw" id="7Ja64GBae4o" role="37wK5m">
+                <ref role="3cqZAo" node="7Ja64GBadT8" resolve="seq" />
+              </node>
+              <node concept="2YIFZM" id="7Ja64GBaejV" role="37wK5m">
+                <ref role="37wK5l" node="vJfcQmgyHy" resolve="range" />
+                <ref role="1Pybhc" node="vJfcQmguGr" resolve="IntegerSequence" />
+                <node concept="3cmrfG" id="7Ja64GBaeC0" role="37wK5m">
+                  <property role="3cmrfH" value="0" />
+                </node>
+              </node>
+            </node>
+            <node concept="3$u5V9" id="7Ja64GBafdV" role="2OqNvi">
+              <node concept="1bVj0M" id="7Ja64GBafdX" role="23t8la">
+                <node concept="3clFbS" id="7Ja64GBafdY" role="1bW5cS">
+                  <node concept="3clFbF" id="7Ja64GBafnJ" role="3cqZAp">
+                    <node concept="2Sg_IR" id="7Ja64GBafIa" role="3clFbG">
+                      <node concept="37vLTw" id="7Ja64GBafIb" role="2SgG2M">
+                        <ref role="3cqZAo" node="7Ja64GBadU9" resolve="selector" />
+                      </node>
+                      <node concept="1LFfDK" id="7Ja64GBagcf" role="2SgHGx">
+                        <node concept="3cmrfG" id="7Ja64GBaglb" role="1LF_Uc">
+                          <property role="3cmrfH" value="0" />
+                        </node>
+                        <node concept="37vLTw" id="7Ja64GBafQw" role="1LFl5Q">
+                          <ref role="3cqZAo" node="7Ja64GBafdZ" resolve="it" />
+                        </node>
+                      </node>
+                      <node concept="1LFfDK" id="7Ja64GBagPG" role="2SgHGx">
+                        <node concept="3cmrfG" id="7Ja64GBagQ3" role="1LF_Uc">
+                          <property role="3cmrfH" value="1" />
+                        </node>
+                        <node concept="37vLTw" id="7Ja64GBagBg" role="1LFl5Q">
+                          <ref role="3cqZAo" node="7Ja64GBafdZ" resolve="it" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="7Ja64GBafdZ" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="7Ja64GBafe0" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7Ja64GBadQk" role="1B3o_S" />
+      <node concept="16euLQ" id="7Ja64GBadRc" role="16eVyc">
+        <property role="TrG5h" value="T1" />
+      </node>
+      <node concept="16euLQ" id="7Ja64GBadRA" role="16eVyc">
+        <property role="TrG5h" value="T2" />
+      </node>
+      <node concept="A3Dl8" id="7Ja64GBadSg" role="3clF45">
+        <node concept="16syzq" id="7Ja64GBadSF" role="A3Ik2">
+          <ref role="16sUi3" node="7Ja64GBadRA" resolve="T2" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7Ja64GBadT8" role="3clF46">
+        <property role="TrG5h" value="seq" />
+        <node concept="A3Dl8" id="7Ja64GBadT6" role="1tU5fm">
+          <node concept="16syzq" id="7Ja64GBadTG" role="A3Ik2">
+            <ref role="16sUi3" node="7Ja64GBadRc" resolve="T1" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7Ja64GBadU9" role="3clF46">
+        <property role="TrG5h" value="selector" />
+        <node concept="1ajhzC" id="7Ja64GBadUJ" role="1tU5fm">
+          <node concept="16syzq" id="7Ja64GBadVH" role="1ajw0F">
+            <ref role="16sUi3" node="7Ja64GBadRc" resolve="T1" />
+          </node>
+          <node concept="10Oyi0" id="7Ja64GBadWJ" role="1ajw0F" />
+          <node concept="16syzq" id="7Ja64GBadXi" role="1ajl9A">
+            <ref role="16sUi3" node="7Ja64GBadRA" resolve="T2" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="7Ja64GBadP$" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
index e240be1d57..9f0266b583 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
@@ -34,7 +34,6 @@
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
-      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
@@ -76,7 +75,6 @@
       </concept>
       <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
-        <child id="1722980698497626405" name="actualArgument" index="v9R3O" />
       </concept>
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
       <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
@@ -91,18 +89,12 @@
       <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
         <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
       </concept>
-      <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ng" index="1s_3nv">
-        <child id="982871510064032342" name="parameter" index="1s_3oS" />
-      </concept>
       <concept id="982871510068000147" name="jetbrains.mps.lang.generator.structure.TemplateSwitchMacro" flags="lg" index="1sPUBX">
         <child id="982871510068000158" name="sourceNodeQuery" index="1sPUBK" />
       </concept>
       <concept id="1167756080639" name="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue" flags="in" index="3zFVjK" />
       <concept id="1167945743726" name="jetbrains.mps.lang.generator.structure.IfMacro_Condition" flags="in" index="3IZrLx" />
       <concept id="1167951910403" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodesQuery" flags="in" index="3JmXsc" />
-      <concept id="1805153994415891174" name="jetbrains.mps.lang.generator.structure.TemplateParameterDeclaration" flags="ng" index="1N15co">
-        <child id="1805153994415893199" name="type" index="1N15GL" />
-      </concept>
       <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
       <concept id="1118773211870" name="jetbrains.mps.lang.generator.structure.IfMacro" flags="ln" index="1W57fq">
         <child id="1194989344771" name="alternativeConsequence" index="UU_$l" />
@@ -133,9 +125,6 @@
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
         <property id="1238684351431" name="asCast" index="1BlNFB" />
       </concept>
-      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
-        <reference id="1138405853777" name="concept" index="ehGHo" />
-      </concept>
       <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
         <reference id="1138056395725" name="property" index="3TsBF5" />
       </concept>
@@ -159,12 +148,11 @@
       </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
-      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
-      <concept id="1225711141656" name="jetbrains.mps.baseLanguage.collections.structure.ListElementAccessExpression" flags="nn" index="1y4W85">
-        <child id="1225711182005" name="list" index="1y566C" />
-        <child id="1225711191269" name="index" index="1y58nS" />
+      <concept id="1172650591544" name="jetbrains.mps.baseLanguage.collections.structure.SkipOperation" flags="nn" index="7r0gD">
+        <child id="1172658456740" name="elementsToSkip" index="7T0AP" />
       </concept>
+      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+      <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
   </registry>
   <node concept="bUwia" id="7EVAkaCx$5S">
@@ -441,22 +429,6 @@
           <node concept="10Nm6u" id="54jQkZ9fKdF" role="37wK5m">
             <node concept="1sPUBX" id="54jQkZ9fKkf" role="lGtFl">
               <ref role="v9R2y" node="54jQkZ9fKWX" resolve="GroupByOperation" />
-              <node concept="2OqwBi" id="54jQkZ9fMYQ" role="v9R3O">
-                <node concept="1PxgMI" id="54jQkZ9fMFx" role="2Oq$k0">
-                  <node concept="chp4Y" id="54jQkZ9fMJ0" role="3oSUPX">
-                    <ref role="cht4Q" to="pkab:54jQkZ8WKL$" resolve="GroupByOperation" />
-                  </node>
-                  <node concept="2OqwBi" id="54jQkZ9fLlS" role="1m5AlR">
-                    <node concept="30H73N" id="54jQkZ9fL5F" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="54jQkZ9fLY9" role="2OqNvi">
-                      <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3TrEf2" id="54jQkZ9fNFp" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
-                </node>
-              </node>
               <node concept="3NFfHV" id="54jQkZ9ghak" role="1sPUBK">
                 <node concept="3clFbS" id="54jQkZ9ghal" role="2VODD2">
                   <node concept="3clFbF" id="54jQkZ9ghe5" role="3cqZAp">
@@ -503,50 +475,140 @@
         </node>
       </node>
     </node>
-  </node>
-  <node concept="jVnub" id="54jQkZ9fKWX">
-    <property role="TrG5h" value="GroupByOperation" />
-    <node concept="1N15co" id="54jQkZ9fKWY" role="1s_3oS">
-      <property role="TrG5h" value="operation" />
-      <node concept="3Tqbb2" id="54jQkZ9fKXa" role="1N15GL">
-        <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
+    <node concept="3aamgX" id="7Ja64GBaq9Y" role="3acgRq">
+      <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
+      <node concept="gft3U" id="7Ja64GBaq9Z" role="1lVwrX">
+        <node concept="2YIFZM" id="7Ja64GBar5T" role="gfFT$">
+          <ref role="37wK5l" to="96gm:7Ja64GBadQG" resolve="selectWithIndex" />
+          <ref role="1Pybhc" to="96gm:7Ja64GBadPz" resolve="SelectWithIndexOperationUtil" />
+          <node concept="10Nm6u" id="7Ja64GBar5U" role="37wK5m">
+            <node concept="29HgVG" id="7Ja64GBar5V" role="lGtFl">
+              <node concept="3NFfHV" id="7Ja64GBar5W" role="3NFExx">
+                <node concept="3clFbS" id="7Ja64GBar5X" role="2VODD2">
+                  <node concept="3clFbF" id="7Ja64GBar5Y" role="3cqZAp">
+                    <node concept="2OqwBi" id="7Ja64GBar5Z" role="3clFbG">
+                      <node concept="3TrEf2" id="7Ja64GBar60" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                      </node>
+                      <node concept="30H73N" id="7Ja64GBar61" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="10Nm6u" id="7Ja64GBar62" role="37wK5m">
+            <node concept="1sPUBX" id="7Ja64GBar63" role="lGtFl">
+              <ref role="v9R2y" node="54jQkZ9fKWX" resolve="GroupByOperation" />
+              <node concept="3NFfHV" id="7Ja64GBar6b" role="1sPUBK">
+                <node concept="3clFbS" id="7Ja64GBar6c" role="2VODD2">
+                  <node concept="3clFbF" id="7Ja64GBar6d" role="3cqZAp">
+                    <node concept="2OqwBi" id="7Ja64GBar6e" role="3clFbG">
+                      <node concept="1PxgMI" id="7Ja64GBar6f" role="2Oq$k0">
+                        <node concept="2OqwBi" id="7Ja64GBar6h" role="1m5AlR">
+                          <node concept="30H73N" id="7Ja64GBar6i" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="7Ja64GBar6j" role="2OqNvi">
+                            <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                          </node>
+                        </node>
+                        <node concept="chp4Y" id="7Ja64GBawoq" role="3oSUPX">
+                          <ref role="cht4Q" to="pkab:6RqC_fThQjL" resolve="SelectWithIndexOperation" />
+                        </node>
+                      </node>
+                      <node concept="3TrEf2" id="7Ja64GBar6k" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="7Ja64GBaqas" role="30HLyM">
+        <node concept="3clFbS" id="7Ja64GBaqat" role="2VODD2">
+          <node concept="3clFbF" id="7Ja64GBaqau" role="3cqZAp">
+            <node concept="2OqwBi" id="7Ja64GBaqav" role="3clFbG">
+              <node concept="2OqwBi" id="7Ja64GBaqaw" role="2Oq$k0">
+                <node concept="30H73N" id="7Ja64GBaqax" role="2Oq$k0" />
+                <node concept="3TrEf2" id="7Ja64GBaqay" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                </node>
+              </node>
+              <node concept="1mIQ4w" id="7Ja64GBaqaz" role="2OqNvi">
+                <node concept="chp4Y" id="7Ja64GBaqa$" role="cj9EA">
+                  <ref role="cht4Q" to="pkab:6RqC_fThQjL" resolve="SelectWithIndexOperation" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
-    <node concept="3aamgX" id="54jQkZ9fNRG" role="3aUrZf">
+  </node>
+  <node concept="jVnub" id="54jQkZ9fKWX">
+    <property role="TrG5h" value="switchClosureLiteral" />
+    <node concept="3aamgX" id="7Ja64GBawMh" role="3aUrZf">
       <property role="36QftV" value="true" />
       <ref role="30HIoZ" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
-      <node concept="gft3U" id="54jQkZ9g988" role="1lVwrX">
-        <node concept="1bVj0M" id="54jQkZ9grof" role="gfFT$">
-          <node concept="37vLTG" id="54jQkZ9groL" role="1bW2Oz">
+      <node concept="gft3U" id="7Ja64GBawMi" role="1lVwrX">
+        <node concept="1bVj0M" id="7Ja64GBawMj" role="gfFT$">
+          <node concept="3clFbS" id="7Ja64GBawMM" role="1bW5cS">
+            <node concept="3clFbF" id="7Ja64GBawMN" role="3cqZAp">
+              <node concept="10Nm6u" id="7Ja64GBawMO" role="3clFbG" />
+              <node concept="2b32R4" id="7Ja64GBawMP" role="lGtFl">
+                <node concept="3JmXsc" id="7Ja64GBawMQ" role="2P8S$">
+                  <node concept="3clFbS" id="7Ja64GBawMR" role="2VODD2">
+                    <node concept="3clFbF" id="7Ja64GBawMS" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Ja64GBawMT" role="3clFbG">
+                        <node concept="2OqwBi" id="7Ja64GBawMU" role="2Oq$k0">
+                          <node concept="30H73N" id="7Ja64GBawMV" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="7Ja64GBawMW" role="2OqNvi">
+                            <ref role="3Tt5mk" to="tp2c:htbW58J" resolve="body" />
+                          </node>
+                        </node>
+                        <node concept="3Tsc0h" id="7Ja64GBawMX" role="2OqNvi">
+                          <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTG" id="7Ja64GBaEws" role="1bW2Oz">
             <property role="TrG5h" value="it" />
-            <node concept="3uibUv" id="54jQkZ9grpo" role="1tU5fm">
+            <node concept="3uibUv" id="7Ja64GBaERI" role="1tU5fm">
               <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              <node concept="29HgVG" id="54jQkZ9grrh" role="lGtFl">
-                <node concept="3NFfHV" id="54jQkZ9gAC7" role="3NFExx">
-                  <node concept="3clFbS" id="54jQkZ9gAC8" role="2VODD2">
-                    <node concept="3clFbF" id="54jQkZ9gAR4" role="3cqZAp">
-                      <node concept="2YIFZM" id="54jQkZ9gBYT" role="3clFbG">
+              <node concept="29HgVG" id="7Ja64GBaPH4" role="lGtFl">
+                <node concept="3NFfHV" id="7Ja64GBaPH5" role="3NFExx">
+                  <node concept="3clFbS" id="7Ja64GBaPH6" role="2VODD2">
+                    <node concept="3clFbF" id="7Ja64GBaPHc" role="3cqZAp">
+                      <node concept="2YIFZM" id="7Ja64GBaPYB" role="3clFbG">
                         <ref role="37wK5l" to="tp2g:hwak6Ex" resolve="copyTypeRecursively" />
                         <ref role="1Pybhc" to="tp2g:hv18zCR" resolve="ClassifierTypeUtil" />
-                        <node concept="2YIFZM" id="54jQkZ9gDaE" role="37wK5m">
+                        <node concept="2YIFZM" id="7Ja64GBaPYC" role="37wK5m">
                           <ref role="37wK5l" to="tp2g:hv18AMC" resolve="getTypeCoercedToClassifierType" />
                           <ref role="1Pybhc" to="tp2g:hv18zCR" resolve="ClassifierTypeUtil" />
-                          <node concept="2OqwBi" id="54jQkZ9hwee" role="37wK5m">
-                            <node concept="2OqwBi" id="54jQkZ9hkJ3" role="2Oq$k0">
-                              <node concept="1PxgMI" id="54jQkZ9h4c$" role="2Oq$k0">
-                                <node concept="chp4Y" id="54jQkZ9h4zP" role="3oSUPX">
-                                  <ref role="cht4Q" to="tp2c:U7sbC7HC1h" resolve="ClosureLiteralType" />
+                          <node concept="2OqwBi" id="7Ja64GBaPYD" role="37wK5m">
+                            <node concept="2OqwBi" id="7Ja64GBaUbQ" role="2Oq$k0">
+                              <node concept="1PxgMI" id="7Ja64GBaTw8" role="2Oq$k0">
+                                <property role="1BlNFB" value="true" />
+                                <node concept="chp4Y" id="7Ja64GBaTMx" role="3oSUPX">
+                                  <ref role="cht4Q" to="tp2c:htajhBZ" resolve="FunctionType" />
                                 </node>
-                                <node concept="2OqwBi" id="3612de$tQry" role="1m5AlR">
-                                  <node concept="30H73N" id="3612de$tQrz" role="2Oq$k0" />
-                                  <node concept="3JvlWi" id="3612de$tQr$" role="2OqNvi" />
+                                <node concept="2OqwBi" id="7Ja64GBaSQb" role="1m5AlR">
+                                  <node concept="30H73N" id="7Ja64GBaPYI" role="2Oq$k0" />
+                                  <node concept="3JvlWi" id="7Ja64GBaT4P" role="2OqNvi" />
                                 </node>
                               </node>
-                              <node concept="3Tsc0h" id="54jQkZ9hlm3" role="2OqNvi">
+                              <node concept="3Tsc0h" id="7Ja64GBaUOM" role="2OqNvi">
                                 <ref role="3TtcxE" to="tp2c:htajw4W" resolve="parameterType" />
                               </node>
                             </node>
-                            <node concept="1uHKPH" id="54jQkZ9hDFi" role="2OqNvi" />
+                            <node concept="1uHKPH" id="7Ja64GBaPYL" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
@@ -555,30 +617,23 @@
                 </node>
               </node>
             </node>
-            <node concept="17Uvod" id="2oJmO5LUoUC" role="lGtFl">
+            <node concept="17Uvod" id="7Ja64GBaVbQ" role="lGtFl">
               <property role="2qtEX9" value="name" />
               <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-              <node concept="3zFVjK" id="2oJmO5LUoUD" role="3zH0cK">
-                <node concept="3clFbS" id="2oJmO5LUoUE" role="2VODD2">
-                  <node concept="3clFbF" id="2oJmO5LUpuQ" role="3cqZAp">
-                    <node concept="2OqwBi" id="2oJmO5LUz$Q" role="3clFbG">
-                      <node concept="1PxgMI" id="2oJmO5LUz43" role="2Oq$k0">
-                        <node concept="chp4Y" id="2oJmO5LUz7f" role="3oSUPX">
-                          <ref role="cht4Q" to="tp2q:hwRh6j$" resolve="SmartClosureParameterDeclaration" />
-                        </node>
-                        <node concept="1y4W85" id="2oJmO5LUwtJ" role="1m5AlR">
-                          <node concept="3cmrfG" id="2oJmO5LUwz4" role="1y58nS">
-                            <property role="3cmrfH" value="0" />
-                          </node>
-                          <node concept="2OqwBi" id="2oJmO5LUpTD" role="1y566C">
-                            <node concept="30H73N" id="2oJmO5LUpuP" role="2Oq$k0" />
-                            <node concept="3Tsc0h" id="2oJmO5LUqoj" role="2OqNvi">
-                              <ref role="3TtcxE" to="tp2c:htbW2KO" resolve="parameter" />
-                            </node>
+              <node concept="3zFVjK" id="7Ja64GBaVbR" role="3zH0cK">
+                <node concept="3clFbS" id="7Ja64GBaVbS" role="2VODD2">
+                  <node concept="3clFbF" id="7Ja64GBaV$V" role="3cqZAp">
+                    <node concept="2OqwBi" id="7Ja64GBb7Om" role="3clFbG">
+                      <node concept="2OqwBi" id="7Ja64GBb2lb" role="2Oq$k0">
+                        <node concept="2OqwBi" id="7Ja64GBaVWY" role="2Oq$k0">
+                          <node concept="30H73N" id="7Ja64GBaV$U" role="2Oq$k0" />
+                          <node concept="3Tsc0h" id="7Ja64GBaWiH" role="2OqNvi">
+                            <ref role="3TtcxE" to="tp2c:htbW2KO" resolve="parameter" />
                           </node>
                         </node>
+                        <node concept="1uHKPH" id="7Ja64GBb6RO" role="2OqNvi" />
                       </node>
-                      <node concept="3TrcHB" id="2oJmO5LU_Wf" role="2OqNvi">
+                      <node concept="3TrcHB" id="7Ja64GBb8lc" role="2OqNvi">
                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                       </node>
                     </node>
@@ -587,22 +642,25 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbS" id="54jQkZ9grog" role="1bW5cS">
-            <node concept="3clFbF" id="54jQkZ9grrZ" role="3cqZAp">
-              <node concept="10Nm6u" id="54jQkZ9grrY" role="3clFbG" />
-              <node concept="2b32R4" id="54jQkZ9grtV" role="lGtFl">
-                <node concept="3JmXsc" id="54jQkZ9grtW" role="2P8S$">
-                  <node concept="3clFbS" id="54jQkZ9grtX" role="2VODD2">
-                    <node concept="3clFbF" id="54jQkZ9grxP" role="3cqZAp">
-                      <node concept="2OqwBi" id="54jQkZ9gsEo" role="3clFbG">
-                        <node concept="2OqwBi" id="54jQkZ9grTO" role="2Oq$k0">
-                          <node concept="30H73N" id="54jQkZ9grxO" role="2Oq$k0" />
-                          <node concept="3TrEf2" id="54jQkZ9gsl3" role="2OqNvi">
-                            <ref role="3Tt5mk" to="tp2c:htbW58J" resolve="body" />
-                          </node>
+          <node concept="37vLTG" id="7Ja64GBaE$D" role="1bW2Oz">
+            <property role="TrG5h" value="j" />
+            <node concept="3uibUv" id="7Ja64GBaF6w" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+            <node concept="2b32R4" id="7Ja64GBaFat" role="lGtFl">
+              <node concept="3JmXsc" id="7Ja64GBaFaw" role="2P8S$">
+                <node concept="3clFbS" id="7Ja64GBaFax" role="2VODD2">
+                  <node concept="3clFbF" id="7Ja64GBaFaB" role="3cqZAp">
+                    <node concept="2OqwBi" id="7Ja64GBaL6C" role="3clFbG">
+                      <node concept="2OqwBi" id="7Ja64GBaFay" role="2Oq$k0">
+                        <node concept="3Tsc0h" id="7Ja64GBaFa_" role="2OqNvi">
+                          <ref role="3TtcxE" to="tp2c:htbW2KO" resolve="parameter" />
                         </node>
-                        <node concept="3Tsc0h" id="54jQkZ9gtBb" role="2OqNvi">
-                          <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
+                        <node concept="30H73N" id="7Ja64GBaFaA" role="2Oq$k0" />
+                      </node>
+                      <node concept="7r0gD" id="7Ja64GBaPD_" role="2OqNvi">
+                        <node concept="3cmrfG" id="7Ja64GBaPDF" role="7T0AP">
+                          <property role="3cmrfH" value="1" />
                         </node>
                       </node>
                     </node>
@@ -613,40 +671,33 @@
           </node>
         </node>
       </node>
-      <node concept="30G5F_" id="54jQkZ9fNVy" role="30HLyM">
-        <node concept="3clFbS" id="54jQkZ9fNVz" role="2VODD2">
-          <node concept="3clFbF" id="54jQkZ9fO0o" role="3cqZAp">
-            <node concept="1Wc70l" id="54jQkZ9g42P" role="3clFbG">
-              <node concept="2OqwBi" id="54jQkZ9g5Rp" role="3uHU7w">
-                <node concept="1y4W85" id="54jQkZ9g5qE" role="2Oq$k0">
-                  <node concept="3cmrfG" id="54jQkZ9g5xw" role="1y58nS">
-                    <property role="3cmrfH" value="0" />
-                  </node>
-                  <node concept="2OqwBi" id="54jQkZ9g4oe" role="1y566C">
-                    <node concept="30H73N" id="54jQkZ9g45j" role="2Oq$k0" />
-                    <node concept="3Tsc0h" id="54jQkZ9g4vf" role="2OqNvi">
-                      <ref role="3TtcxE" to="tp2c:htbW2KO" resolve="parameter" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="1mIQ4w" id="54jQkZ9g6EK" role="2OqNvi">
-                  <node concept="chp4Y" id="54jQkZ9g8gt" role="cj9EA">
-                    <ref role="cht4Q" to="tp2q:hwRh6j$" resolve="SmartClosureParameterDeclaration" />
+      <node concept="30G5F_" id="7Ja64GBawMY" role="30HLyM">
+        <node concept="3clFbS" id="7Ja64GBawMZ" role="2VODD2">
+          <node concept="3clFbF" id="7Ja64GBawN0" role="3cqZAp">
+            <node concept="1Wc70l" id="7Ja64GBb8rp" role="3clFbG">
+              <node concept="2OqwBi" id="7Ja64GBbfle" role="3uHU7B">
+                <node concept="2OqwBi" id="7Ja64GBb8Eh" role="2Oq$k0">
+                  <node concept="30H73N" id="7Ja64GBb8_W" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="7Ja64GBb8Pu" role="2OqNvi">
+                    <ref role="3TtcxE" to="tp2c:htbW2KO" resolve="parameter" />
                   </node>
                 </node>
+                <node concept="3GX2aA" id="7Ja64GBbf$G" role="2OqNvi" />
               </node>
-              <node concept="3clFbC" id="54jQkZ9g3lT" role="3uHU7B">
-                <node concept="2OqwBi" id="54jQkZ9fVmo" role="3uHU7B">
-                  <node concept="2OqwBi" id="54jQkZ9fOpL" role="2Oq$k0">
-                    <node concept="30H73N" id="54jQkZ9fO0n" role="2Oq$k0" />
-                    <node concept="3Tsc0h" id="54jQkZ9fOMq" role="2OqNvi">
+              <node concept="2OqwBi" id="7Ja64GBawN2" role="3uHU7w">
+                <node concept="2OqwBi" id="7Ja64GBbI8i" role="2Oq$k0">
+                  <node concept="2OqwBi" id="7Ja64GBawN5" role="2Oq$k0">
+                    <node concept="30H73N" id="7Ja64GBawN6" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="7Ja64GBawN7" role="2OqNvi">
                       <ref role="3TtcxE" to="tp2c:htbW2KO" resolve="parameter" />
                     </node>
                   </node>
-                  <node concept="34oBXx" id="54jQkZ9g1zZ" role="2OqNvi" />
+                  <node concept="1uHKPH" id="7Ja64GBbMGl" role="2OqNvi" />
                 </node>
-                <node concept="3cmrfG" id="54jQkZ9g3R_" role="3uHU7w">
-                  <property role="3cmrfH" value="1" />
+                <node concept="1mIQ4w" id="7Ja64GBawN8" role="2OqNvi">
+                  <node concept="chp4Y" id="7Ja64GBawN9" role="cj9EA">
+                    <ref role="cht4Q" to="tp2q:hwRh6j$" resolve="SmartClosureParameterDeclaration" />
+                  </node>
                 </node>
               </node>
             </node>
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps
index 2d01ee8181..b16467fbe6 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps
@@ -31,6 +31,7 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
+      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
@@ -44,6 +45,7 @@
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
         <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
         <child id="1068580123160" name="condition" index="3clFbw" />
@@ -57,6 +59,11 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
     </language>
+    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
+      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
+        <child id="1196350785114" name="quotedNode" index="2c44tc" />
+      </concept>
+    </language>
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
       <concept id="767145758118872833" name="jetbrains.mps.lang.actions.structure.NF_LinkList_AddNewChildOperation" flags="nn" index="2DeJg1" />
       <concept id="767145758118872830" name="jetbrains.mps.lang.actions.structure.NF_Link_SetNewChildOperation" flags="nn" index="2DeJnY" />
@@ -257,5 +264,203 @@
       </node>
     </node>
   </node>
+  <node concept="37WguZ" id="7Ja64GB9veW">
+    <property role="TrG5h" value="selectWithIndex_operation" />
+    <node concept="37WvkG" id="7Ja64GB9veX" role="37WGs$">
+      <ref role="37XkoT" to="pkab:6RqC_fThQjL" resolve="SelectWithIndexOperation" />
+      <node concept="37Y9Zx" id="7Ja64GB9veY" role="37ZfLb">
+        <node concept="3clFbS" id="7Ja64GB9veZ" role="2VODD2">
+          <node concept="3clFbJ" id="7Ja64GB9vgD" role="3cqZAp">
+            <node concept="2OqwBi" id="7Ja64GB9vpy" role="3clFbw">
+              <node concept="1r4N5L" id="7Ja64GB9vh2" role="2Oq$k0" />
+              <node concept="1mIQ4w" id="7Ja64GB9vMH" role="2OqNvi">
+                <node concept="chp4Y" id="7Ja64GB9vOS" role="cj9EA">
+                  <ref role="cht4Q" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="7Ja64GB9vgF" role="3clFbx">
+              <node concept="3clFbF" id="7Ja64GB9vRp" role="3cqZAp">
+                <node concept="2OqwBi" id="7Ja64GB9wud" role="3clFbG">
+                  <node concept="2OqwBi" id="7Ja64GB9w3p" role="2Oq$k0">
+                    <node concept="1r4Lsj" id="7Ja64GB9vRo" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="7Ja64GB9whN" role="2OqNvi">
+                      <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                    </node>
+                  </node>
+                  <node concept="2oxUTD" id="7Ja64GB9wDC" role="2OqNvi">
+                    <node concept="2OqwBi" id="7Ja64GB9xDL" role="2oxUTC">
+                      <node concept="2OqwBi" id="7Ja64GB9xby" role="2Oq$k0">
+                        <node concept="1PxgMI" id="7Ja64GB9wUj" role="2Oq$k0">
+                          <node concept="chp4Y" id="7Ja64GB9wVv" role="3oSUPX">
+                            <ref role="cht4Q" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
+                          </node>
+                          <node concept="1r4N5L" id="7Ja64GB9wHc" role="1m5AlR" />
+                        </node>
+                        <node concept="3TrEf2" id="7Ja64GB9xrz" role="2OqNvi">
+                          <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                        </node>
+                      </node>
+                      <node concept="3YRAZt" id="7Ja64GB9xSD" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="9aQIb" id="7Ja64GB9xZ$" role="9aQIa">
+              <node concept="3clFbS" id="7Ja64GB9xZ_" role="9aQI4">
+                <node concept="3cpWs8" id="7Ja64GB9ytg" role="3cqZAp">
+                  <node concept="3cpWsn" id="7Ja64GB9yth" role="3cpWs9">
+                    <property role="TrG5h" value="sel" />
+                    <node concept="3Tqbb2" id="7Ja64GB9yqy" role="1tU5fm">
+                      <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
+                    </node>
+                    <node concept="2OqwBi" id="7Ja64GB9yti" role="33vP2m">
+                      <node concept="1r4Lsj" id="7Ja64GB9ytj" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="7Ja64GB9ytk" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="7Ja64GB9yCV" role="3cqZAp">
+                  <node concept="3clFbS" id="7Ja64GB9yCX" role="3clFbx">
+                    <node concept="3clFbF" id="7Ja64GB9z0z" role="3cqZAp">
+                      <node concept="37vLTI" id="7Ja64GB9ziC" role="3clFbG">
+                        <node concept="2OqwBi" id="7Ja64GB9zKx" role="37vLTx">
+                          <node concept="2OqwBi" id="7Ja64GB9zvM" role="2Oq$k0">
+                            <node concept="1r4Lsj" id="7Ja64GB9zj8" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="7Ja64GB9zGL" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                            </node>
+                          </node>
+                          <node concept="2DeJnY" id="7Ja64GB9zW1" role="2OqNvi">
+                            <ref role="1A9B2P" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="7Ja64GB9z0x" role="37vLTJ">
+                          <ref role="3cqZAo" node="7Ja64GB9yth" resolve="sel" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWs8" id="7Ja64GB9JEp" role="3cqZAp">
+                      <node concept="3cpWsn" id="7Ja64GB9JEq" role="3cpWs9">
+                        <property role="TrG5h" value="pDeclIt" />
+                        <node concept="3Tqbb2" id="7Ja64GB9JE8" role="1tU5fm">
+                          <ref role="ehGHo" to="tp2q:hwRh6j$" resolve="SmartClosureParameterDeclaration" />
+                        </node>
+                        <node concept="2OqwBi" id="7Ja64GB9JEr" role="33vP2m">
+                          <node concept="2OqwBi" id="7Ja64GB9JEs" role="2Oq$k0">
+                            <node concept="1PxgMI" id="7Ja64GB9JEt" role="2Oq$k0">
+                              <node concept="chp4Y" id="7Ja64GB9JEu" role="3oSUPX">
+                                <ref role="cht4Q" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+                              </node>
+                              <node concept="37vLTw" id="7Ja64GB9JEv" role="1m5AlR">
+                                <ref role="3cqZAo" node="7Ja64GB9yth" resolve="sel" />
+                              </node>
+                            </node>
+                            <node concept="3Tsc0h" id="7Ja64GB9JEw" role="2OqNvi">
+                              <ref role="3TtcxE" to="tp2c:htbW2KO" resolve="parameter" />
+                            </node>
+                          </node>
+                          <node concept="2DeJg1" id="7Ja64GB9JEx" role="2OqNvi">
+                            <ref role="1A0vxQ" to="tp2q:hwRh6j$" resolve="SmartClosureParameterDeclaration" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="7Ja64GB9Nwa" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Ja64GB9RLQ" role="3clFbG">
+                        <node concept="2OqwBi" id="7Ja64GB9NTc" role="2Oq$k0">
+                          <node concept="37vLTw" id="7Ja64GB9Nw8" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Ja64GB9JEq" resolve="pDecl" />
+                          </node>
+                          <node concept="3TrcHB" id="7Ja64GB9Omk" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                        <node concept="tyxLq" id="7Ja64GB9S5z" role="2OqNvi">
+                          <node concept="Xl_RD" id="7Ja64GB9S63" role="tz02z">
+                            <property role="Xl_RC" value="it" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWs8" id="7Ja64GB9UXN" role="3cqZAp">
+                      <node concept="3cpWsn" id="7Ja64GB9UXO" role="3cpWs9">
+                        <property role="TrG5h" value="pDeclIdx" />
+                        <node concept="3Tqbb2" id="7Ja64GB9UXy" role="1tU5fm">
+                          <ref role="ehGHo" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
+                        </node>
+                        <node concept="2OqwBi" id="7Ja64GB9UXP" role="33vP2m">
+                          <node concept="2OqwBi" id="7Ja64GB9UXQ" role="2Oq$k0">
+                            <node concept="1PxgMI" id="7Ja64GB9UXR" role="2Oq$k0">
+                              <node concept="chp4Y" id="7Ja64GB9UXS" role="3oSUPX">
+                                <ref role="cht4Q" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+                              </node>
+                              <node concept="37vLTw" id="7Ja64GB9UXT" role="1m5AlR">
+                                <ref role="3cqZAo" node="7Ja64GB9yth" resolve="sel" />
+                              </node>
+                            </node>
+                            <node concept="3Tsc0h" id="7Ja64GB9UXU" role="2OqNvi">
+                              <ref role="3TtcxE" to="tp2c:htbW2KO" resolve="parameter" />
+                            </node>
+                          </node>
+                          <node concept="2DeJg1" id="7Ja64GB9UXV" role="2OqNvi">
+                            <ref role="1A0vxQ" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="7Ja64GB9SaY" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Ja64GB9ZZy" role="3clFbG">
+                        <node concept="2OqwBi" id="7Ja64GB9Z2L" role="2Oq$k0">
+                          <node concept="37vLTw" id="7Ja64GB9UXW" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Ja64GB9UXO" resolve="pDeclIdx" />
+                          </node>
+                          <node concept="3TrcHB" id="7Ja64GB9Zt3" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                        <node concept="tyxLq" id="7Ja64GBa0jf" role="2OqNvi">
+                          <node concept="Xl_RD" id="7Ja64GBa0jJ" role="tz02z">
+                            <property role="Xl_RC" value="index" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="7Ja64GBa0q5" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Ja64GBa0IO" role="3clFbG">
+                        <node concept="2OqwBi" id="7Ja64GBa0uE" role="2Oq$k0">
+                          <node concept="37vLTw" id="7Ja64GBa0q3" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Ja64GB9UXO" resolve="pDeclIdx" />
+                          </node>
+                          <node concept="3TrEf2" id="7Ja64GBa0vJ" role="2OqNvi">
+                            <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
+                          </node>
+                        </node>
+                        <node concept="2oxUTD" id="7Ja64GBa0UL" role="2OqNvi">
+                          <node concept="2c44tf" id="7Ja64GBa0VS" role="2oxUTC">
+                            <node concept="10Oyi0" id="7Ja64GBa0Yx" role="2c44tc" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="7Ja64GB9S6W" role="3cqZAp" />
+                  </node>
+                  <node concept="2OqwBi" id="7Ja64GB9yPf" role="3clFbw">
+                    <node concept="37vLTw" id="7Ja64GB9yFX" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7Ja64GB9yth" resolve="sel" />
+                    </node>
+                    <node concept="3w_OXm" id="7Ja64GB9yW$" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
index 444382f9b0..f3eab0c673 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
@@ -128,5 +128,12 @@
     <property role="3GE5qa" value="groupByOperation" />
     <ref role="1TJDcQ" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
   </node>
+  <node concept="1TIwiD" id="6RqC_fThQjL">
+    <property role="EcuMT" value="7915817776605258993" />
+    <property role="TrG5h" value="SelectWithIndexOperation" />
+    <property role="34LRSv" value="selectIdx" />
+    <property role="R4oN_" value="transform each element and index" />
+    <ref role="1TJDcQ" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
+  </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
index d59f4615a8..d43efae57e 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
@@ -808,5 +808,88 @@
       <ref role="1YaFvo" to="pkab:54jQkZ8WKL$" resolve="GroupByOperation" />
     </node>
   </node>
+  <node concept="1YbPZF" id="6RqC_fThRNY">
+    <property role="TrG5h" value="typeof_SelectWithIndexOperation" />
+    <node concept="3clFbS" id="6RqC_fThRNZ" role="18ibNy">
+      <node concept="1ZxtTE" id="6RqC_fThS0E" role="3cqZAp">
+        <property role="TrG5h" value="seqParamType" />
+      </node>
+      <node concept="1ZxtTE" id="6RqC_fThS0F" role="3cqZAp">
+        <property role="TrG5h" value="returnType" />
+      </node>
+      <node concept="1ZxtTE" id="6RqC_fThT9o" role="3cqZAp">
+        <property role="TrG5h" value="selectorParamType" />
+      </node>
+      <node concept="1ZobV4" id="6RqC_fThTkm" role="3cqZAp">
+        <node concept="mw_s8" id="6RqC_fThTlB" role="1ZfhK$">
+          <node concept="1Z$b5t" id="6RqC_fThTl_" role="mwGJk">
+            <ref role="1Z$eMM" node="6RqC_fThS0E" resolve="paramType" />
+          </node>
+        </node>
+        <node concept="mw_s8" id="6RqC_fThTlK" role="1ZfhKB">
+          <node concept="1Z$b5t" id="6RqC_fThTlI" role="mwGJk">
+            <ref role="1Z$eMM" node="6RqC_fThT9o" resolve="selectorParamType" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbF" id="6RqC_fThS0G" role="3cqZAp">
+        <node concept="2YIFZM" id="6RqC_fThS0H" role="3clFbG">
+          <ref role="37wK5l" to="tp2v:4Iwp2tSBzXf" resolve="inferInternalOperation" />
+          <ref role="1Pybhc" to="tp2v:4Iwp2tSBvWa" resolve="OperationInference" />
+          <node concept="1YBJjd" id="6RqC_fThS0I" role="37wK5m">
+            <ref role="1YBMHb" node="6RqC_fThRO1" resolve="selectWithIndexOperation" />
+          </node>
+          <node concept="1Z$b5t" id="6RqC_fThS0J" role="37wK5m">
+            <ref role="1Z$eMM" node="6RqC_fThS0E" resolve="paramType" />
+          </node>
+          <node concept="2c44tf" id="6RqC_fThS0K" role="37wK5m">
+            <node concept="1ajhzC" id="6RqC_fThS0L" role="2c44tc">
+              <node concept="33vP2l" id="6RqC_fThS0M" role="1ajw0F">
+                <node concept="2c44te" id="6RqC_fThS0N" role="lGtFl">
+                  <node concept="1Z$b5t" id="6RqC_fThTqX" role="2c44t1">
+                    <ref role="1Z$eMM" node="6RqC_fThT9o" resolve="selectorParamType" />
+                  </node>
+                </node>
+              </node>
+              <node concept="10Oyi0" id="6RqC_fThS8f" role="1ajw0F" />
+              <node concept="33vP2l" id="6RqC_fThS0P" role="1ajl9A">
+                <node concept="2c44te" id="6RqC_fThS0Q" role="lGtFl">
+                  <node concept="1Z$b5t" id="6RqC_fThS0R" role="2c44t1">
+                    <ref role="1Z$eMM" node="6RqC_fThS0F" resolve="keyType" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1Z5TYs" id="6RqC_fThS0S" role="3cqZAp">
+        <node concept="mw_s8" id="6RqC_fThS0T" role="1ZfhKB">
+          <node concept="2c44tf" id="6RqC_fThS0U" role="mwGJk">
+            <node concept="A3Dl8" id="6RqC_fThSq7" role="2c44tc">
+              <node concept="10P_77" id="6RqC_fThSsx" role="A3Ik2">
+                <node concept="2c44te" id="6RqC_fThSsH" role="lGtFl">
+                  <node concept="1Z$b5t" id="6RqC_fThSsP" role="2c44t1">
+                    <ref role="1Z$eMM" node="6RqC_fThS0F" resolve="returnType" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="6RqC_fThS13" role="1ZfhK$">
+          <node concept="1Z2H0r" id="6RqC_fThS14" role="mwGJk">
+            <node concept="1YBJjd" id="6RqC_fThSgE" role="1Z2MuG">
+              <ref role="1YBMHb" node="6RqC_fThRO1" resolve="selectWithIndexOperation" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="6RqC_fThRO1" role="1YuTPh">
+      <property role="TrG5h" value="selectWithIndexOperation" />
+      <ref role="1YaFvo" to="pkab:6RqC_fThQjL" resolve="SelectWithIndexOperation" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.withIndexOperation@tests.mps b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.withIndexOperation@tests.mps
new file mode 100644
index 0000000000..229a3f06d4
--- /dev/null
+++ b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.withIndexOperation@tests.mps
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:950cb589-b21d-4ed2-88f3-d465eda87ffe(de.itemis.mps.baseLanguageExtensions.test.withIndexOperation@tests)">
+  <persistence version="9" />
+  <languages>
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
+    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+  </languages>
+  <imports>
+    <import index="96gm" ref="r:2eaed950-3bc1-47cd-9b02-e917ff994d7c(de.itemis.mps.baseLanguageExtensions.runtime)" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
+    <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
+      <concept id="1171931690126" name="jetbrains.mps.baseLanguage.unitTest.structure.TestMethod" flags="ig" index="3s$Bmu">
+        <property id="1171931690128" name="methodName" index="3s$Bm0" />
+      </concept>
+      <concept id="1171931851043" name="jetbrains.mps.baseLanguage.unitTest.structure.BTestCase" flags="ig" index="3s_ewN">
+        <property id="1171931851045" name="testCaseName" index="3s_ewP" />
+        <child id="1171931851044" name="testMethodList" index="3s_ewO" />
+      </concept>
+      <concept id="1171931858461" name="jetbrains.mps.baseLanguage.unitTest.structure.TestMethodList" flags="ng" index="3s_gsd">
+        <child id="1171931858462" name="testMethod" index="3s_gse" />
+      </concept>
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
+        <child id="540871147943773366" name="argument" index="25WWJ7" />
+      </concept>
+      <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
+        <child id="1151688676805" name="elementType" index="_ZDj9" />
+      </concept>
+      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
+        <child id="1151689745422" name="elementType" index="A3Ik2" />
+      </concept>
+      <concept id="6126991172893676625" name="jetbrains.mps.baseLanguage.collections.structure.ContainsAllOperation" flags="nn" index="BjQpj" />
+      <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
+        <child id="1237721435808" name="initValue" index="HW$Y0" />
+        <child id="1237721435807" name="elementType" index="HW$YZ" />
+      </concept>
+      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
+      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
+    </language>
+  </registry>
+  <node concept="3s_ewN" id="7Ja64GBc5va">
+    <property role="3s_ewP" value="WithIndexOperation" />
+    <node concept="3Tm1VV" id="7Ja64GBc5vb" role="1B3o_S" />
+    <node concept="3s_gsd" id="7Ja64GBc5vc" role="3s_ewO">
+      <node concept="3s$Bmu" id="7Ja64GBc8AO" role="3s_gse">
+        <property role="3s$Bm0" value="selectWithIndex" />
+        <node concept="3cqZAl" id="7Ja64GBc8AP" role="3clF45" />
+        <node concept="3Tm1VV" id="7Ja64GBc8AQ" role="1B3o_S" />
+        <node concept="3clFbS" id="7Ja64GBc8AR" role="3clF47">
+          <node concept="3cpWs8" id="7Ja64GBcart" role="3cqZAp">
+            <node concept="3cpWsn" id="7Ja64GBcaru" role="3cpWs9">
+              <property role="TrG5h" value="nums" />
+              <node concept="_YKpA" id="7Ja64GBcaq4" role="1tU5fm">
+                <node concept="17QB3L" id="7Ja64GBcaq7" role="_ZDj9" />
+              </node>
+              <node concept="2ShNRf" id="7Ja64GBcarv" role="33vP2m">
+                <node concept="Tc6Ow" id="7Ja64GBcarw" role="2ShVmc">
+                  <node concept="17QB3L" id="7Ja64GBcarx" role="HW$YZ" />
+                  <node concept="Xl_RD" id="7Ja64GBcary" role="HW$Y0">
+                    <property role="Xl_RC" value="zero" />
+                  </node>
+                  <node concept="Xl_RD" id="7Ja64GBcarz" role="HW$Y0">
+                    <property role="Xl_RC" value="one" />
+                  </node>
+                  <node concept="Xl_RD" id="7Ja64GBcar$" role="HW$Y0">
+                    <property role="Xl_RC" value="two" />
+                  </node>
+                  <node concept="Xl_RD" id="7Ja64GBcar_" role="HW$Y0">
+                    <property role="Xl_RC" value="three" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="7Ja64GBceGj" role="3cqZAp">
+            <node concept="3cpWsn" id="7Ja64GBceGk" role="3cpWs9">
+              <property role="TrG5h" value="expected" />
+              <node concept="_YKpA" id="7Ja64GBceGl" role="1tU5fm">
+                <node concept="17QB3L" id="7Ja64GBceGm" role="_ZDj9" />
+              </node>
+              <node concept="2ShNRf" id="7Ja64GBceGn" role="33vP2m">
+                <node concept="Tc6Ow" id="7Ja64GBceGo" role="2ShVmc">
+                  <node concept="17QB3L" id="7Ja64GBceGp" role="HW$YZ" />
+                  <node concept="Xl_RD" id="7Ja64GBceGq" role="HW$Y0">
+                    <property role="Xl_RC" value="0: zero" />
+                  </node>
+                  <node concept="Xl_RD" id="7Ja64GBceGr" role="HW$Y0">
+                    <property role="Xl_RC" value="1: one" />
+                  </node>
+                  <node concept="Xl_RD" id="7Ja64GBceGs" role="HW$Y0">
+                    <property role="Xl_RC" value="2: two" />
+                  </node>
+                  <node concept="Xl_RD" id="7Ja64GBceGt" role="HW$Y0">
+                    <property role="Xl_RC" value="3: three" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="7Ja64GBcexr" role="3cqZAp">
+            <node concept="3cpWsn" id="7Ja64GBcexs" role="3cpWs9">
+              <property role="TrG5h" value="actual" />
+              <node concept="A3Dl8" id="7Ja64GBcely" role="1tU5fm">
+                <node concept="17QB3L" id="7Ja64GBcel_" role="A3Ik2" />
+              </node>
+              <node concept="2YIFZM" id="7Ja64GBcext" role="33vP2m">
+                <ref role="37wK5l" to="96gm:7Ja64GBadQG" resolve="selectWithIndex" />
+                <ref role="1Pybhc" to="96gm:7Ja64GBadPz" resolve="SelectWithIndexOperationUtil" />
+                <node concept="37vLTw" id="7Ja64GBcexu" role="37wK5m">
+                  <ref role="3cqZAo" node="7Ja64GBcaru" resolve="nums" />
+                </node>
+                <node concept="1bVj0M" id="7Ja64GBcexv" role="37wK5m">
+                  <node concept="3clFbS" id="7Ja64GBcexw" role="1bW5cS">
+                    <node concept="3clFbF" id="7Ja64GBcexx" role="3cqZAp">
+                      <node concept="3cpWs3" id="7Ja64GBcexy" role="3clFbG">
+                        <node concept="37vLTw" id="7Ja64GBcexz" role="3uHU7w">
+                          <ref role="3cqZAo" node="7Ja64GBcexB" resolve="it" />
+                        </node>
+                        <node concept="3cpWs3" id="7Ja64GBcex$" role="3uHU7B">
+                          <node concept="37vLTw" id="7Ja64GBcex_" role="3uHU7B">
+                            <ref role="3cqZAo" node="7Ja64GBcexD" resolve="i" />
+                          </node>
+                          <node concept="Xl_RD" id="7Ja64GBcexA" role="3uHU7w">
+                            <property role="Xl_RC" value=": " />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTG" id="7Ja64GBcexB" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="17QB3L" id="7Ja64GBcexC" role="1tU5fm" />
+                  </node>
+                  <node concept="37vLTG" id="7Ja64GBcexD" role="1bW2Oz">
+                    <property role="TrG5h" value="i" />
+                    <node concept="10Oyi0" id="7Ja64GBcexE" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3vwNmj" id="7Ja64GBcg6d" role="3cqZAp">
+            <node concept="17R0WA" id="7Ja64GBdpiA" role="3vwVQn">
+              <node concept="2OqwBi" id="7Ja64GBdqE2" role="3uHU7w">
+                <node concept="37vLTw" id="7Ja64GBdpTS" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7Ja64GBcexs" resolve="actual" />
+                </node>
+                <node concept="34oBXx" id="7Ja64GBdqU5" role="2OqNvi" />
+              </node>
+              <node concept="2OqwBi" id="7Ja64GBdmZT" role="3uHU7B">
+                <node concept="37vLTw" id="7Ja64GBdmpP" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7Ja64GBceGk" resolve="expected" />
+                </node>
+                <node concept="34oBXx" id="7Ja64GBdnAA" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+          <node concept="3vwNmj" id="7Ja64GBdsVa" role="3cqZAp">
+            <node concept="2OqwBi" id="7Ja64GBcgAA" role="3vwVQn">
+              <node concept="37vLTw" id="7Ja64GBcg9U" role="2Oq$k0">
+                <ref role="3cqZAo" node="7Ja64GBceGk" resolve="expected" />
+              </node>
+              <node concept="BjQpj" id="7Ja64GBchzh" role="2OqNvi">
+                <node concept="37vLTw" id="7Ja64GBchCH" role="25WWJ7">
+                  <ref role="3cqZAo" node="7Ja64GBcexs" resolve="actual" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+</model>
+

From eae7b51208bbe96678e08b89191a363fa6e416ed Mon Sep 17 00:00:00 2001
From: Amin Ait Lamqadem <alamqadem@itemis.de>
Date: Thu, 25 Sep 2025 14:10:56 +0200
Subject: [PATCH 11/18] add where and forEach with index operations

---
 ...mis.mps.baseLanguageExtensions.runtime.mps | 244 ++++++++++-
 ...tensions.generator.templates@generator.mps | 146 ++++++-
 ...mis.mps.baseLanguageExtensions.actions.mps | 392 +++++++++++++++++-
 ...s.mps.baseLanguageExtensions.structure.mps |  17 +
 ....mps.baseLanguageExtensions.typesystem.mps | 160 +++++++
 5 files changed, 941 insertions(+), 18 deletions(-)

diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
index d468c5ee96..56a904a5d2 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
@@ -46,6 +46,7 @@
         <child id="1154032183016" name="body" index="2LFqv$" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <property id="2523873803623706117" name="isMultiline" index="hSjvv" />
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
@@ -58,6 +59,7 @@
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
+      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
         <child id="1070534934091" name="type" index="10QFUM" />
         <child id="1070534934092" name="expression" index="10QFUP" />
@@ -114,6 +116,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
@@ -130,6 +133,7 @@
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
+      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
         <child id="1109201940907" name="parameter" index="11_B2D" />
@@ -184,6 +188,7 @@
       <concept id="1172650591544" name="jetbrains.mps.baseLanguage.collections.structure.SkipOperation" flags="nn" index="7r0gD">
         <child id="1172658456740" name="elementsToSkip" index="7T0AP" />
       </concept>
+      <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1224414427926" name="jetbrains.mps.baseLanguage.collections.structure.SequenceCreator" flags="nn" index="kMnCb">
         <child id="1224414456414" name="elementType" index="kMuH3" />
         <child id="1224414466839" name="initializer" index="kMx8a" />
@@ -193,6 +198,7 @@
       </concept>
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
@@ -731,27 +737,56 @@
     <node concept="3Tm1VV" id="54jQkZ8QoGf" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="7Ja64GBadPz">
-    <property role="TrG5h" value="SelectWithIndexOperationUtil" />
+    <property role="TrG5h" value="WithIndexOperationUtil" />
     <node concept="2tJIrI" id="7Ja64GBah0u" role="jymVt" />
+    <node concept="2YIFZL" id="7Ja64GBdD1A" role="jymVt">
+      <property role="TrG5h" value="zipWithIntRange" />
+      <node concept="3clFbS" id="7Ja64GBdD1D" role="3clF47">
+        <node concept="3clFbF" id="7Ja64GBdDMO" role="3cqZAp">
+          <node concept="2YIFZM" id="7Ja64GBdDMQ" role="3clFbG">
+            <ref role="37wK5l" node="6vHuLLnJvrd" resolve="zip" />
+            <ref role="1Pybhc" node="6vHuLLnJvpc" resolve="ZipOperatorUtil" />
+            <node concept="37vLTw" id="7Ja64GBdDMR" role="37wK5m">
+              <ref role="3cqZAo" node="7Ja64GBdDKO" resolve="seq" />
+            </node>
+            <node concept="2YIFZM" id="7Ja64GBdDMS" role="37wK5m">
+              <ref role="37wK5l" node="vJfcQmgyHy" resolve="range" />
+              <ref role="1Pybhc" node="vJfcQmguGr" resolve="IntegerSequence" />
+              <node concept="3cmrfG" id="7Ja64GBdDMT" role="37wK5m">
+                <property role="3cmrfH" value="0" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7Ja64GBdFMs" role="1B3o_S" />
+      <node concept="A3Dl8" id="7Ja64GBdD1d" role="3clF45">
+        <node concept="1LlUBW" id="7Ja64GBdDYk" role="A3Ik2">
+          <node concept="16syzq" id="7Ja64GBdE8n" role="1Lm7xW">
+            <ref role="16sUi3" node="7Ja64GBdDJ5" resolve="T" />
+          </node>
+          <node concept="10Oyi0" id="7Ja64GBdEsx" role="1Lm7xW" />
+        </node>
+      </node>
+      <node concept="16euLQ" id="7Ja64GBdDJ5" role="16eVyc">
+        <property role="TrG5h" value="T" />
+      </node>
+      <node concept="37vLTG" id="7Ja64GBdDKO" role="3clF46">
+        <property role="TrG5h" value="seq" />
+        <node concept="A3Dl8" id="7Ja64GBdDKM" role="1tU5fm">
+          <node concept="16syzq" id="7Ja64GBdDL$" role="A3Ik2">
+            <ref role="16sUi3" node="7Ja64GBdDJ5" resolve="T" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Ja64GBdBv1" role="jymVt" />
     <node concept="2YIFZL" id="7Ja64GBadQG" role="jymVt">
       <property role="TrG5h" value="selectWithIndex" />
       <node concept="3clFbS" id="7Ja64GBadQJ" role="3clF47">
         <node concept="3clFbF" id="7Ja64GBadZj" role="3cqZAp">
           <node concept="2OqwBi" id="7Ja64GBaeQV" role="3clFbG">
-            <node concept="2YIFZM" id="7Ja64GBae0F" role="2Oq$k0">
-              <ref role="37wK5l" node="6vHuLLnJvrd" resolve="zip" />
-              <ref role="1Pybhc" node="6vHuLLnJvpc" resolve="ZipOperatorUtil" />
-              <node concept="37vLTw" id="7Ja64GBae4o" role="37wK5m">
-                <ref role="3cqZAo" node="7Ja64GBadT8" resolve="seq" />
-              </node>
-              <node concept="2YIFZM" id="7Ja64GBaejV" role="37wK5m">
-                <ref role="37wK5l" node="vJfcQmgyHy" resolve="range" />
-                <ref role="1Pybhc" node="vJfcQmguGr" resolve="IntegerSequence" />
-                <node concept="3cmrfG" id="7Ja64GBaeC0" role="37wK5m">
-                  <property role="3cmrfH" value="0" />
-                </node>
-              </node>
-            </node>
+            <property role="hSjvv" value="true" />
             <node concept="3$u5V9" id="7Ja64GBafdV" role="2OqNvi">
               <node concept="1bVj0M" id="7Ja64GBafdX" role="23t8la">
                 <node concept="3clFbS" id="7Ja64GBafdY" role="1bW5cS">
@@ -785,6 +820,12 @@
                 </node>
               </node>
             </node>
+            <node concept="1rXfSq" id="7Ja64GBdEBt" role="2Oq$k0">
+              <ref role="37wK5l" node="7Ja64GBdD1A" resolve="zipWithIntRange" />
+              <node concept="37vLTw" id="7Ja64GBdEJV" role="37wK5m">
+                <ref role="3cqZAo" node="7Ja64GBadT8" resolve="seq" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -821,6 +862,179 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="7Ja64GBdwBR" role="jymVt" />
+    <node concept="2YIFZL" id="7Ja64GBdvMJ" role="jymVt">
+      <property role="TrG5h" value="whereWithIndex" />
+      <node concept="3clFbS" id="7Ja64GBdvMK" role="3clF47">
+        <node concept="3clFbF" id="7Ja64GBdvML" role="3cqZAp">
+          <node concept="2OqwBi" id="7Ja64GBdzVA" role="3clFbG">
+            <property role="hSjvv" value="true" />
+            <node concept="2OqwBi" id="7Ja64GBdvMM" role="2Oq$k0">
+              <property role="hSjvv" value="true" />
+              <node concept="3zZkjj" id="7Ja64GBdyG0" role="2OqNvi">
+                <node concept="1bVj0M" id="7Ja64GBdyG2" role="23t8la">
+                  <node concept="3clFbS" id="7Ja64GBdyG3" role="1bW5cS">
+                    <node concept="3clFbF" id="7Ja64GBdyG4" role="3cqZAp">
+                      <node concept="2Sg_IR" id="7Ja64GBdyG5" role="3clFbG">
+                        <node concept="37vLTw" id="7Ja64GBdyG6" role="2SgG2M">
+                          <ref role="3cqZAo" node="7Ja64GBdvNd" resolve="selector" />
+                        </node>
+                        <node concept="1LFfDK" id="7Ja64GBdyG7" role="2SgHGx">
+                          <node concept="3cmrfG" id="7Ja64GBdyG8" role="1LF_Uc">
+                            <property role="3cmrfH" value="0" />
+                          </node>
+                          <node concept="37vLTw" id="7Ja64GBdyG9" role="1LFl5Q">
+                            <ref role="3cqZAo" node="7Ja64GBdyGd" resolve="it" />
+                          </node>
+                        </node>
+                        <node concept="1LFfDK" id="7Ja64GBdyGa" role="2SgHGx">
+                          <node concept="3cmrfG" id="7Ja64GBdyGb" role="1LF_Uc">
+                            <property role="3cmrfH" value="1" />
+                          </node>
+                          <node concept="37vLTw" id="7Ja64GBdyGc" role="1LFl5Q">
+                            <ref role="3cqZAo" node="7Ja64GBdyGd" resolve="it" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="7Ja64GBdyGd" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="7Ja64GBdyGe" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+              <node concept="1rXfSq" id="7Ja64GBdF1e" role="2Oq$k0">
+                <ref role="37wK5l" node="7Ja64GBdD1A" resolve="zipWithIntRange" />
+                <node concept="37vLTw" id="7Ja64GBdFbl" role="37wK5m">
+                  <ref role="3cqZAo" node="7Ja64GBdvNa" resolve="seq" />
+                </node>
+              </node>
+            </node>
+            <node concept="3$u5V9" id="7Ja64GBd$y1" role="2OqNvi">
+              <node concept="1bVj0M" id="7Ja64GBd$y3" role="23t8la">
+                <node concept="3clFbS" id="7Ja64GBd$y4" role="1bW5cS">
+                  <node concept="3clFbF" id="7Ja64GBd$MY" role="3cqZAp">
+                    <node concept="1LFfDK" id="7Ja64GBd_pz" role="3clFbG">
+                      <node concept="3cmrfG" id="7Ja64GBd_Cs" role="1LF_Uc">
+                        <property role="3cmrfH" value="0" />
+                      </node>
+                      <node concept="37vLTw" id="7Ja64GBd$MX" role="1LFl5Q">
+                        <ref role="3cqZAo" node="7Ja64GBd$y5" resolve="it" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="7Ja64GBd$y5" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="7Ja64GBd$y6" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7Ja64GBdvN5" role="1B3o_S" />
+      <node concept="16euLQ" id="7Ja64GBdvN6" role="16eVyc">
+        <property role="TrG5h" value="T1" />
+      </node>
+      <node concept="A3Dl8" id="7Ja64GBdvN8" role="3clF45">
+        <node concept="16syzq" id="7Ja64GBdvN9" role="A3Ik2">
+          <ref role="16sUi3" node="7Ja64GBdvN6" resolve="T1" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7Ja64GBdvNa" role="3clF46">
+        <property role="TrG5h" value="seq" />
+        <node concept="A3Dl8" id="7Ja64GBdvNb" role="1tU5fm">
+          <node concept="16syzq" id="7Ja64GBdvNc" role="A3Ik2">
+            <ref role="16sUi3" node="7Ja64GBdvN6" resolve="T1" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7Ja64GBdvNd" role="3clF46">
+        <property role="TrG5h" value="selector" />
+        <node concept="1ajhzC" id="7Ja64GBdvNe" role="1tU5fm">
+          <node concept="16syzq" id="7Ja64GBdvNf" role="1ajw0F">
+            <ref role="16sUi3" node="7Ja64GBdvN6" resolve="T1" />
+          </node>
+          <node concept="10Oyi0" id="7Ja64GBdvNg" role="1ajw0F" />
+          <node concept="10P_77" id="7Ja64GBdzB6" role="1ajl9A" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Ja64GBdx5W" role="jymVt" />
+    <node concept="2YIFZL" id="7Ja64GBdw8k" role="jymVt">
+      <property role="TrG5h" value="forEachWithIndex" />
+      <node concept="3clFbS" id="7Ja64GBdw8l" role="3clF47">
+        <node concept="3clFbF" id="7Ja64GBdw8m" role="3cqZAp">
+          <node concept="2OqwBi" id="7Ja64GBdw8n" role="3clFbG">
+            <property role="hSjvv" value="true" />
+            <node concept="2es0OD" id="7Ja64GBdAM3" role="2OqNvi">
+              <node concept="1bVj0M" id="7Ja64GBdAM5" role="23t8la">
+                <node concept="3clFbS" id="7Ja64GBdAM6" role="1bW5cS">
+                  <node concept="3clFbF" id="7Ja64GBdAM7" role="3cqZAp">
+                    <node concept="2Sg_IR" id="7Ja64GBdAM8" role="3clFbG">
+                      <node concept="37vLTw" id="7Ja64GBdAM9" role="2SgG2M">
+                        <ref role="3cqZAo" node="7Ja64GBdw8M" resolve="selector" />
+                      </node>
+                      <node concept="1LFfDK" id="7Ja64GBdAMa" role="2SgHGx">
+                        <node concept="3cmrfG" id="7Ja64GBdAMb" role="1LF_Uc">
+                          <property role="3cmrfH" value="0" />
+                        </node>
+                        <node concept="37vLTw" id="7Ja64GBdAMc" role="1LFl5Q">
+                          <ref role="3cqZAo" node="7Ja64GBdAMg" resolve="it" />
+                        </node>
+                      </node>
+                      <node concept="1LFfDK" id="7Ja64GBdAMd" role="2SgHGx">
+                        <node concept="3cmrfG" id="7Ja64GBdAMe" role="1LF_Uc">
+                          <property role="3cmrfH" value="1" />
+                        </node>
+                        <node concept="37vLTw" id="7Ja64GBdAMf" role="1LFl5Q">
+                          <ref role="3cqZAo" node="7Ja64GBdAMg" resolve="it" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="7Ja64GBdAMg" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="7Ja64GBdAMh" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+            <node concept="1rXfSq" id="7Ja64GBdFvl" role="2Oq$k0">
+              <ref role="37wK5l" node="7Ja64GBdD1A" resolve="zipWithIntRange" />
+              <node concept="37vLTw" id="7Ja64GBdFCa" role="37wK5m">
+                <ref role="3cqZAo" node="7Ja64GBdw8J" resolve="seq" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7Ja64GBdw8E" role="1B3o_S" />
+      <node concept="16euLQ" id="7Ja64GBdw8F" role="16eVyc">
+        <property role="TrG5h" value="T1" />
+      </node>
+      <node concept="3cqZAl" id="7Ja64GBdA1i" role="3clF45" />
+      <node concept="37vLTG" id="7Ja64GBdw8J" role="3clF46">
+        <property role="TrG5h" value="seq" />
+        <node concept="A3Dl8" id="7Ja64GBdw8K" role="1tU5fm">
+          <node concept="16syzq" id="7Ja64GBdw8L" role="A3Ik2">
+            <ref role="16sUi3" node="7Ja64GBdw8F" resolve="T1" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7Ja64GBdw8M" role="3clF46">
+        <property role="TrG5h" value="selector" />
+        <node concept="1ajhzC" id="7Ja64GBdw8N" role="1tU5fm">
+          <node concept="16syzq" id="7Ja64GBdw8O" role="1ajw0F">
+            <ref role="16sUi3" node="7Ja64GBdw8F" resolve="T1" />
+          </node>
+          <node concept="10Oyi0" id="7Ja64GBdw8P" role="1ajw0F" />
+          <node concept="3cqZAl" id="7Ja64GBdAln" role="1ajl9A" />
+        </node>
+      </node>
+    </node>
     <node concept="3Tm1VV" id="7Ja64GBadP$" role="1B3o_S" />
   </node>
 </model>
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
index 9f0266b583..45a1a8a71c 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
@@ -511,8 +511,8 @@
                             <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
                           </node>
                         </node>
-                        <node concept="chp4Y" id="7Ja64GBawoq" role="3oSUPX">
-                          <ref role="cht4Q" to="pkab:6RqC_fThQjL" resolve="SelectWithIndexOperation" />
+                        <node concept="chp4Y" id="7Ja64GBe6dP" role="3oSUPX">
+                          <ref role="cht4Q" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
                         </node>
                       </node>
                       <node concept="3TrEf2" id="7Ja64GBar6k" role="2OqNvi">
@@ -546,6 +546,148 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="7Ja64GBe0Bj" role="3acgRq">
+      <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
+      <node concept="gft3U" id="7Ja64GBe0Bk" role="1lVwrX">
+        <node concept="2YIFZM" id="7Ja64GBe17D" role="gfFT$">
+          <ref role="37wK5l" to="96gm:7Ja64GBdvMJ" resolve="whereWithIndex" />
+          <ref role="1Pybhc" to="96gm:7Ja64GBadPz" resolve="WithIndexOperationUtil" />
+          <node concept="10Nm6u" id="7Ja64GBe17E" role="37wK5m">
+            <node concept="29HgVG" id="7Ja64GBe17F" role="lGtFl">
+              <node concept="3NFfHV" id="7Ja64GBe17G" role="3NFExx">
+                <node concept="3clFbS" id="7Ja64GBe17H" role="2VODD2">
+                  <node concept="3clFbF" id="7Ja64GBe17I" role="3cqZAp">
+                    <node concept="2OqwBi" id="7Ja64GBe17J" role="3clFbG">
+                      <node concept="3TrEf2" id="7Ja64GBe17K" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                      </node>
+                      <node concept="30H73N" id="7Ja64GBe17L" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="10Nm6u" id="7Ja64GBe17M" role="37wK5m">
+            <node concept="1sPUBX" id="7Ja64GBe17N" role="lGtFl">
+              <ref role="v9R2y" node="54jQkZ9fKWX" resolve="switchClosureLiteral" />
+              <node concept="3NFfHV" id="7Ja64GBe17O" role="1sPUBK">
+                <node concept="3clFbS" id="7Ja64GBe17P" role="2VODD2">
+                  <node concept="3clFbF" id="7Ja64GBe17Q" role="3cqZAp">
+                    <node concept="2OqwBi" id="7Ja64GBe17R" role="3clFbG">
+                      <node concept="1PxgMI" id="7Ja64GBe17S" role="2Oq$k0">
+                        <node concept="2OqwBi" id="7Ja64GBe17T" role="1m5AlR">
+                          <node concept="30H73N" id="7Ja64GBe17U" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="7Ja64GBe17V" role="2OqNvi">
+                            <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                          </node>
+                        </node>
+                        <node concept="chp4Y" id="7Ja64GBe65N" role="3oSUPX">
+                          <ref role="cht4Q" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
+                        </node>
+                      </node>
+                      <node concept="3TrEf2" id="7Ja64GBe17X" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="7Ja64GBe0BE" role="30HLyM">
+        <node concept="3clFbS" id="7Ja64GBe0BF" role="2VODD2">
+          <node concept="3clFbF" id="7Ja64GBe0BG" role="3cqZAp">
+            <node concept="2OqwBi" id="7Ja64GBe0BH" role="3clFbG">
+              <node concept="2OqwBi" id="7Ja64GBe0BI" role="2Oq$k0">
+                <node concept="30H73N" id="7Ja64GBe0BJ" role="2Oq$k0" />
+                <node concept="3TrEf2" id="7Ja64GBe0BK" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                </node>
+              </node>
+              <node concept="1mIQ4w" id="7Ja64GBe0BL" role="2OqNvi">
+                <node concept="chp4Y" id="7Ja64GBe10V" role="cj9EA">
+                  <ref role="cht4Q" to="pkab:7Ja64GBdQxd" resolve="WhereWithIndexOperation" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="7Ja64GBeiOs" role="3acgRq">
+      <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
+      <node concept="gft3U" id="7Ja64GBeiOt" role="1lVwrX">
+        <node concept="2YIFZM" id="7Ja64GBejPg" role="gfFT$">
+          <ref role="37wK5l" to="96gm:7Ja64GBdw8k" resolve="forEachWithIndex" />
+          <ref role="1Pybhc" to="96gm:7Ja64GBadPz" resolve="WithIndexOperationUtil" />
+          <node concept="10Nm6u" id="7Ja64GBejPh" role="37wK5m">
+            <node concept="29HgVG" id="7Ja64GBejPi" role="lGtFl">
+              <node concept="3NFfHV" id="7Ja64GBejPj" role="3NFExx">
+                <node concept="3clFbS" id="7Ja64GBejPk" role="2VODD2">
+                  <node concept="3clFbF" id="7Ja64GBejPl" role="3cqZAp">
+                    <node concept="2OqwBi" id="7Ja64GBejPm" role="3clFbG">
+                      <node concept="3TrEf2" id="7Ja64GBejPn" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                      </node>
+                      <node concept="30H73N" id="7Ja64GBejPo" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="10Nm6u" id="7Ja64GBejPp" role="37wK5m">
+            <node concept="1sPUBX" id="7Ja64GBejPq" role="lGtFl">
+              <ref role="v9R2y" node="54jQkZ9fKWX" resolve="switchClosureLiteral" />
+              <node concept="3NFfHV" id="7Ja64GBejPr" role="1sPUBK">
+                <node concept="3clFbS" id="7Ja64GBejPs" role="2VODD2">
+                  <node concept="3clFbF" id="7Ja64GBejPt" role="3cqZAp">
+                    <node concept="2OqwBi" id="7Ja64GBejPu" role="3clFbG">
+                      <node concept="1PxgMI" id="7Ja64GBejPv" role="2Oq$k0">
+                        <node concept="2OqwBi" id="7Ja64GBejPw" role="1m5AlR">
+                          <node concept="30H73N" id="7Ja64GBejPx" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="7Ja64GBejPy" role="2OqNvi">
+                            <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                          </node>
+                        </node>
+                        <node concept="chp4Y" id="7Ja64GBejPz" role="3oSUPX">
+                          <ref role="cht4Q" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
+                        </node>
+                      </node>
+                      <node concept="3TrEf2" id="7Ja64GBejP$" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="7Ja64GBeiON" role="30HLyM">
+        <node concept="3clFbS" id="7Ja64GBeiOO" role="2VODD2">
+          <node concept="3clFbF" id="7Ja64GBeiOP" role="3cqZAp">
+            <node concept="2OqwBi" id="7Ja64GBeiOQ" role="3clFbG">
+              <node concept="2OqwBi" id="7Ja64GBeiOR" role="2Oq$k0">
+                <node concept="30H73N" id="7Ja64GBeiOS" role="2Oq$k0" />
+                <node concept="3TrEf2" id="7Ja64GBeiOT" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                </node>
+              </node>
+              <node concept="1mIQ4w" id="7Ja64GBeiOU" role="2OqNvi">
+                <node concept="chp4Y" id="7Ja64GBejEs" role="cj9EA">
+                  <ref role="cht4Q" to="pkab:7Ja64GBeeCt" resolve="ForEachWithIndexOperation" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="jVnub" id="54jQkZ9fKWX">
     <property role="TrG5h" value="switchClosureLiteral" />
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps
index b16467fbe6..f6e47e7cc3 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps
@@ -265,7 +265,7 @@
     </node>
   </node>
   <node concept="37WguZ" id="7Ja64GB9veW">
-    <property role="TrG5h" value="selectWithIndex_operation" />
+    <property role="TrG5h" value="withIndex_operations" />
     <node concept="37WvkG" id="7Ja64GB9veX" role="37WGs$">
       <ref role="37XkoT" to="pkab:6RqC_fThQjL" resolve="SelectWithIndexOperation" />
       <node concept="37Y9Zx" id="7Ja64GB9veY" role="37ZfLb">
@@ -461,6 +461,396 @@
         </node>
       </node>
     </node>
+    <node concept="37WvkG" id="7Ja64GBdSxq" role="37WGs$">
+      <ref role="37XkoT" to="pkab:7Ja64GBdQxd" resolve="WhereWithIndexOperation" />
+      <node concept="37Y9Zx" id="7Ja64GBdSxr" role="37ZfLb">
+        <node concept="3clFbS" id="7Ja64GBdSxs" role="2VODD2">
+          <node concept="3clFbJ" id="7Ja64GBdSyd" role="3cqZAp">
+            <node concept="2OqwBi" id="7Ja64GBdSye" role="3clFbw">
+              <node concept="1r4N5L" id="7Ja64GBdTJP" role="2Oq$k0" />
+              <node concept="1mIQ4w" id="7Ja64GBdSyg" role="2OqNvi">
+                <node concept="chp4Y" id="7Ja64GBdSyh" role="cj9EA">
+                  <ref role="cht4Q" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="7Ja64GBdSyi" role="3clFbx">
+              <node concept="3clFbF" id="7Ja64GBdSyj" role="3cqZAp">
+                <node concept="2OqwBi" id="7Ja64GBdSyk" role="3clFbG">
+                  <node concept="2OqwBi" id="7Ja64GBdSyl" role="2Oq$k0">
+                    <node concept="1r4Lsj" id="7Ja64GBdSym" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="7Ja64GBdSyn" role="2OqNvi">
+                      <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                    </node>
+                  </node>
+                  <node concept="2oxUTD" id="7Ja64GBdSyo" role="2OqNvi">
+                    <node concept="2OqwBi" id="7Ja64GBdSyp" role="2oxUTC">
+                      <node concept="2OqwBi" id="7Ja64GBdSyq" role="2Oq$k0">
+                        <node concept="1PxgMI" id="7Ja64GBdSyr" role="2Oq$k0">
+                          <node concept="chp4Y" id="7Ja64GBdSys" role="3oSUPX">
+                            <ref role="cht4Q" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
+                          </node>
+                          <node concept="1r4N5L" id="7Ja64GBdSyt" role="1m5AlR" />
+                        </node>
+                        <node concept="3TrEf2" id="7Ja64GBdSyu" role="2OqNvi">
+                          <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                        </node>
+                      </node>
+                      <node concept="3YRAZt" id="7Ja64GBdSyv" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="9aQIb" id="7Ja64GBdSyw" role="9aQIa">
+              <node concept="3clFbS" id="7Ja64GBdSyx" role="9aQI4">
+                <node concept="3cpWs8" id="7Ja64GBdSyy" role="3cqZAp">
+                  <node concept="3cpWsn" id="7Ja64GBdSyz" role="3cpWs9">
+                    <property role="TrG5h" value="sel" />
+                    <node concept="3Tqbb2" id="7Ja64GBdSy$" role="1tU5fm">
+                      <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
+                    </node>
+                    <node concept="2OqwBi" id="7Ja64GBdSy_" role="33vP2m">
+                      <node concept="1r4Lsj" id="7Ja64GBdSyA" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="7Ja64GBdSyB" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="7Ja64GBdSyC" role="3cqZAp">
+                  <node concept="3clFbS" id="7Ja64GBdSyD" role="3clFbx">
+                    <node concept="3clFbF" id="7Ja64GBdSyE" role="3cqZAp">
+                      <node concept="37vLTI" id="7Ja64GBdSyF" role="3clFbG">
+                        <node concept="2OqwBi" id="7Ja64GBdSyG" role="37vLTx">
+                          <node concept="2OqwBi" id="7Ja64GBdSyH" role="2Oq$k0">
+                            <node concept="1r4Lsj" id="7Ja64GBdSyI" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="7Ja64GBdSyJ" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                            </node>
+                          </node>
+                          <node concept="2DeJnY" id="7Ja64GBdSyK" role="2OqNvi">
+                            <ref role="1A9B2P" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="7Ja64GBdSyL" role="37vLTJ">
+                          <ref role="3cqZAo" node="7Ja64GBdSyz" resolve="sel" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWs8" id="7Ja64GBdSyM" role="3cqZAp">
+                      <node concept="3cpWsn" id="7Ja64GBdSyN" role="3cpWs9">
+                        <property role="TrG5h" value="pDeclIt" />
+                        <node concept="3Tqbb2" id="7Ja64GBdSyO" role="1tU5fm">
+                          <ref role="ehGHo" to="tp2q:hwRh6j$" resolve="SmartClosureParameterDeclaration" />
+                        </node>
+                        <node concept="2OqwBi" id="7Ja64GBdSyP" role="33vP2m">
+                          <node concept="2OqwBi" id="7Ja64GBdSyQ" role="2Oq$k0">
+                            <node concept="1PxgMI" id="7Ja64GBdSyR" role="2Oq$k0">
+                              <node concept="chp4Y" id="7Ja64GBdSyS" role="3oSUPX">
+                                <ref role="cht4Q" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+                              </node>
+                              <node concept="37vLTw" id="7Ja64GBdSyT" role="1m5AlR">
+                                <ref role="3cqZAo" node="7Ja64GBdSyz" resolve="sel" />
+                              </node>
+                            </node>
+                            <node concept="3Tsc0h" id="7Ja64GBdSyU" role="2OqNvi">
+                              <ref role="3TtcxE" to="tp2c:htbW2KO" resolve="parameter" />
+                            </node>
+                          </node>
+                          <node concept="2DeJg1" id="7Ja64GBdSyV" role="2OqNvi">
+                            <ref role="1A0vxQ" to="tp2q:hwRh6j$" resolve="SmartClosureParameterDeclaration" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="7Ja64GBdSyW" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Ja64GBdSyX" role="3clFbG">
+                        <node concept="2OqwBi" id="7Ja64GBdSyY" role="2Oq$k0">
+                          <node concept="37vLTw" id="7Ja64GBdSyZ" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Ja64GBdSyN" resolve="pDeclIt" />
+                          </node>
+                          <node concept="3TrcHB" id="7Ja64GBdSz0" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                        <node concept="tyxLq" id="7Ja64GBdSz1" role="2OqNvi">
+                          <node concept="Xl_RD" id="7Ja64GBdSz2" role="tz02z">
+                            <property role="Xl_RC" value="it" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWs8" id="7Ja64GBdSz3" role="3cqZAp">
+                      <node concept="3cpWsn" id="7Ja64GBdSz4" role="3cpWs9">
+                        <property role="TrG5h" value="pDeclIdx" />
+                        <node concept="3Tqbb2" id="7Ja64GBdSz5" role="1tU5fm">
+                          <ref role="ehGHo" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
+                        </node>
+                        <node concept="2OqwBi" id="7Ja64GBdSz6" role="33vP2m">
+                          <node concept="2OqwBi" id="7Ja64GBdSz7" role="2Oq$k0">
+                            <node concept="1PxgMI" id="7Ja64GBdSz8" role="2Oq$k0">
+                              <node concept="chp4Y" id="7Ja64GBdSz9" role="3oSUPX">
+                                <ref role="cht4Q" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+                              </node>
+                              <node concept="37vLTw" id="7Ja64GBdSza" role="1m5AlR">
+                                <ref role="3cqZAo" node="7Ja64GBdSyz" resolve="sel" />
+                              </node>
+                            </node>
+                            <node concept="3Tsc0h" id="7Ja64GBdSzb" role="2OqNvi">
+                              <ref role="3TtcxE" to="tp2c:htbW2KO" resolve="parameter" />
+                            </node>
+                          </node>
+                          <node concept="2DeJg1" id="7Ja64GBdSzc" role="2OqNvi">
+                            <ref role="1A0vxQ" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="7Ja64GBdSzd" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Ja64GBdSze" role="3clFbG">
+                        <node concept="2OqwBi" id="7Ja64GBdSzf" role="2Oq$k0">
+                          <node concept="37vLTw" id="7Ja64GBdSzg" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Ja64GBdSz4" resolve="pDeclIdx" />
+                          </node>
+                          <node concept="3TrcHB" id="7Ja64GBdSzh" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                        <node concept="tyxLq" id="7Ja64GBdSzi" role="2OqNvi">
+                          <node concept="Xl_RD" id="7Ja64GBdSzj" role="tz02z">
+                            <property role="Xl_RC" value="index" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="7Ja64GBdSzk" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Ja64GBdSzl" role="3clFbG">
+                        <node concept="2OqwBi" id="7Ja64GBdSzm" role="2Oq$k0">
+                          <node concept="37vLTw" id="7Ja64GBdSzn" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Ja64GBdSz4" resolve="pDeclIdx" />
+                          </node>
+                          <node concept="3TrEf2" id="7Ja64GBdSzo" role="2OqNvi">
+                            <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
+                          </node>
+                        </node>
+                        <node concept="2oxUTD" id="7Ja64GBdSzp" role="2OqNvi">
+                          <node concept="2c44tf" id="7Ja64GBdSzq" role="2oxUTC">
+                            <node concept="10Oyi0" id="7Ja64GBdSzr" role="2c44tc" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="7Ja64GBdSzs" role="3cqZAp" />
+                  </node>
+                  <node concept="2OqwBi" id="7Ja64GBdSzt" role="3clFbw">
+                    <node concept="37vLTw" id="7Ja64GBdSzu" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7Ja64GBdSyz" resolve="sel" />
+                    </node>
+                    <node concept="3w_OXm" id="7Ja64GBdSzv" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="37WvkG" id="7Ja64GBei$m" role="37WGs$">
+      <ref role="37XkoT" to="pkab:7Ja64GBeeCt" resolve="ForEachWithIndexOperation" />
+      <node concept="37Y9Zx" id="7Ja64GBei$n" role="37ZfLb">
+        <node concept="3clFbS" id="7Ja64GBei$o" role="2VODD2">
+          <node concept="3clFbJ" id="7Ja64GBei$p" role="3cqZAp">
+            <node concept="2OqwBi" id="7Ja64GBei$q" role="3clFbw">
+              <node concept="1r4N5L" id="7Ja64GBei$r" role="2Oq$k0" />
+              <node concept="1mIQ4w" id="7Ja64GBei$s" role="2OqNvi">
+                <node concept="chp4Y" id="7Ja64GBei$t" role="cj9EA">
+                  <ref role="cht4Q" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="7Ja64GBei$u" role="3clFbx">
+              <node concept="3clFbF" id="7Ja64GBei$v" role="3cqZAp">
+                <node concept="2OqwBi" id="7Ja64GBei$w" role="3clFbG">
+                  <node concept="2OqwBi" id="7Ja64GBei$x" role="2Oq$k0">
+                    <node concept="1r4Lsj" id="7Ja64GBei$y" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="7Ja64GBei$z" role="2OqNvi">
+                      <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                    </node>
+                  </node>
+                  <node concept="2oxUTD" id="7Ja64GBei$$" role="2OqNvi">
+                    <node concept="2OqwBi" id="7Ja64GBei$_" role="2oxUTC">
+                      <node concept="2OqwBi" id="7Ja64GBei$A" role="2Oq$k0">
+                        <node concept="1PxgMI" id="7Ja64GBei$B" role="2Oq$k0">
+                          <node concept="chp4Y" id="7Ja64GBei$C" role="3oSUPX">
+                            <ref role="cht4Q" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
+                          </node>
+                          <node concept="1r4N5L" id="7Ja64GBei$D" role="1m5AlR" />
+                        </node>
+                        <node concept="3TrEf2" id="7Ja64GBei$E" role="2OqNvi">
+                          <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                        </node>
+                      </node>
+                      <node concept="3YRAZt" id="7Ja64GBei$F" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="9aQIb" id="7Ja64GBei$G" role="9aQIa">
+              <node concept="3clFbS" id="7Ja64GBei$H" role="9aQI4">
+                <node concept="3cpWs8" id="7Ja64GBei$I" role="3cqZAp">
+                  <node concept="3cpWsn" id="7Ja64GBei$J" role="3cpWs9">
+                    <property role="TrG5h" value="sel" />
+                    <node concept="3Tqbb2" id="7Ja64GBei$K" role="1tU5fm">
+                      <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
+                    </node>
+                    <node concept="2OqwBi" id="7Ja64GBei$L" role="33vP2m">
+                      <node concept="1r4Lsj" id="7Ja64GBei$M" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="7Ja64GBei$N" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="7Ja64GBei$O" role="3cqZAp">
+                  <node concept="3clFbS" id="7Ja64GBei$P" role="3clFbx">
+                    <node concept="3clFbF" id="7Ja64GBei$Q" role="3cqZAp">
+                      <node concept="37vLTI" id="7Ja64GBei$R" role="3clFbG">
+                        <node concept="2OqwBi" id="7Ja64GBei$S" role="37vLTx">
+                          <node concept="2OqwBi" id="7Ja64GBei$T" role="2Oq$k0">
+                            <node concept="1r4Lsj" id="7Ja64GBei$U" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="7Ja64GBei$V" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                            </node>
+                          </node>
+                          <node concept="2DeJnY" id="7Ja64GBei$W" role="2OqNvi">
+                            <ref role="1A9B2P" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="7Ja64GBei$X" role="37vLTJ">
+                          <ref role="3cqZAo" node="7Ja64GBei$J" resolve="sel" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWs8" id="7Ja64GBei$Y" role="3cqZAp">
+                      <node concept="3cpWsn" id="7Ja64GBei$Z" role="3cpWs9">
+                        <property role="TrG5h" value="pDeclIt" />
+                        <node concept="3Tqbb2" id="7Ja64GBei_0" role="1tU5fm">
+                          <ref role="ehGHo" to="tp2q:hwRh6j$" resolve="SmartClosureParameterDeclaration" />
+                        </node>
+                        <node concept="2OqwBi" id="7Ja64GBei_1" role="33vP2m">
+                          <node concept="2OqwBi" id="7Ja64GBei_2" role="2Oq$k0">
+                            <node concept="1PxgMI" id="7Ja64GBei_3" role="2Oq$k0">
+                              <node concept="chp4Y" id="7Ja64GBei_4" role="3oSUPX">
+                                <ref role="cht4Q" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+                              </node>
+                              <node concept="37vLTw" id="7Ja64GBei_5" role="1m5AlR">
+                                <ref role="3cqZAo" node="7Ja64GBei$J" resolve="sel" />
+                              </node>
+                            </node>
+                            <node concept="3Tsc0h" id="7Ja64GBei_6" role="2OqNvi">
+                              <ref role="3TtcxE" to="tp2c:htbW2KO" resolve="parameter" />
+                            </node>
+                          </node>
+                          <node concept="2DeJg1" id="7Ja64GBei_7" role="2OqNvi">
+                            <ref role="1A0vxQ" to="tp2q:hwRh6j$" resolve="SmartClosureParameterDeclaration" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="7Ja64GBei_8" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Ja64GBei_9" role="3clFbG">
+                        <node concept="2OqwBi" id="7Ja64GBei_a" role="2Oq$k0">
+                          <node concept="37vLTw" id="7Ja64GBei_b" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Ja64GBei$Z" resolve="pDeclIt" />
+                          </node>
+                          <node concept="3TrcHB" id="7Ja64GBei_c" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                        <node concept="tyxLq" id="7Ja64GBei_d" role="2OqNvi">
+                          <node concept="Xl_RD" id="7Ja64GBei_e" role="tz02z">
+                            <property role="Xl_RC" value="it" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWs8" id="7Ja64GBei_f" role="3cqZAp">
+                      <node concept="3cpWsn" id="7Ja64GBei_g" role="3cpWs9">
+                        <property role="TrG5h" value="pDeclIdx" />
+                        <node concept="3Tqbb2" id="7Ja64GBei_h" role="1tU5fm">
+                          <ref role="ehGHo" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
+                        </node>
+                        <node concept="2OqwBi" id="7Ja64GBei_i" role="33vP2m">
+                          <node concept="2OqwBi" id="7Ja64GBei_j" role="2Oq$k0">
+                            <node concept="1PxgMI" id="7Ja64GBei_k" role="2Oq$k0">
+                              <node concept="chp4Y" id="7Ja64GBei_l" role="3oSUPX">
+                                <ref role="cht4Q" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+                              </node>
+                              <node concept="37vLTw" id="7Ja64GBei_m" role="1m5AlR">
+                                <ref role="3cqZAo" node="7Ja64GBei$J" resolve="sel" />
+                              </node>
+                            </node>
+                            <node concept="3Tsc0h" id="7Ja64GBei_n" role="2OqNvi">
+                              <ref role="3TtcxE" to="tp2c:htbW2KO" resolve="parameter" />
+                            </node>
+                          </node>
+                          <node concept="2DeJg1" id="7Ja64GBei_o" role="2OqNvi">
+                            <ref role="1A0vxQ" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="7Ja64GBei_p" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Ja64GBei_q" role="3clFbG">
+                        <node concept="2OqwBi" id="7Ja64GBei_r" role="2Oq$k0">
+                          <node concept="37vLTw" id="7Ja64GBei_s" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Ja64GBei_g" resolve="pDeclIdx" />
+                          </node>
+                          <node concept="3TrcHB" id="7Ja64GBei_t" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                        <node concept="tyxLq" id="7Ja64GBei_u" role="2OqNvi">
+                          <node concept="Xl_RD" id="7Ja64GBei_v" role="tz02z">
+                            <property role="Xl_RC" value="index" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="7Ja64GBei_w" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Ja64GBei_x" role="3clFbG">
+                        <node concept="2OqwBi" id="7Ja64GBei_y" role="2Oq$k0">
+                          <node concept="37vLTw" id="7Ja64GBei_z" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Ja64GBei_g" resolve="pDeclIdx" />
+                          </node>
+                          <node concept="3TrEf2" id="7Ja64GBei_$" role="2OqNvi">
+                            <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
+                          </node>
+                        </node>
+                        <node concept="2oxUTD" id="7Ja64GBei__" role="2OqNvi">
+                          <node concept="2c44tf" id="7Ja64GBei_A" role="2oxUTC">
+                            <node concept="10Oyi0" id="7Ja64GBei_B" role="2c44tc" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="7Ja64GBei_C" role="3cqZAp" />
+                  </node>
+                  <node concept="2OqwBi" id="7Ja64GBei_D" role="3clFbw">
+                    <node concept="37vLTw" id="7Ja64GBei_E" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7Ja64GBei$J" resolve="sel" />
+                    </node>
+                    <node concept="3w_OXm" id="7Ja64GBei_F" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
index f3eab0c673..c24835c5ad 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
@@ -133,6 +133,23 @@
     <property role="TrG5h" value="SelectWithIndexOperation" />
     <property role="34LRSv" value="selectIdx" />
     <property role="R4oN_" value="transform each element and index" />
+    <property role="3GE5qa" value="withIndexOperations" />
+    <ref role="1TJDcQ" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
+  </node>
+  <node concept="1TIwiD" id="7Ja64GBdQxd">
+    <property role="EcuMT" value="8919968723020245069" />
+    <property role="TrG5h" value="WhereWithIndexOperation" />
+    <property role="34LRSv" value="whereIdx" />
+    <property role="R4oN_" value="include only matched element" />
+    <property role="3GE5qa" value="withIndexOperations" />
+    <ref role="1TJDcQ" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
+  </node>
+  <node concept="1TIwiD" id="7Ja64GBeeCt">
+    <property role="EcuMT" value="8919968723020343837" />
+    <property role="TrG5h" value="ForEachWithIndexOperation" />
+    <property role="34LRSv" value="forEachIdx" />
+    <property role="R4oN_" value="execute for each element with index" />
+    <property role="3GE5qa" value="withIndexOperations" />
     <ref role="1TJDcQ" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
   </node>
 </model>
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
index d43efae57e..5ba1ffdb81 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
@@ -10,6 +10,7 @@
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
     <import index="pkab" ref="r:63a6d225-96f6-404a-a9eb-033dc2f950a1(de.itemis.mps.baseLanguageExtensions.structure)" implicit="true" />
     <import index="tp2q" ref="r:00000000-0000-4000-0000-011c8959032e(jetbrains.mps.baseLanguage.collections.structure)" implicit="true" />
+    <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -63,6 +64,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
@@ -136,6 +138,7 @@
       </concept>
       <concept id="1174658326157" name="jetbrains.mps.lang.typesystem.structure.CreateEquationStatement" flags="nn" index="1Z5TYs" />
       <concept id="1174660718586" name="jetbrains.mps.lang.typesystem.structure.AbstractEquationStatement" flags="nn" index="1Zf1VF">
+        <property id="1206359757216" name="checkOnly" index="3wDh2S" />
         <child id="1174660783413" name="leftExpression" index="1ZfhK$" />
         <child id="1174660783414" name="rightExpression" index="1ZfhKB" />
       </concept>
@@ -150,6 +153,7 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
+      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -810,6 +814,7 @@
   </node>
   <node concept="1YbPZF" id="6RqC_fThRNY">
     <property role="TrG5h" value="typeof_SelectWithIndexOperation" />
+    <property role="3GE5qa" value="withIndexOperations" />
     <node concept="3clFbS" id="6RqC_fThRNZ" role="18ibNy">
       <node concept="1ZxtTE" id="6RqC_fThS0E" role="3cqZAp">
         <property role="TrG5h" value="seqParamType" />
@@ -891,5 +896,160 @@
       <ref role="1YaFvo" to="pkab:6RqC_fThQjL" resolve="SelectWithIndexOperation" />
     </node>
   </node>
+  <node concept="1YbPZF" id="7Ja64GBdQEI">
+    <property role="TrG5h" value="typeof_WhereWithIndexOperation" />
+    <property role="3GE5qa" value="withIndexOperations" />
+    <node concept="3clFbS" id="7Ja64GBdQEJ" role="18ibNy">
+      <node concept="1ZxtTE" id="hwyZbXq" role="3cqZAp">
+        <property role="TrG5h" value="paramType" />
+      </node>
+      <node concept="3clFbF" id="34jUqC_VPJv" role="3cqZAp">
+        <node concept="2YIFZM" id="34jUqC_VR5x" role="3clFbG">
+          <ref role="37wK5l" to="tp2v:4Iwp2tSBzXf" resolve="inferInternalOperation" />
+          <ref role="1Pybhc" to="tp2v:4Iwp2tSBvWa" resolve="OperationInference" />
+          <node concept="1YBJjd" id="34jUqC_VR5y" role="37wK5m">
+            <ref role="1YBMHb" node="7Ja64GBdQEL" resolve="wo" />
+          </node>
+          <node concept="1Z$b5t" id="34jUqC_VR5z" role="37wK5m">
+            <ref role="1Z$eMM" node="hwyZbXq" resolve="paramType" />
+          </node>
+          <node concept="2c44tf" id="7Ja64GBdQER" role="37wK5m">
+            <node concept="1ajhzC" id="7Ja64GBdQES" role="2c44tc">
+              <node concept="33vP2l" id="7Ja64GBdQET" role="1ajw0F">
+                <node concept="2c44te" id="7Ja64GBdQEU" role="lGtFl">
+                  <node concept="1Z$b5t" id="7Ja64GBdQEV" role="2c44t1">
+                    <ref role="1Z$eMM" node="hwyZbXq" resolve="paramType" />
+                  </node>
+                </node>
+              </node>
+              <node concept="10Oyi0" id="7Ja64GBdR9R" role="1ajw0F" />
+              <node concept="10P_77" id="34jUqC_VR5D" role="1ajl9A" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1Z5TYs" id="hwyZxSY" role="3cqZAp">
+        <node concept="mw_s8" id="hwyZRij" role="1ZfhKB">
+          <node concept="2c44tf" id="hwyZRik" role="mwGJk">
+            <node concept="A3Dl8" id="hwyZRB2" role="2c44tc">
+              <node concept="33vP2l" id="hwyZRB3" role="A3Ik2">
+                <node concept="2c44te" id="hwyZRRP" role="lGtFl">
+                  <node concept="1Z$b5t" id="hwyZS6_" role="2c44t1">
+                    <ref role="1Z$eMM" node="hwyZbXq" resolve="paramType" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="hwyZxT1" role="1ZfhK$">
+          <node concept="1Z2H0r" id="hwyZwPr" role="mwGJk">
+            <node concept="1YBJjd" id="hwyZxjd" role="1Z2MuG">
+              <ref role="1YBMHb" node="7Ja64GBdQEL" resolve="wo" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="7Ja64GBdQEL" role="1YuTPh">
+      <property role="TrG5h" value="whereIdxOp" />
+      <ref role="1YaFvo" to="pkab:7Ja64GBdQxd" resolve="WhereWithIndexOperation" />
+    </node>
+  </node>
+  <node concept="1YbPZF" id="7Ja64GBegld">
+    <property role="TrG5h" value="typeof_ForEachWithIndexOperation" />
+    <property role="3GE5qa" value="withIndexOperations" />
+    <node concept="3clFbS" id="7Ja64GBegle" role="18ibNy">
+      <node concept="1ZxtTE" id="hPGn0$6" role="3cqZAp">
+        <property role="TrG5h" value="paramType" />
+      </node>
+      <node concept="nvevp" id="3qDC_E6ztIL" role="3cqZAp">
+        <node concept="3clFbS" id="3qDC_E6ztIN" role="nvhr_">
+          <node concept="1ZoDhX" id="6DFN5BsVqJf" role="3cqZAp">
+            <property role="3wDh2S" value="false" />
+            <node concept="mw_s8" id="3qDC_E6zv71" role="1ZfhKB">
+              <node concept="2X3wrD" id="3qDC_E6zv6V" role="mwGJk">
+                <ref role="2X3Bk0" node="3qDC_E6ztIR" resolve="O" />
+              </node>
+            </node>
+            <node concept="mw_s8" id="hPGtiwH" role="1ZfhK$">
+              <node concept="2c44tf" id="hPGtiwI" role="mwGJk">
+                <node concept="A3Dl8" id="hPGtiwJ" role="2c44tc">
+                  <node concept="33vP2l" id="hPGtiwK" role="A3Ik2">
+                    <node concept="2c44te" id="hPGtiwL" role="lGtFl">
+                      <node concept="1Z$b5t" id="hPGtiwM" role="2c44t1">
+                        <ref role="1Z$eMM" node="hPGn0$6" resolve="paramType" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1ZobV4" id="hPGmTCs" role="3cqZAp">
+            <node concept="mw_s8" id="hPGmUzT" role="1ZfhKB">
+              <node concept="2c44tf" id="hPGmUzU" role="mwGJk">
+                <node concept="1ajhzC" id="hPGmVdX" role="2c44tc">
+                  <node concept="33vP2l" id="hPGmVOy" role="1ajw0F">
+                    <node concept="2c44te" id="hPGn1GL" role="lGtFl">
+                      <node concept="1Z$b5t" id="hPGn1WU" role="2c44t1">
+                        <ref role="1Z$eMM" node="hPGn0$6" resolve="paramType" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="10Oyi0" id="7Ja64GBegVu" role="1ajw0F" />
+                  <node concept="3cqZAl" id="271UhN2N7Bs" role="1ajl9A" />
+                </node>
+              </node>
+            </node>
+            <node concept="mw_s8" id="hPGmTCw" role="1ZfhK$">
+              <node concept="1Z2H0r" id="hPGmR$c" role="mwGJk">
+                <node concept="2OqwBi" id="hPGmS7e" role="1Z2MuG">
+                  <node concept="1YBJjd" id="hPGmRZV" role="2Oq$k0">
+                    <ref role="1YBMHb" node="7Ja64GBeglg" resolve="vo" />
+                  </node>
+                  <node concept="3TrEf2" id="7Ja64GBegM7" role="2OqNvi">
+                    <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2X1qdy" id="3qDC_E6ztIR" role="2X0Ygz">
+          <property role="TrG5h" value="operandType" />
+          <node concept="2jxLKc" id="3qDC_E6ztIS" role="1tU5fm" />
+        </node>
+        <node concept="1Z2H0r" id="3qDC_E6zWkg" role="nvjzm">
+          <node concept="2OqwBi" id="3qDC_E6zu0P" role="1Z2MuG">
+            <node concept="1YBJjd" id="3qDC_E6ztQz" role="2Oq$k0">
+              <ref role="1YBMHb" node="7Ja64GBeglg" resolve="vo" />
+            </node>
+            <node concept="2qgKlT" id="3qDC_E6zuz8" role="2OqNvi">
+              <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1Z5TYs" id="hz1N4AP" role="3cqZAp">
+        <node concept="mw_s8" id="hz1N55C" role="1ZfhK$">
+          <node concept="1Z2H0r" id="hz1N55D" role="mwGJk">
+            <node concept="1YBJjd" id="hz1N5qN" role="1Z2MuG">
+              <ref role="1YBMHb" node="7Ja64GBeglg" resolve="vo" />
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="hz1N6aE" role="1ZfhKB">
+          <node concept="2c44tf" id="hz1N6aF" role="mwGJk">
+            <node concept="3cqZAl" id="hz1N6vX" role="2c44tc" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="7Ja64GBeglg" role="1YuTPh">
+      <property role="TrG5h" value="forEachIdxOp" />
+      <ref role="1YaFvo" to="pkab:7Ja64GBeeCt" resolve="ForEachWithIndexOperation" />
+    </node>
+  </node>
 </model>
 

From b6214f1436f7fcd5847b7d4eeba975595bc046dd Mon Sep 17 00:00:00 2001
From: Amin Ait Lamqadem <alamqadem@itemis.de>
Date: Thu, 25 Sep 2025 14:18:02 +0200
Subject: [PATCH 12/18] add test and sandbox

---
 ...mis.mps.baseLanguageExtensions.sandbox.mps | 212 +++++++++++++++++
 ...tensions.test.withIndexOperation@tests.mps | 216 ++++++++++++++++++
 2 files changed, 428 insertions(+)

diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
index 23c9854c39..1b5d7efc2d 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
@@ -22,6 +22,7 @@
       </concept>
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1153422105332" name="jetbrains.mps.baseLanguage.structure.RemExpression" flags="nn" index="2dk9JS" />
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1224500799915" name="jetbrains.mps.baseLanguage.structure.BitwiseXorExpression" flags="nn" index="pVQyQ" />
@@ -68,6 +69,7 @@
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
@@ -130,8 +132,11 @@
       <concept id="571742531387697460" name="de.itemis.mps.baseLanguageExtensions.structure.IntegerRangeConstantBound" flags="ng" index="2hHTnT">
         <property id="7488777117046563852" name="value" index="KjLWg" />
       </concept>
+      <concept id="7915817776605258993" name="de.itemis.mps.baseLanguageExtensions.structure.SelectWithIndexOperation" flags="ng" index="2kBsqy" />
       <concept id="5842252078326680676" name="de.itemis.mps.baseLanguageExtensions.structure.GroupByOperation" flags="ng" index="2pSdkF" />
       <concept id="7488777117048605758" name="de.itemis.mps.baseLanguageExtensions.structure.ZipOperation" flags="ng" index="Kbfsy" />
+      <concept id="8919968723020343837" name="de.itemis.mps.baseLanguageExtensions.structure.ForEachWithIndexOperation" flags="ng" index="1sWJ9m" />
+      <concept id="8919968723020245069" name="de.itemis.mps.baseLanguageExtensions.structure.WhereWithIndexOperation" flags="ng" index="1sZn06" />
       <concept id="578371460444482140" name="de.itemis.mps.baseLanguageExtensions.structure.ElvisOperation" flags="ng" index="1w0Eer" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@@ -157,6 +162,9 @@
       <concept id="1172664342967" name="jetbrains.mps.baseLanguage.collections.structure.TakeOperation" flags="nn" index="8ftyA">
         <child id="1172664372046" name="elementsToTake" index="8f$Dv" />
       </concept>
+      <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
+        <child id="1151688676805" name="elementType" index="_ZDj9" />
+      </concept>
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
@@ -1165,5 +1173,209 @@
     </node>
     <node concept="3Tm1VV" id="54jQkZ8XvIV" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="7Ja64GBeFG6">
+    <property role="TrG5h" value="WithIndexOperationSandbox" />
+    <node concept="2YIFZL" id="7Ja64GBeGwu" role="jymVt">
+      <property role="TrG5h" value="usages" />
+      <node concept="3clFbS" id="7Ja64GBeGwx" role="3clF47">
+        <node concept="3cpWs8" id="7Ja64GBeOxe" role="3cqZAp">
+          <node concept="3cpWsn" id="7Ja64GBeOxf" role="3cpWs9">
+            <property role="TrG5h" value="numsAsStrings" />
+            <node concept="_YKpA" id="7Ja64GBeObs" role="1tU5fm">
+              <node concept="17QB3L" id="7Ja64GBeObv" role="_ZDj9" />
+            </node>
+            <node concept="2ShNRf" id="7Ja64GBeOxg" role="33vP2m">
+              <node concept="Tc6Ow" id="7Ja64GBeOxh" role="2ShVmc">
+                <node concept="17QB3L" id="7Ja64GBeOxi" role="HW$YZ" />
+                <node concept="Xl_RD" id="7Ja64GBeOxj" role="HW$Y0">
+                  <property role="Xl_RC" value="one" />
+                </node>
+                <node concept="Xl_RD" id="7Ja64GBeOxk" role="HW$Y0">
+                  <property role="Xl_RC" value="two" />
+                </node>
+                <node concept="Xl_RD" id="7Ja64GBeOxl" role="HW$Y0">
+                  <property role="Xl_RC" value="three" />
+                </node>
+                <node concept="Xl_RD" id="7Ja64GBeOxm" role="HW$Y0">
+                  <property role="Xl_RC" value="four" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7Ja64GBeVmZ" role="3cqZAp" />
+        <node concept="3cpWs8" id="7Ja64GBeUvm" role="3cqZAp">
+          <node concept="3cpWsn" id="7Ja64GBeUvn" role="3cpWs9">
+            <property role="TrG5h" value="indexAsPrefix" />
+            <node concept="A3Dl8" id="7Ja64GBeUts" role="1tU5fm">
+              <node concept="17QB3L" id="7Ja64GBeUtv" role="A3Ik2" />
+            </node>
+            <node concept="2OqwBi" id="7Ja64GBeUvo" role="33vP2m">
+              <property role="hSjvv" value="true" />
+              <node concept="37vLTw" id="7Ja64GBeUvp" role="2Oq$k0">
+                <ref role="3cqZAo" node="7Ja64GBeOxf" resolve="numsAsStrings" />
+              </node>
+              <node concept="2kBsqy" id="7Ja64GBeUvq" role="2OqNvi">
+                <node concept="1bVj0M" id="7Ja64GBeUvr" role="23t8la">
+                  <node concept="3clFbS" id="7Ja64GBeUvs" role="1bW5cS">
+                    <node concept="3clFbF" id="7Ja64GBeUvt" role="3cqZAp">
+                      <node concept="3cpWs3" id="7Ja64GBeUvu" role="3clFbG">
+                        <node concept="37vLTw" id="7Ja64GBeUvv" role="3uHU7w">
+                          <ref role="3cqZAo" node="7Ja64GBeUvz" resolve="it" />
+                        </node>
+                        <node concept="3cpWs3" id="7Ja64GBeUvw" role="3uHU7B">
+                          <node concept="37vLTw" id="7Ja64GBeUvx" role="3uHU7B">
+                            <ref role="3cqZAo" node="7Ja64GBeUv_" resolve="index" />
+                          </node>
+                          <node concept="Xl_RD" id="7Ja64GBeUvy" role="3uHU7w">
+                            <property role="Xl_RC" value=": " />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="7Ja64GBeUvz" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="7Ja64GBeUv$" role="1tU5fm" />
+                  </node>
+                  <node concept="37vLTG" id="7Ja64GBeUv_" role="1bW2Oz">
+                    <property role="TrG5h" value="index" />
+                    <node concept="10Oyi0" id="7Ja64GBeUvA" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7Ja64GBeUXK" role="3cqZAp">
+          <node concept="2OqwBi" id="7Ja64GBeUXH" role="3clFbG">
+            <node concept="10M0yZ" id="7Ja64GBeUXI" role="2Oq$k0">
+              <ref role="1PxDUh" to="wyt6:~System" />
+              <ref role="3cqZAo" to="wyt6:~System.out" />
+            </node>
+            <node concept="liA8E" id="7Ja64GBeUXJ" role="2OqNvi">
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.Object)" resolve="println" />
+              <node concept="37vLTw" id="7Ja64GBeV7f" role="37wK5m">
+                <ref role="3cqZAo" node="7Ja64GBeUvn" resolve="indexAsPrefix" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7Ja64GBeViT" role="3cqZAp" />
+        <node concept="3cpWs8" id="7Ja64GBeNLz" role="3cqZAp">
+          <node concept="3cpWsn" id="7Ja64GBeNL$" role="3cpWs9">
+            <property role="TrG5h" value="onlyEvenIdx" />
+            <node concept="A3Dl8" id="7Ja64GBeNKi" role="1tU5fm">
+              <node concept="17QB3L" id="7Ja64GBeNKl" role="A3Ik2" />
+            </node>
+            <node concept="2OqwBi" id="7Ja64GBeNL_" role="33vP2m">
+              <property role="hSjvv" value="true" />
+              <node concept="37vLTw" id="7Ja64GBeOxn" role="2Oq$k0">
+                <ref role="3cqZAo" node="7Ja64GBeOxf" resolve="list" />
+              </node>
+              <node concept="1sZn06" id="7Ja64GBeNLH" role="2OqNvi">
+                <node concept="1bVj0M" id="7Ja64GBeNLI" role="23t8la">
+                  <node concept="3clFbS" id="7Ja64GBeNLJ" role="1bW5cS">
+                    <node concept="3clFbF" id="7Ja64GBeNLK" role="3cqZAp">
+                      <node concept="3clFbC" id="7Ja64GBeNLL" role="3clFbG">
+                        <node concept="3cmrfG" id="7Ja64GBeNLM" role="3uHU7w">
+                          <property role="3cmrfH" value="0" />
+                        </node>
+                        <node concept="2dk9JS" id="7Ja64GBeNLN" role="3uHU7B">
+                          <node concept="37vLTw" id="7Ja64GBeNLO" role="3uHU7B">
+                            <ref role="3cqZAo" node="7Ja64GBeNLS" resolve="index" />
+                          </node>
+                          <node concept="3cmrfG" id="7Ja64GBeNLP" role="3uHU7w">
+                            <property role="3cmrfH" value="2" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="7Ja64GBeNLQ" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="7Ja64GBeNLR" role="1tU5fm" />
+                  </node>
+                  <node concept="37vLTG" id="7Ja64GBeNLS" role="1bW2Oz">
+                    <property role="TrG5h" value="index" />
+                    <node concept="10Oyi0" id="7Ja64GBeNLT" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7Ja64GBeOec" role="3cqZAp">
+          <node concept="2OqwBi" id="7Ja64GBeOe9" role="3clFbG">
+            <node concept="10M0yZ" id="7Ja64GBeOea" role="2Oq$k0">
+              <ref role="1PxDUh" to="wyt6:~System" />
+              <ref role="3cqZAo" to="wyt6:~System.out" />
+            </node>
+            <node concept="liA8E" id="7Ja64GBeOeb" role="2OqNvi">
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.Object)" resolve="println" />
+              <node concept="37vLTw" id="7Ja64GBeOfZ" role="37wK5m">
+                <ref role="3cqZAo" node="7Ja64GBeNL$" resolve="onlyEvenIdx" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7Ja64GBeVSZ" role="3cqZAp" />
+        <node concept="3clFbF" id="7Ja64GBeW1l" role="3cqZAp">
+          <node concept="2OqwBi" id="7Ja64GBeWIc" role="3clFbG">
+            <property role="hSjvv" value="true" />
+            <node concept="37vLTw" id="7Ja64GBeW1j" role="2Oq$k0">
+              <ref role="3cqZAo" node="7Ja64GBeOxf" resolve="numsAsStrings" />
+            </node>
+            <node concept="1sWJ9m" id="7Ja64GBeX3N" role="2OqNvi">
+              <node concept="1bVj0M" id="7Ja64GBeX3P" role="23t8la">
+                <node concept="3clFbS" id="7Ja64GBeX3Q" role="1bW5cS">
+                  <node concept="3clFbF" id="7Ja64GBeXa7" role="3cqZAp">
+                    <node concept="2OqwBi" id="7Ja64GBeXa4" role="3clFbG">
+                      <node concept="10M0yZ" id="7Ja64GBeXa5" role="2Oq$k0">
+                        <ref role="1PxDUh" to="wyt6:~System" />
+                        <ref role="3cqZAo" to="wyt6:~System.out" />
+                      </node>
+                      <node concept="liA8E" id="7Ja64GBeXa6" role="2OqNvi">
+                        <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                        <node concept="3cpWs3" id="7Ja64GBf365" role="37wK5m">
+                          <node concept="37vLTw" id="7Ja64GBf3DO" role="3uHU7w">
+                            <ref role="3cqZAo" node="7Ja64GBeX3R" resolve="it" />
+                          </node>
+                          <node concept="3cpWs3" id="7Ja64GBf2bC" role="3uHU7B">
+                            <node concept="3cpWs3" id="7Ja64GBeZBw" role="3uHU7B">
+                              <node concept="Xl_RD" id="7Ja64GBeXgD" role="3uHU7B">
+                                <property role="Xl_RC" value="index is " />
+                              </node>
+                              <node concept="37vLTw" id="7Ja64GBeZQa" role="3uHU7w">
+                                <ref role="3cqZAo" node="7Ja64GBeX3T" resolve="index" />
+                              </node>
+                            </node>
+                            <node concept="Xl_RD" id="7Ja64GBf2pH" role="3uHU7w">
+                              <property role="Xl_RC" value=" and value is " />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="7Ja64GBeX3R" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="7Ja64GBeX3S" role="1tU5fm" />
+                </node>
+                <node concept="37vLTG" id="7Ja64GBeX3T" role="1bW2Oz">
+                  <property role="TrG5h" value="index" />
+                  <node concept="10Oyi0" id="7Ja64GBeX3V" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7Ja64GBeFHl" role="1B3o_S" />
+      <node concept="3cqZAl" id="7Ja64GBeFHy" role="3clF45" />
+    </node>
+    <node concept="3Tm1VV" id="7Ja64GBeFG7" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.withIndexOperation@tests.mps b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.withIndexOperation@tests.mps
index 229a3f06d4..df3dd8a55f 100644
--- a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.withIndexOperation@tests.mps
+++ b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.withIndexOperation@tests.mps
@@ -11,6 +11,12 @@
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="1215695189714" name="jetbrains.mps.baseLanguage.structure.PlusAssignmentExpression" flags="nn" index="d57v9" />
+      <concept id="1153422105332" name="jetbrains.mps.baseLanguage.structure.RemExpression" flags="nn" index="2dk9JS" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -41,12 +47,16 @@
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
@@ -83,6 +93,11 @@
       <concept id="1171931858461" name="jetbrains.mps.baseLanguage.unitTest.structure.TestMethodList" flags="ng" index="3s_gsd">
         <child id="1171931858462" name="testMethod" index="3s_gse" />
       </concept>
+      <concept id="8427750732757990717" name="jetbrains.mps.baseLanguage.unitTest.structure.BinaryAssert" flags="nn" index="3tpDYu">
+        <child id="8427750732757990725" name="actual" index="3tpDZA" />
+        <child id="8427750732757990724" name="expected" index="3tpDZB" />
+      </concept>
+      <concept id="1171978097730" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertEquals" flags="nn" index="3vlDli" />
       <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
         <child id="1171981057159" name="condition" index="3vwVQn" />
       </concept>
@@ -242,6 +257,207 @@
           </node>
         </node>
       </node>
+      <node concept="3s$Bmu" id="7Ja64GBetNJ" role="3s_gse">
+        <property role="3s$Bm0" value="whereWithIndex" />
+        <node concept="3cqZAl" id="7Ja64GBetNK" role="3clF45" />
+        <node concept="3Tm1VV" id="7Ja64GBetNL" role="1B3o_S" />
+        <node concept="3clFbS" id="7Ja64GBetNM" role="3clF47">
+          <node concept="3cpWs8" id="7Ja64GBetNN" role="3cqZAp">
+            <node concept="3cpWsn" id="7Ja64GBetNO" role="3cpWs9">
+              <property role="TrG5h" value="nums" />
+              <node concept="_YKpA" id="7Ja64GBetNP" role="1tU5fm">
+                <node concept="17QB3L" id="7Ja64GBetNQ" role="_ZDj9" />
+              </node>
+              <node concept="2ShNRf" id="7Ja64GBetNR" role="33vP2m">
+                <node concept="Tc6Ow" id="7Ja64GBetNS" role="2ShVmc">
+                  <node concept="17QB3L" id="7Ja64GBetNT" role="HW$YZ" />
+                  <node concept="Xl_RD" id="7Ja64GBetNU" role="HW$Y0">
+                    <property role="Xl_RC" value="zero" />
+                  </node>
+                  <node concept="Xl_RD" id="7Ja64GBetNV" role="HW$Y0">
+                    <property role="Xl_RC" value="one" />
+                  </node>
+                  <node concept="Xl_RD" id="7Ja64GBetNW" role="HW$Y0">
+                    <property role="Xl_RC" value="two" />
+                  </node>
+                  <node concept="Xl_RD" id="7Ja64GBetNX" role="HW$Y0">
+                    <property role="Xl_RC" value="three" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="7Ja64GBeuvx" role="3cqZAp">
+            <node concept="3cpWsn" id="7Ja64GBeuvy" role="3cpWs9">
+              <property role="TrG5h" value="expected" />
+              <node concept="_YKpA" id="7Ja64GBeuvz" role="1tU5fm">
+                <node concept="17QB3L" id="7Ja64GBeuv$" role="_ZDj9" />
+              </node>
+              <node concept="2ShNRf" id="7Ja64GBeuv_" role="33vP2m">
+                <node concept="Tc6Ow" id="7Ja64GBeuvA" role="2ShVmc">
+                  <node concept="17QB3L" id="7Ja64GBeuvB" role="HW$YZ" />
+                  <node concept="Xl_RD" id="7Ja64GBeuvC" role="HW$Y0">
+                    <property role="Xl_RC" value="zero" />
+                  </node>
+                  <node concept="Xl_RD" id="7Ja64GBeuvE" role="HW$Y0">
+                    <property role="Xl_RC" value="two" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="7Ja64GBetO9" role="3cqZAp">
+            <node concept="3cpWsn" id="7Ja64GBetOa" role="3cpWs9">
+              <property role="TrG5h" value="actual" />
+              <node concept="A3Dl8" id="7Ja64GBetOb" role="1tU5fm">
+                <node concept="17QB3L" id="7Ja64GBetOc" role="A3Ik2" />
+              </node>
+              <node concept="2YIFZM" id="7Ja64GBeuYb" role="33vP2m">
+                <ref role="37wK5l" to="96gm:7Ja64GBdvMJ" resolve="whereWithIndex" />
+                <ref role="1Pybhc" to="96gm:7Ja64GBadPz" resolve="WithIndexOperationUtil" />
+                <node concept="37vLTw" id="7Ja64GBeuYc" role="37wK5m">
+                  <ref role="3cqZAo" node="7Ja64GBetNO" resolve="nums" />
+                </node>
+                <node concept="1bVj0M" id="7Ja64GBeuYd" role="37wK5m">
+                  <node concept="3clFbS" id="7Ja64GBeuYe" role="1bW5cS">
+                    <node concept="3clFbF" id="7Ja64GBeuYf" role="3cqZAp">
+                      <node concept="3clFbC" id="7Ja64GBewDv" role="3clFbG">
+                        <node concept="3cmrfG" id="7Ja64GBewMN" role="3uHU7w">
+                          <property role="3cmrfH" value="0" />
+                        </node>
+                        <node concept="2dk9JS" id="7Ja64GBew$r" role="3uHU7B">
+                          <node concept="37vLTw" id="7Ja64GBevw$" role="3uHU7B">
+                            <ref role="3cqZAo" node="7Ja64GBeuYn" resolve="i" />
+                          </node>
+                          <node concept="3cmrfG" id="7Ja64GBew$A" role="3uHU7w">
+                            <property role="3cmrfH" value="2" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTG" id="7Ja64GBeuYl" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="17QB3L" id="7Ja64GBeuYm" role="1tU5fm" />
+                  </node>
+                  <node concept="37vLTG" id="7Ja64GBeuYn" role="1bW2Oz">
+                    <property role="TrG5h" value="i" />
+                    <node concept="10Oyi0" id="7Ja64GBeuYo" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3vwNmj" id="7Ja64GBetOr" role="3cqZAp">
+            <node concept="17R0WA" id="7Ja64GBetOs" role="3vwVQn">
+              <node concept="2OqwBi" id="7Ja64GBetOt" role="3uHU7w">
+                <node concept="37vLTw" id="7Ja64GBetOu" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7Ja64GBetOa" resolve="actual" />
+                </node>
+                <node concept="34oBXx" id="7Ja64GBetOv" role="2OqNvi" />
+              </node>
+              <node concept="2OqwBi" id="7Ja64GBetOw" role="3uHU7B">
+                <node concept="37vLTw" id="7Ja64GBetOx" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7Ja64GBeuvy" resolve="expected" />
+                </node>
+                <node concept="34oBXx" id="7Ja64GBetOy" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+          <node concept="3vwNmj" id="7Ja64GBetOz" role="3cqZAp">
+            <node concept="2OqwBi" id="7Ja64GBetO$" role="3vwVQn">
+              <node concept="37vLTw" id="7Ja64GBetO_" role="2Oq$k0">
+                <ref role="3cqZAo" node="7Ja64GBeuvy" resolve="expected" />
+              </node>
+              <node concept="BjQpj" id="7Ja64GBetOA" role="2OqNvi">
+                <node concept="37vLTw" id="7Ja64GBetOB" role="25WWJ7">
+                  <ref role="3cqZAo" node="7Ja64GBetOa" resolve="actual" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3s$Bmu" id="7Ja64GBey69" role="3s_gse">
+        <property role="3s$Bm0" value="forEachWithIndex" />
+        <node concept="3cqZAl" id="7Ja64GBey6a" role="3clF45" />
+        <node concept="3Tm1VV" id="7Ja64GBey6b" role="1B3o_S" />
+        <node concept="3clFbS" id="7Ja64GBey6c" role="3clF47">
+          <node concept="3cpWs8" id="7Ja64GBey6d" role="3cqZAp">
+            <node concept="3cpWsn" id="7Ja64GBey6e" role="3cpWs9">
+              <property role="TrG5h" value="nums" />
+              <node concept="_YKpA" id="7Ja64GBey6f" role="1tU5fm">
+                <node concept="17QB3L" id="7Ja64GBey6g" role="_ZDj9" />
+              </node>
+              <node concept="2ShNRf" id="7Ja64GBey6h" role="33vP2m">
+                <node concept="Tc6Ow" id="7Ja64GBey6i" role="2ShVmc">
+                  <node concept="17QB3L" id="7Ja64GBey6j" role="HW$YZ" />
+                  <node concept="Xl_RD" id="7Ja64GBey6k" role="HW$Y0">
+                    <property role="Xl_RC" value="zero" />
+                  </node>
+                  <node concept="Xl_RD" id="7Ja64GBey6l" role="HW$Y0">
+                    <property role="Xl_RC" value="one" />
+                  </node>
+                  <node concept="Xl_RD" id="7Ja64GBey6m" role="HW$Y0">
+                    <property role="Xl_RC" value="two" />
+                  </node>
+                  <node concept="Xl_RD" id="7Ja64GBey6n" role="HW$Y0">
+                    <property role="Xl_RC" value="three" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="7Ja64GBeyRq" role="3cqZAp">
+            <node concept="3cpWsn" id="7Ja64GBeyRt" role="3cpWs9">
+              <property role="TrG5h" value="accumulator" />
+              <node concept="10Oyi0" id="7Ja64GBeyRo" role="1tU5fm" />
+              <node concept="3cmrfG" id="7Ja64GBezvm" role="33vP2m">
+                <property role="3cmrfH" value="0" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="7Ja64GBeAfk" role="3cqZAp">
+            <node concept="2YIFZM" id="7Ja64GBez9R" role="3clFbG">
+              <ref role="37wK5l" to="96gm:7Ja64GBdw8k" resolve="forEachWithIndex" />
+              <ref role="1Pybhc" to="96gm:7Ja64GBadPz" resolve="WithIndexOperationUtil" />
+              <node concept="37vLTw" id="7Ja64GBez9S" role="37wK5m">
+                <ref role="3cqZAo" node="7Ja64GBey6e" resolve="nums" />
+              </node>
+              <node concept="1bVj0M" id="7Ja64GBez9T" role="37wK5m">
+                <node concept="3clFbS" id="7Ja64GBez9U" role="1bW5cS">
+                  <node concept="3clFbF" id="7Ja64GBez9V" role="3cqZAp">
+                    <node concept="d57v9" id="7Ja64GBe_Ht" role="3clFbG">
+                      <node concept="37vLTw" id="7Ja64GBe_MD" role="37vLTx">
+                        <ref role="3cqZAo" node="7Ja64GBeza3" resolve="i" />
+                      </node>
+                      <node concept="37vLTw" id="7Ja64GBezDT" role="37vLTJ">
+                        <ref role="3cqZAo" node="7Ja64GBeyRt" resolve="accumulator" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTG" id="7Ja64GBeza1" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="17QB3L" id="7Ja64GBeza2" role="1tU5fm" />
+                </node>
+                <node concept="37vLTG" id="7Ja64GBeza3" role="1bW2Oz">
+                  <property role="TrG5h" value="i" />
+                  <node concept="10Oyi0" id="7Ja64GBeza4" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3vlDli" id="7Ja64GBeBn0" role="3cqZAp">
+            <node concept="37vLTw" id="7Ja64GBeBq_" role="3tpDZB">
+              <ref role="3cqZAo" node="7Ja64GBeyRt" resolve="accumulator" />
+            </node>
+            <node concept="3cmrfG" id="7Ja64GBeBtu" role="3tpDZA">
+              <property role="3cmrfH" value="6" />
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
   </node>
 </model>

From 4437dcaf61e28eec9b78c75c831a9b9fee2a6cda Mon Sep 17 00:00:00 2001
From: Amin Ait Lamqadem <alamqadem@itemis.de>
Date: Thu, 25 Sep 2025 14:53:02 +0200
Subject: [PATCH 13/18] move node factory action to virtual package

---
 .../models/de.itemis.mps.baseLanguageExtensions.actions.mps      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps
index f6e47e7cc3..dc8d51ef51 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps
@@ -266,6 +266,7 @@
   </node>
   <node concept="37WguZ" id="7Ja64GB9veW">
     <property role="TrG5h" value="withIndex_operations" />
+    <property role="3GE5qa" value="withIndexOperations" />
     <node concept="37WvkG" id="7Ja64GB9veX" role="37WGs$">
       <ref role="37XkoT" to="pkab:6RqC_fThQjL" resolve="SelectWithIndexOperation" />
       <node concept="37Y9Zx" id="7Ja64GB9veY" role="37ZfLb">

From 450d58dc53e5a0ddcfe8e178780d9b2ed8fdfad8 Mon Sep 17 00:00:00 2001
From: Amin Ait Lamqadem <alamqadem@itemis.de>
Date: Thu, 25 Sep 2025 16:31:39 +0200
Subject: [PATCH 14/18] fix bug in zip operation

The following `[0..10].zip([10..inf]).zip([0..inf])` was returning the wrong
result.
---
 ...mis.mps.baseLanguageExtensions.runtime.mps | 94 ++++++++++++-------
 1 file changed, 60 insertions(+), 34 deletions(-)

diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
index 56a904a5d2..fd4d6c6992 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
@@ -434,19 +434,45 @@
               </node>
               <node concept="1bVj0M" id="6vHuLLnJvOY" role="kMx8a">
                 <node concept="3clFbS" id="6vHuLLnJvOZ" role="1bW5cS">
+                  <node concept="3cpWs8" id="6Q4_ev6vwE$" role="3cqZAp">
+                    <node concept="3cpWsn" id="6Q4_ev6vwE_" role="3cpWs9">
+                      <property role="TrG5h" value="seq1" />
+                      <node concept="A3Dl8" id="6Q4_ev6vwwe" role="1tU5fm">
+                        <node concept="16syzq" id="6Q4_ev6vwwh" role="A3Ik2">
+                          <ref role="16sUi3" node="6vHuLLnJvrH" resolve="T1" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="6Q4_ev6vwEA" role="33vP2m">
+                        <ref role="3cqZAo" node="6vHuLLnJvwJ" resolve="s1" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cpWs8" id="6Q4_ev6vwXd" role="3cqZAp">
+                    <node concept="3cpWsn" id="6Q4_ev6vwXe" role="3cpWs9">
+                      <property role="TrG5h" value="seq2" />
+                      <node concept="A3Dl8" id="6Q4_ev6vwyq" role="1tU5fm">
+                        <node concept="16syzq" id="6Q4_ev6vwyt" role="A3Ik2">
+                          <ref role="16sUi3" node="6vHuLLnJvvz" resolve="T2" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="6Q4_ev6vwXf" role="33vP2m">
+                        <ref role="3cqZAo" node="6vHuLLnJvyb" resolve="s2" />
+                      </node>
+                    </node>
+                  </node>
                   <node concept="2$JKZl" id="6vHuLLnJvUc" role="3cqZAp">
                     <node concept="3clFbS" id="6vHuLLnJvUd" role="2LFqv$">
                       <node concept="2n63Yl" id="6vHuLLnJzKH" role="3cqZAp">
                         <node concept="1Ls8ON" id="6vHuLLnJzOz" role="2n6tg2">
                           <node concept="2OqwBi" id="6vHuLLnJ$wI" role="1Lso8e">
-                            <node concept="37vLTw" id="6vHuLLnJ$fE" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6vHuLLnJvwJ" resolve="s1" />
+                            <node concept="37vLTw" id="6Q4_ev6vwEC" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6Q4_ev6vwE_" resolve="seq1" />
                             </node>
                             <node concept="1uHKPH" id="6vHuLLnJ$E3" role="2OqNvi" />
                           </node>
                           <node concept="2OqwBi" id="6vHuLLnJ_56" role="1Lso8e">
-                            <node concept="37vLTw" id="6vHuLLnJ$N8" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6vHuLLnJvyb" resolve="s2" />
+                            <node concept="37vLTw" id="6Q4_ev6vwXh" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6Q4_ev6vwXe" resolve="seq2" />
                             </node>
                             <node concept="1uHKPH" id="6vHuLLnJ_f8" role="2OqNvi" />
                           </node>
@@ -455,8 +481,8 @@
                       <node concept="3clFbF" id="6vHuLLnJxGa" role="3cqZAp">
                         <node concept="37vLTI" id="6vHuLLnJyvD" role="3clFbG">
                           <node concept="2OqwBi" id="6vHuLLnJyEn" role="37vLTx">
-                            <node concept="37vLTw" id="6vHuLLnJy_r" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6vHuLLnJvwJ" resolve="s1" />
+                            <node concept="37vLTw" id="6Q4_ev6vwED" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6Q4_ev6vwE_" resolve="seq1" />
                             </node>
                             <node concept="7r0gD" id="6vHuLLnJyOe" role="2OqNvi">
                               <node concept="3cmrfG" id="6vHuLLnJyTj" role="7T0AP">
@@ -464,16 +490,16 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="37vLTw" id="6vHuLLnJxG9" role="37vLTJ">
-                            <ref role="3cqZAo" node="6vHuLLnJvwJ" resolve="s1" />
+                          <node concept="37vLTw" id="6Q4_ev6vwEE" role="37vLTJ">
+                            <ref role="3cqZAo" node="6Q4_ev6vwE_" resolve="seq1" />
                           </node>
                         </node>
                       </node>
                       <node concept="3clFbF" id="6vHuLLnJz2l" role="3cqZAp">
                         <node concept="37vLTI" id="6vHuLLnJzg2" role="3clFbG">
                           <node concept="2OqwBi" id="6vHuLLnJzph" role="37vLTx">
-                            <node concept="37vLTw" id="6vHuLLnJzkl" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6vHuLLnJvyb" resolve="s2" />
+                            <node concept="37vLTw" id="6Q4_ev6vwXi" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6Q4_ev6vwXe" resolve="seq2" />
                             </node>
                             <node concept="7r0gD" id="6vHuLLnJzz8" role="2OqNvi">
                               <node concept="3cmrfG" id="6vHuLLnJzCd" role="7T0AP">
@@ -481,22 +507,22 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="37vLTw" id="6vHuLLnJz2j" role="37vLTJ">
-                            <ref role="3cqZAo" node="6vHuLLnJvyb" resolve="s2" />
+                          <node concept="37vLTw" id="6Q4_ev6vwXj" role="37vLTJ">
+                            <ref role="3cqZAo" node="6Q4_ev6vwXe" resolve="seq2" />
                           </node>
                         </node>
                       </node>
                     </node>
                     <node concept="1Wc70l" id="6vHuLLnJx3h" role="2$JKZa">
                       <node concept="2OqwBi" id="6vHuLLnJM1h" role="3uHU7w">
-                        <node concept="37vLTw" id="6vHuLLnJxcz" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6vHuLLnJvyb" resolve="s2" />
+                        <node concept="37vLTw" id="6Q4_ev6vwXg" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6Q4_ev6vwXe" resolve="seq2" />
                         </node>
                         <node concept="3GX2aA" id="6vHuLLnJxAZ" role="2OqNvi" />
                       </node>
                       <node concept="2OqwBi" id="6vHuLLnJLV6" role="3uHU7B">
-                        <node concept="37vLTw" id="6vHuLLnJvYJ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6vHuLLnJvwJ" resolve="s1" />
+                        <node concept="37vLTw" id="6Q4_ev6vwEB" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6Q4_ev6vwE_" resolve="seq1" />
                         </node>
                         <node concept="3GX2aA" id="6vHuLLnJwot" role="2OqNvi" />
                       </node>
@@ -552,6 +578,12 @@
         <node concept="3cpWs8" id="54jQkZ8R36P" role="3cqZAp">
           <node concept="3cpWsn" id="54jQkZ8R36Q" role="3cpWs9">
             <property role="TrG5h" value="cache" />
+            <node concept="2ShNRf" id="54jQkZ8R56d" role="33vP2m">
+              <node concept="1pGfFk" id="54jQkZ8R6Ug" role="2ShVmc">
+                <property role="373rjd" value="true" />
+                <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
+              </node>
+            </node>
             <node concept="3uibUv" id="54jQkZ8R36N" role="1tU5fm">
               <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
               <node concept="16syzq" id="54jQkZ8R3wI" role="11_B2D">
@@ -564,12 +596,6 @@
                 </node>
               </node>
             </node>
-            <node concept="2ShNRf" id="54jQkZ8R56d" role="33vP2m">
-              <node concept="1pGfFk" id="54jQkZ8R6Ug" role="2ShVmc">
-                <property role="373rjd" value="true" />
-                <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
-              </node>
-            </node>
           </node>
         </node>
         <node concept="3clFbF" id="54jQkZ8RztP" role="3cqZAp">
@@ -695,18 +721,6 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="54jQkZ8QoH9" role="1B3o_S" />
-      <node concept="3uibUv" id="54jQkZ8QQ0a" role="3clF45">
-        <ref role="3uigEE" to="urs3:5Ffu4tBU$6H" resolve="IMapSequence" />
-        <node concept="16syzq" id="54jQkZ8QQ11" role="11_B2D">
-          <ref role="16sUi3" node="54jQkZ8QpwM" resolve="K" />
-        </node>
-        <node concept="3uibUv" id="54jQkZ8QQ1W" role="11_B2D">
-          <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
-          <node concept="16syzq" id="54jQkZ8QQ3y" role="11_B2D">
-            <ref role="16sUi3" node="54jQkZ8QoI8" resolve="T" />
-          </node>
-        </node>
-      </node>
       <node concept="16euLQ" id="54jQkZ8QoI8" role="16eVyc">
         <property role="TrG5h" value="T" />
       </node>
@@ -733,6 +747,18 @@
           </node>
         </node>
       </node>
+      <node concept="3uibUv" id="54jQkZ8QQ0a" role="3clF45">
+        <ref role="3uigEE" to="urs3:5Ffu4tBU$6H" resolve="IMapSequence" />
+        <node concept="16syzq" id="54jQkZ8QQ11" role="11_B2D">
+          <ref role="16sUi3" node="54jQkZ8QpwM" resolve="K" />
+        </node>
+        <node concept="3uibUv" id="54jQkZ8QQ1W" role="11_B2D">
+          <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
+          <node concept="16syzq" id="54jQkZ8QQ3y" role="11_B2D">
+            <ref role="16sUi3" node="54jQkZ8QoI8" resolve="T" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="3Tm1VV" id="54jQkZ8QoGf" role="1B3o_S" />
   </node>

From f0c9fd39e437ac705823c09ddba69194441d8174 Mon Sep 17 00:00:00 2001
From: Dennis Albrecht <dalbrecht@itemis.com>
Date: Thu, 25 Sep 2025 13:27:15 +0200
Subject: [PATCH 15/18] introduced scope function runtime

---
 ...mis.mps.baseLanguageExtensions.runtime.msd |   3 +
 ...mis.mps.baseLanguageExtensions.runtime.mps | 258 +++++-
 ...itemis.mps.baseLanguageExtensions.test.msd |   1 +
 ...ageExtensions.test.scopeFunction@tests.mps | 871 ++++++++++++++++++
 4 files changed, 1105 insertions(+), 28 deletions(-)
 create mode 100644 code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.scopeFunction@tests.mps

diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
index 40a6a90e06..3331a10da2 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
@@ -16,12 +16,15 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
   <languageVersions>
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
index fd4d6c6992..6e52fc80a1 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
@@ -8,6 +8,7 @@
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
   </languages>
   <imports>
     <import index="urs3" ref="r:fc76aa36-3cff-41c7-b94b-eee0e8341932(jetbrains.mps.internal.collections.runtime)" />
@@ -156,6 +157,19 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
+    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
+      <concept id="3693790620639876318" name="com.mbeddr.mpsutil.blutil.structure.BLDoc" flags="ng" index="2aEySx">
+        <child id="3693790620639876319" name="text" index="2aEySw" />
+      </concept>
+    </language>
+    <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext">
+      <concept id="2557074442922380897" name="de.slisson.mps.richtext.structure.Text" flags="ng" index="19SGf9">
+        <child id="2557074442922392302" name="words" index="19SJt6" />
+      </concept>
+      <concept id="2557074442922438156" name="de.slisson.mps.richtext.structure.Word" flags="ng" index="19SUe$">
+        <property id="2557074442922438158" name="escapedValue" index="19SUeA" />
+      </concept>
+    </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1200830824066" name="jetbrains.mps.baseLanguage.closures.structure.YieldStatement" flags="nn" index="2n63Yl">
         <child id="1200830928149" name="expression" index="2n6tg2" />
@@ -177,6 +191,9 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -465,30 +482,30 @@
                       <node concept="2n63Yl" id="6vHuLLnJzKH" role="3cqZAp">
                         <node concept="1Ls8ON" id="6vHuLLnJzOz" role="2n6tg2">
                           <node concept="2OqwBi" id="6vHuLLnJ$wI" role="1Lso8e">
+                            <node concept="1uHKPH" id="6vHuLLnJ$E3" role="2OqNvi" />
                             <node concept="37vLTw" id="6Q4_ev6vwEC" role="2Oq$k0">
                               <ref role="3cqZAo" node="6Q4_ev6vwE_" resolve="seq1" />
                             </node>
-                            <node concept="1uHKPH" id="6vHuLLnJ$E3" role="2OqNvi" />
                           </node>
                           <node concept="2OqwBi" id="6vHuLLnJ_56" role="1Lso8e">
+                            <node concept="1uHKPH" id="6vHuLLnJ_f8" role="2OqNvi" />
                             <node concept="37vLTw" id="6Q4_ev6vwXh" role="2Oq$k0">
                               <ref role="3cqZAo" node="6Q4_ev6vwXe" resolve="seq2" />
                             </node>
-                            <node concept="1uHKPH" id="6vHuLLnJ_f8" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
                       <node concept="3clFbF" id="6vHuLLnJxGa" role="3cqZAp">
                         <node concept="37vLTI" id="6vHuLLnJyvD" role="3clFbG">
                           <node concept="2OqwBi" id="6vHuLLnJyEn" role="37vLTx">
-                            <node concept="37vLTw" id="6Q4_ev6vwED" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6Q4_ev6vwE_" resolve="seq1" />
-                            </node>
                             <node concept="7r0gD" id="6vHuLLnJyOe" role="2OqNvi">
                               <node concept="3cmrfG" id="6vHuLLnJyTj" role="7T0AP">
                                 <property role="3cmrfH" value="1" />
                               </node>
                             </node>
+                            <node concept="37vLTw" id="6Q4_ev6vwED" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6Q4_ev6vwE_" resolve="seq1" />
+                            </node>
                           </node>
                           <node concept="37vLTw" id="6Q4_ev6vwEE" role="37vLTJ">
                             <ref role="3cqZAo" node="6Q4_ev6vwE_" resolve="seq1" />
@@ -498,14 +515,14 @@
                       <node concept="3clFbF" id="6vHuLLnJz2l" role="3cqZAp">
                         <node concept="37vLTI" id="6vHuLLnJzg2" role="3clFbG">
                           <node concept="2OqwBi" id="6vHuLLnJzph" role="37vLTx">
-                            <node concept="37vLTw" id="6Q4_ev6vwXi" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6Q4_ev6vwXe" resolve="seq2" />
-                            </node>
                             <node concept="7r0gD" id="6vHuLLnJzz8" role="2OqNvi">
                               <node concept="3cmrfG" id="6vHuLLnJzCd" role="7T0AP">
                                 <property role="3cmrfH" value="1" />
                               </node>
                             </node>
+                            <node concept="37vLTw" id="6Q4_ev6vwXi" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6Q4_ev6vwXe" resolve="seq2" />
+                            </node>
                           </node>
                           <node concept="37vLTw" id="6Q4_ev6vwXj" role="37vLTJ">
                             <ref role="3cqZAo" node="6Q4_ev6vwXe" resolve="seq2" />
@@ -515,16 +532,16 @@
                     </node>
                     <node concept="1Wc70l" id="6vHuLLnJx3h" role="2$JKZa">
                       <node concept="2OqwBi" id="6vHuLLnJM1h" role="3uHU7w">
+                        <node concept="3GX2aA" id="6vHuLLnJxAZ" role="2OqNvi" />
                         <node concept="37vLTw" id="6Q4_ev6vwXg" role="2Oq$k0">
                           <ref role="3cqZAo" node="6Q4_ev6vwXe" resolve="seq2" />
                         </node>
-                        <node concept="3GX2aA" id="6vHuLLnJxAZ" role="2OqNvi" />
                       </node>
                       <node concept="2OqwBi" id="6vHuLLnJLV6" role="3uHU7B">
+                        <node concept="3GX2aA" id="6vHuLLnJwot" role="2OqNvi" />
                         <node concept="37vLTw" id="6Q4_ev6vwEB" role="2Oq$k0">
                           <ref role="3cqZAo" node="6Q4_ev6vwE_" resolve="seq1" />
                         </node>
-                        <node concept="3GX2aA" id="6vHuLLnJwot" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
@@ -578,12 +595,6 @@
         <node concept="3cpWs8" id="54jQkZ8R36P" role="3cqZAp">
           <node concept="3cpWsn" id="54jQkZ8R36Q" role="3cpWs9">
             <property role="TrG5h" value="cache" />
-            <node concept="2ShNRf" id="54jQkZ8R56d" role="33vP2m">
-              <node concept="1pGfFk" id="54jQkZ8R6Ug" role="2ShVmc">
-                <property role="373rjd" value="true" />
-                <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
-              </node>
-            </node>
             <node concept="3uibUv" id="54jQkZ8R36N" role="1tU5fm">
               <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
               <node concept="16syzq" id="54jQkZ8R3wI" role="11_B2D">
@@ -596,6 +607,12 @@
                 </node>
               </node>
             </node>
+            <node concept="2ShNRf" id="54jQkZ8R56d" role="33vP2m">
+              <node concept="1pGfFk" id="54jQkZ8R6Ug" role="2ShVmc">
+                <property role="373rjd" value="true" />
+                <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
+              </node>
+            </node>
           </node>
         </node>
         <node concept="3clFbF" id="54jQkZ8RztP" role="3cqZAp">
@@ -721,6 +738,18 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="54jQkZ8QoH9" role="1B3o_S" />
+      <node concept="3uibUv" id="54jQkZ8QQ0a" role="3clF45">
+        <ref role="3uigEE" to="urs3:5Ffu4tBU$6H" resolve="IMapSequence" />
+        <node concept="16syzq" id="54jQkZ8QQ11" role="11_B2D">
+          <ref role="16sUi3" node="54jQkZ8QpwM" resolve="K" />
+        </node>
+        <node concept="3uibUv" id="54jQkZ8QQ1W" role="11_B2D">
+          <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
+          <node concept="16syzq" id="54jQkZ8QQ3y" role="11_B2D">
+            <ref role="16sUi3" node="54jQkZ8QoI8" resolve="T" />
+          </node>
+        </node>
+      </node>
       <node concept="16euLQ" id="54jQkZ8QoI8" role="16eVyc">
         <property role="TrG5h" value="T" />
       </node>
@@ -747,18 +776,6 @@
           </node>
         </node>
       </node>
-      <node concept="3uibUv" id="54jQkZ8QQ0a" role="3clF45">
-        <ref role="3uigEE" to="urs3:5Ffu4tBU$6H" resolve="IMapSequence" />
-        <node concept="16syzq" id="54jQkZ8QQ11" role="11_B2D">
-          <ref role="16sUi3" node="54jQkZ8QpwM" resolve="K" />
-        </node>
-        <node concept="3uibUv" id="54jQkZ8QQ1W" role="11_B2D">
-          <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
-          <node concept="16syzq" id="54jQkZ8QQ3y" role="11_B2D">
-            <ref role="16sUi3" node="54jQkZ8QoI8" resolve="T" />
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="3Tm1VV" id="54jQkZ8QoGf" role="1B3o_S" />
   </node>
@@ -1063,5 +1080,190 @@
     </node>
     <node concept="3Tm1VV" id="7Ja64GBadP$" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="2oJmO5LUej2">
+    <property role="TrG5h" value="ScopeFunctionUtil" />
+    <node concept="2YIFZL" id="2oJmO5LUek_" role="jymVt">
+      <property role="TrG5h" value="apply" />
+      <node concept="3clFbS" id="2oJmO5LUekC" role="3clF47">
+        <node concept="3clFbF" id="2oJmO5LUeru" role="3cqZAp">
+          <node concept="2OqwBi" id="2oJmO5LUesR" role="3clFbG">
+            <node concept="37vLTw" id="2oJmO5LUert" role="2Oq$k0">
+              <ref role="3cqZAo" node="2oJmO5LUemc" resolve="function" />
+            </node>
+            <node concept="1Bd96e" id="2oJmO5LUeCF" role="2OqNvi">
+              <node concept="37vLTw" id="2oJmO5LUeEu" role="1BdPVh">
+                <ref role="3cqZAo" node="2oJmO5LUema" resolve="callee" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="2oJmO5LUeHP" role="3cqZAp">
+          <node concept="37vLTw" id="2oJmO5LUeLy" role="3cqZAk">
+            <ref role="3cqZAo" node="2oJmO5LUema" resolve="callee" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2oJmO5LUek5" role="1B3o_S" />
+      <node concept="16syzq" id="2oJmO5LUelI" role="3clF45">
+        <ref role="16sUi3" node="2oJmO5LUel4" resolve="T" />
+      </node>
+      <node concept="16euLQ" id="2oJmO5LUel4" role="16eVyc">
+        <property role="TrG5h" value="T" />
+      </node>
+      <node concept="16euLQ" id="2oJmO5LWdCA" role="16eVyc">
+        <property role="TrG5h" value="R" />
+      </node>
+      <node concept="37vLTG" id="2oJmO5LUema" role="3clF46">
+        <property role="TrG5h" value="callee" />
+        <node concept="16syzq" id="2oJmO5LUem9" role="1tU5fm">
+          <ref role="16sUi3" node="2oJmO5LUel4" resolve="T" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2oJmO5LUemc" role="3clF46">
+        <property role="TrG5h" value="function" />
+        <node concept="1ajhzC" id="2oJmO5LUemG" role="1tU5fm">
+          <node concept="16syzq" id="2oJmO5LWdDt" role="1ajl9A">
+            <ref role="16sUi3" node="2oJmO5LWdCA" resolve="R" />
+          </node>
+          <node concept="16syzq" id="2oJmO5LUen8" role="1ajw0F">
+            <ref role="16sUi3" node="2oJmO5LUel4" resolve="T" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2YIFZL" id="2oJmO5LXrKn" role="jymVt">
+      <property role="TrG5h" value="applyVoid" />
+      <node concept="3clFbS" id="2oJmO5LXrKo" role="3clF47">
+        <node concept="3clFbF" id="2oJmO5LXrKp" role="3cqZAp">
+          <node concept="2OqwBi" id="2oJmO5LXrKq" role="3clFbG">
+            <node concept="37vLTw" id="2oJmO5LXrKr" role="2Oq$k0">
+              <ref role="3cqZAo" node="2oJmO5LXrKA" resolve="function" />
+            </node>
+            <node concept="1Bd96e" id="2oJmO5LXrKs" role="2OqNvi">
+              <node concept="37vLTw" id="2oJmO5LXrKt" role="1BdPVh">
+                <ref role="3cqZAo" node="2oJmO5LXrK$" resolve="callee" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="2oJmO5LXrKu" role="3cqZAp">
+          <node concept="37vLTw" id="2oJmO5LXrKv" role="3cqZAk">
+            <ref role="3cqZAo" node="2oJmO5LXrK$" resolve="callee" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2oJmO5LXrKw" role="1B3o_S" />
+      <node concept="16syzq" id="2oJmO5LXrKx" role="3clF45">
+        <ref role="16sUi3" node="2oJmO5LXrKy" resolve="T" />
+      </node>
+      <node concept="16euLQ" id="2oJmO5LXrKy" role="16eVyc">
+        <property role="TrG5h" value="T" />
+      </node>
+      <node concept="37vLTG" id="2oJmO5LXrK$" role="3clF46">
+        <property role="TrG5h" value="callee" />
+        <node concept="16syzq" id="2oJmO5LXrK_" role="1tU5fm">
+          <ref role="16sUi3" node="2oJmO5LXrKy" resolve="T" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2oJmO5LXrKA" role="3clF46">
+        <property role="TrG5h" value="function" />
+        <node concept="1ajhzC" id="2oJmO5LXrKB" role="1tU5fm">
+          <node concept="3cqZAl" id="2oJmO5LXrQ2" role="1ajl9A" />
+          <node concept="16syzq" id="2oJmO5LXrKD" role="1ajw0F">
+            <ref role="16sUi3" node="2oJmO5LXrKy" resolve="T" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2YIFZL" id="2oJmO5LUeQ4" role="jymVt">
+      <property role="TrG5h" value="let" />
+      <node concept="3clFbS" id="2oJmO5LUeQ7" role="3clF47">
+        <node concept="3clFbF" id="2oJmO5LUeWM" role="3cqZAp">
+          <node concept="2OqwBi" id="2oJmO5LUeYf" role="3clFbG">
+            <node concept="37vLTw" id="2oJmO5LUeWL" role="2Oq$k0">
+              <ref role="3cqZAo" node="2oJmO5LUeTm" resolve="function" />
+            </node>
+            <node concept="1Bd96e" id="2oJmO5LUff$" role="2OqNvi">
+              <node concept="37vLTw" id="2oJmO5LUfhP" role="1BdPVh">
+                <ref role="3cqZAo" node="2oJmO5LUeTk" resolve="callee" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2oJmO5LUeOk" role="1B3o_S" />
+      <node concept="16syzq" id="2oJmO5LUeSR" role="3clF45">
+        <ref role="16sUi3" node="2oJmO5LUeSc" resolve="R" />
+      </node>
+      <node concept="16euLQ" id="2oJmO5LUeRL" role="16eVyc">
+        <property role="TrG5h" value="T" />
+      </node>
+      <node concept="16euLQ" id="2oJmO5LUeSc" role="16eVyc">
+        <property role="TrG5h" value="R" />
+      </node>
+      <node concept="37vLTG" id="2oJmO5LUeTk" role="3clF46">
+        <property role="TrG5h" value="callee" />
+        <node concept="16syzq" id="2oJmO5LUeTj" role="1tU5fm">
+          <ref role="16sUi3" node="2oJmO5LUeRL" resolve="T" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2oJmO5LUeTm" role="3clF46">
+        <property role="TrG5h" value="function" />
+        <node concept="1ajhzC" id="2oJmO5LUeTR" role="1tU5fm">
+          <node concept="16syzq" id="2oJmO5LUeUL" role="1ajl9A">
+            <ref role="16sUi3" node="2oJmO5LUeSc" resolve="R" />
+          </node>
+          <node concept="16syzq" id="2oJmO5LUeUk" role="1ajw0F">
+            <ref role="16sUi3" node="2oJmO5LUeRL" resolve="T" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2YIFZL" id="2oJmO5LUfj9" role="jymVt">
+      <property role="TrG5h" value="letVoid" />
+      <node concept="3clFbS" id="2oJmO5LUfja" role="3clF47">
+        <node concept="3clFbF" id="2oJmO5LUfjb" role="3cqZAp">
+          <node concept="2OqwBi" id="2oJmO5LUfjc" role="3clFbG">
+            <node concept="37vLTw" id="2oJmO5LUfjd" role="2Oq$k0">
+              <ref role="3cqZAo" node="2oJmO5LUfjm" resolve="function" />
+            </node>
+            <node concept="1Bd96e" id="2oJmO5LUfje" role="2OqNvi">
+              <node concept="37vLTw" id="2oJmO5LUfjf" role="1BdPVh">
+                <ref role="3cqZAo" node="2oJmO5LUfjk" resolve="callee" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2oJmO5LUfjg" role="1B3o_S" />
+      <node concept="3cqZAl" id="2oJmO5LUfoU" role="3clF45" />
+      <node concept="16euLQ" id="2oJmO5LUfji" role="16eVyc">
+        <property role="TrG5h" value="T" />
+      </node>
+      <node concept="37vLTG" id="2oJmO5LUfjk" role="3clF46">
+        <property role="TrG5h" value="callee" />
+        <node concept="16syzq" id="2oJmO5LUfjl" role="1tU5fm">
+          <ref role="16sUi3" node="2oJmO5LUfji" resolve="T" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2oJmO5LUfjm" role="3clF46">
+        <property role="TrG5h" value="function" />
+        <node concept="1ajhzC" id="2oJmO5LUfjn" role="1tU5fm">
+          <node concept="3cqZAl" id="2oJmO5LUfqj" role="1ajl9A" />
+          <node concept="16syzq" id="2oJmO5LUfjp" role="1ajw0F">
+            <ref role="16sUi3" node="2oJmO5LUfji" resolve="T" />
+          </node>
+        </node>
+      </node>
+      <node concept="2aEySx" id="2oJmO5LZr1I" role="lGtFl">
+        <node concept="19SGf9" id="2oJmO5LZr1J" role="2aEySw">
+          <node concept="19SUe$" id="2oJmO5LZr1K" role="19SJt6">
+            <property role="19SUeA" value="This technically shouldn't be used explicitly, as it doesn't make much sense.&#10;But it is required to get the syntactic sugar variant type check and generate. " />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="2oJmO5LUej3" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd
index 60a608e2ac..b7848156ec 100644
--- a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd
+++ b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/de.itemis.mps.baseLanguageExtensions.test.msd
@@ -25,6 +25,7 @@
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
+    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.scopeFunction@tests.mps b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.scopeFunction@tests.mps
new file mode 100644
index 0000000000..85e17e2db7
--- /dev/null
+++ b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.scopeFunction@tests.mps
@@ -0,0 +1,871 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:5a7ae83c-2b1a-41f2-9470-4c8a2c3100ea(de.itemis.mps.baseLanguageExtensions.test.scopeFunction@tests)">
+  <persistence version="9" />
+  <languages>
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
+    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
+  </languages>
+  <imports>
+    <import index="96gm" ref="r:2eaed950-3bc1-47cd-9b02-e917ff994d7c(de.itemis.mps.baseLanguageExtensions.runtime)" />
+    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="8356039341262087992" name="line" index="1aUNEU" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
+    <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
+      <concept id="1171931690126" name="jetbrains.mps.baseLanguage.unitTest.structure.TestMethod" flags="ig" index="3s$Bmu">
+        <property id="1171931690128" name="methodName" index="3s$Bm0" />
+      </concept>
+      <concept id="1171931851043" name="jetbrains.mps.baseLanguage.unitTest.structure.BTestCase" flags="ig" index="3s_ewN">
+        <property id="1171931851045" name="testCaseName" index="3s_ewP" />
+        <child id="1171931851044" name="testMethodList" index="3s_ewO" />
+      </concept>
+      <concept id="1171931858461" name="jetbrains.mps.baseLanguage.unitTest.structure.TestMethodList" flags="ng" index="3s_gsd">
+        <child id="1171931858462" name="testMethod" index="3s_gse" />
+      </concept>
+      <concept id="8427750732757990717" name="jetbrains.mps.baseLanguage.unitTest.structure.BinaryAssert" flags="nn" index="3tpDYu">
+        <child id="8427750732757990725" name="actual" index="3tpDZA" />
+        <child id="8427750732757990724" name="expected" index="3tpDZB" />
+      </concept>
+      <concept id="1171978097730" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertEquals" flags="nn" index="3vlDli" />
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
+      <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
+        <property id="155656958578482949" name="value" index="3oM_SC" />
+      </concept>
+      <concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="nn" index="1PaTwC">
+        <child id="2535923850359271783" name="elements" index="1PaTwD" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="3s_ewN" id="2oJmO5LY5Fb">
+    <property role="3s_ewP" value="ApplyFunction" />
+    <node concept="3Tm1VV" id="2oJmO5LY5Fc" role="1B3o_S" />
+    <node concept="3s_gsd" id="2oJmO5LY5Fd" role="3s_ewO">
+      <node concept="3s$Bmu" id="2oJmO5LY5N2" role="3s_gse">
+        <property role="3s$Bm0" value="chainStringBuildingWithApply" />
+        <node concept="3cqZAl" id="2oJmO5LY5N3" role="3clF45" />
+        <node concept="3Tm1VV" id="2oJmO5LY5N4" role="1B3o_S" />
+        <node concept="3clFbS" id="2oJmO5LY5N5" role="3clF47">
+          <node concept="3SKdUt" id="6vHuLLnDlS_" role="3cqZAp">
+            <node concept="1PaTwC" id="6vHuLLnDlSA" role="1aUNEU">
+              <node concept="3oM_SD" id="2oJmO5LZ4Xw" role="1PaTwD">
+                <property role="3oM_SC" value="this" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ4Xx" role="1PaTwD">
+                <property role="3oM_SC" value="would" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ4Xy" role="1PaTwD">
+                <property role="3oM_SC" value="work" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ4Xz" role="1PaTwD">
+                <property role="3oM_SC" value="just" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ4X$" role="1PaTwD">
+                <property role="3oM_SC" value="as" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ4X_" role="1PaTwD">
+                <property role="3oM_SC" value="well" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ4XA" role="1PaTwD">
+                <property role="3oM_SC" value="without" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ4XB" role="1PaTwD">
+                <property role="3oM_SC" value="the" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ4XC" role="1PaTwD">
+                <property role="3oM_SC" value="apply," />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ4XD" role="1PaTwD">
+                <property role="3oM_SC" value="but" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ4XE" role="1PaTwD">
+                <property role="3oM_SC" value="it" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ4XF" role="1PaTwD">
+                <property role="3oM_SC" value="highlights" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ4XG" role="1PaTwD">
+                <property role="3oM_SC" value="that" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ4XH" role="1PaTwD">
+                <property role="3oM_SC" value="this" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ4XI" role="1PaTwD">
+                <property role="3oM_SC" value="preserves" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ4XJ" role="1PaTwD">
+                <property role="3oM_SC" value="the" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ4XK" role="1PaTwD">
+                <property role="3oM_SC" value="typing" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ4XL" role="1PaTwD">
+                <property role="3oM_SC" value="aspect" />
+              </node>
+            </node>
+          </node>
+          <node concept="3SKdUt" id="2oJmO5LZnho" role="3cqZAp">
+            <node concept="1PaTwC" id="2oJmO5LZnhp" role="1aUNEU">
+              <node concept="3oM_SD" id="2oJmO5LZnyt" role="1PaTwD">
+                <property role="3oM_SC" value="with" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyr" role="1PaTwD">
+                <property role="3oM_SC" value="apply," />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyu" role="1PaTwD">
+                <property role="3oM_SC" value="the" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyv" role="1PaTwD">
+                <property role="3oM_SC" value="original" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyw" role="1PaTwD">
+                <property role="3oM_SC" value="Builder" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyx" role="1PaTwD">
+                <property role="3oM_SC" value="is" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyy" role="1PaTwD">
+                <property role="3oM_SC" value="returned," />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyz" role="1PaTwD">
+                <property role="3oM_SC" value="but" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZny$" role="1PaTwD">
+                <property role="3oM_SC" value="given" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZny_" role="1PaTwD">
+                <property role="3oM_SC" value="that" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyA" role="1PaTwD">
+                <property role="3oM_SC" value="the" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyB" role="1PaTwD">
+                <property role="3oM_SC" value="append" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyC" role="1PaTwD">
+                <property role="3oM_SC" value="methods" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyD" role="1PaTwD">
+                <property role="3oM_SC" value="return" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyE" role="1PaTwD">
+                <property role="3oM_SC" value="the" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyF" role="1PaTwD">
+                <property role="3oM_SC" value="original" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyG" role="1PaTwD">
+                <property role="3oM_SC" value="builder" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyH" role="1PaTwD">
+                <property role="3oM_SC" value="as" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyI" role="1PaTwD">
+                <property role="3oM_SC" value="well," />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyJ" role="1PaTwD">
+                <property role="3oM_SC" value="this" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyK" role="1PaTwD">
+                <property role="3oM_SC" value="behaves" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyL" role="1PaTwD">
+                <property role="3oM_SC" value="exactly" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyM" role="1PaTwD">
+                <property role="3oM_SC" value="the" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyN" role="1PaTwD">
+                <property role="3oM_SC" value="same" />
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="2oJmO5LY9$v" role="3cqZAp">
+            <node concept="3cpWsn" id="2oJmO5LY9$w" role="3cpWs9">
+              <property role="TrG5h" value="actual" />
+              <node concept="3uibUv" id="2oJmO5LY9xT" role="1tU5fm">
+                <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+              </node>
+              <node concept="2OqwBi" id="2oJmO5LY9$x" role="33vP2m">
+                <node concept="2YIFZM" id="2oJmO5LY9$y" role="2Oq$k0">
+                  <ref role="37wK5l" to="96gm:2oJmO5LUek_" resolve="apply" />
+                  <ref role="1Pybhc" to="96gm:2oJmO5LUej2" resolve="ScopeFunctionUtil" />
+                  <node concept="2YIFZM" id="2oJmO5LZ6v4" role="37wK5m">
+                    <ref role="37wK5l" to="96gm:2oJmO5LUek_" resolve="apply" />
+                    <ref role="1Pybhc" to="96gm:2oJmO5LUej2" resolve="ScopeFunctionUtil" />
+                    <node concept="2YIFZM" id="2oJmO5LZ6v5" role="37wK5m">
+                      <ref role="37wK5l" to="96gm:2oJmO5LUek_" resolve="apply" />
+                      <ref role="1Pybhc" to="96gm:2oJmO5LUej2" resolve="ScopeFunctionUtil" />
+                      <node concept="2YIFZM" id="2oJmO5LZ6v6" role="37wK5m">
+                        <ref role="37wK5l" to="96gm:2oJmO5LUek_" resolve="apply" />
+                        <ref role="1Pybhc" to="96gm:2oJmO5LUej2" resolve="ScopeFunctionUtil" />
+                        <node concept="2ShNRf" id="2oJmO5LZ6v7" role="37wK5m">
+                          <node concept="1pGfFk" id="2oJmO5LZ6v8" role="2ShVmc">
+                            <property role="373rjd" value="true" />
+                            <ref role="37wK5l" to="wyt6:~StringBuilder.&lt;init&gt;()" resolve="StringBuilder" />
+                          </node>
+                        </node>
+                        <node concept="1bVj0M" id="2oJmO5LZ6v9" role="37wK5m">
+                          <node concept="3clFbS" id="2oJmO5LZ6va" role="1bW5cS">
+                            <node concept="3clFbF" id="2oJmO5LZ6vb" role="3cqZAp">
+                              <node concept="2OqwBi" id="2oJmO5LZ6vc" role="3clFbG">
+                                <node concept="37vLTw" id="2oJmO5LZ6vd" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="2oJmO5LZ6vg" resolve="builder" />
+                                </node>
+                                <node concept="liA8E" id="2oJmO5LZ6ve" role="2OqNvi">
+                                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
+                                  <node concept="Xl_RD" id="2oJmO5LZ6vf" role="37wK5m">
+                                    <property role="Xl_RC" value="Hello" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="37vLTG" id="2oJmO5LZ6vg" role="1bW2Oz">
+                            <property role="TrG5h" value="builder" />
+                            <node concept="3uibUv" id="2oJmO5LZ6vh" role="1tU5fm">
+                              <ref role="3uigEE" to="wyt6:~StringBuilder" resolve="StringBuilder" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="1bVj0M" id="2oJmO5LZ6vi" role="37wK5m">
+                        <node concept="3clFbS" id="2oJmO5LZ6vj" role="1bW5cS">
+                          <node concept="3clFbF" id="2oJmO5LZ6vk" role="3cqZAp">
+                            <node concept="2OqwBi" id="2oJmO5LZ6vl" role="3clFbG">
+                              <node concept="37vLTw" id="2oJmO5LZ6vm" role="2Oq$k0">
+                                <ref role="3cqZAo" node="2oJmO5LZ6vp" resolve="builder" />
+                              </node>
+                              <node concept="liA8E" id="2oJmO5LZ6vn" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
+                                <node concept="Xl_RD" id="2oJmO5LZ6vo" role="37wK5m">
+                                  <property role="Xl_RC" value=", " />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="37vLTG" id="2oJmO5LZ6vp" role="1bW2Oz">
+                          <property role="TrG5h" value="builder" />
+                          <node concept="3uibUv" id="2oJmO5LZ6vq" role="1tU5fm">
+                            <ref role="3uigEE" to="wyt6:~StringBuilder" resolve="StringBuilder" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1bVj0M" id="2oJmO5LZ6vr" role="37wK5m">
+                      <node concept="3clFbS" id="2oJmO5LZ6vs" role="1bW5cS">
+                        <node concept="3clFbF" id="2oJmO5LZ6vt" role="3cqZAp">
+                          <node concept="2OqwBi" id="2oJmO5LZ6vu" role="3clFbG">
+                            <node concept="37vLTw" id="2oJmO5LZ6vv" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2oJmO5LZ6vy" resolve="builder" />
+                            </node>
+                            <node concept="liA8E" id="2oJmO5LZ6vw" role="2OqNvi">
+                              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
+                              <node concept="Xl_RD" id="2oJmO5LZ6vx" role="37wK5m">
+                                <property role="Xl_RC" value="World" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="37vLTG" id="2oJmO5LZ6vy" role="1bW2Oz">
+                        <property role="TrG5h" value="builder" />
+                        <node concept="3uibUv" id="2oJmO5LZ6vz" role="1tU5fm">
+                          <ref role="3uigEE" to="wyt6:~StringBuilder" resolve="StringBuilder" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="1bVj0M" id="2oJmO5LY9$_" role="37wK5m">
+                    <node concept="3clFbS" id="2oJmO5LY9$A" role="1bW5cS">
+                      <node concept="3clFbF" id="2oJmO5LY9$B" role="3cqZAp">
+                        <node concept="2OqwBi" id="2oJmO5LY9$C" role="3clFbG">
+                          <node concept="37vLTw" id="2oJmO5LY9$D" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2oJmO5LY9$G" resolve="builder" />
+                          </node>
+                          <node concept="liA8E" id="2oJmO5LY9$E" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
+                            <node concept="Xl_RD" id="2oJmO5LY9$F" role="37wK5m">
+                              <property role="Xl_RC" value="!" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="37vLTG" id="2oJmO5LY9$G" role="1bW2Oz">
+                      <property role="TrG5h" value="builder" />
+                      <node concept="3uibUv" id="2oJmO5LY9$H" role="1tU5fm">
+                        <ref role="3uigEE" to="wyt6:~StringBuilder" resolve="StringBuilder" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="2oJmO5LY9$I" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="2oJmO5LY9S2" role="3cqZAp" />
+          <node concept="3vlDli" id="2oJmO5LYa2E" role="3cqZAp">
+            <node concept="Xl_RD" id="2oJmO5LYa7F" role="3tpDZB">
+              <property role="Xl_RC" value="Hello, World!" />
+            </node>
+            <node concept="37vLTw" id="2oJmO5LYaEA" role="3tpDZA">
+              <ref role="3cqZAo" node="2oJmO5LY9$w" resolve="actual" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3s$Bmu" id="2oJmO5LZ9Vk" role="3s_gse">
+        <property role="3s$Bm0" value="chainStringBuildingWithLet" />
+        <node concept="3cqZAl" id="2oJmO5LZ9Vl" role="3clF45" />
+        <node concept="3Tm1VV" id="2oJmO5LZ9Vm" role="1B3o_S" />
+        <node concept="3clFbS" id="2oJmO5LZ9Vn" role="3clF47">
+          <node concept="3SKdUt" id="2oJmO5LZ9Vo" role="3cqZAp">
+            <node concept="1PaTwC" id="2oJmO5LZ9Vp" role="1aUNEU">
+              <node concept="3oM_SD" id="2oJmO5LZ9Vq" role="1PaTwD">
+                <property role="3oM_SC" value="this" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ9Vr" role="1PaTwD">
+                <property role="3oM_SC" value="would" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ9Vs" role="1PaTwD">
+                <property role="3oM_SC" value="work" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ9Vt" role="1PaTwD">
+                <property role="3oM_SC" value="just" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ9Vu" role="1PaTwD">
+                <property role="3oM_SC" value="as" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ9Vv" role="1PaTwD">
+                <property role="3oM_SC" value="well" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ9Vw" role="1PaTwD">
+                <property role="3oM_SC" value="without" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ9Vx" role="1PaTwD">
+                <property role="3oM_SC" value="the" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ9Vy" role="1PaTwD">
+                <property role="3oM_SC" value="let," />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ9Vz" role="1PaTwD">
+                <property role="3oM_SC" value="but" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ9V$" role="1PaTwD">
+                <property role="3oM_SC" value="it" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ9V_" role="1PaTwD">
+                <property role="3oM_SC" value="highlights" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ9VA" role="1PaTwD">
+                <property role="3oM_SC" value="that" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ9VB" role="1PaTwD">
+                <property role="3oM_SC" value="this" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ9VC" role="1PaTwD">
+                <property role="3oM_SC" value="preserves" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ9VD" role="1PaTwD">
+                <property role="3oM_SC" value="the" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ9VE" role="1PaTwD">
+                <property role="3oM_SC" value="typing" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZ9VF" role="1PaTwD">
+                <property role="3oM_SC" value="aspect" />
+              </node>
+            </node>
+          </node>
+          <node concept="3SKdUt" id="2oJmO5LZnyO" role="3cqZAp">
+            <node concept="1PaTwC" id="2oJmO5LZnyP" role="1aUNEU">
+              <node concept="3oM_SD" id="2oJmO5LZnyQ" role="1PaTwD">
+                <property role="3oM_SC" value="with" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyR" role="1PaTwD">
+                <property role="3oM_SC" value="let," />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyS" role="1PaTwD">
+                <property role="3oM_SC" value="the" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyT" role="1PaTwD">
+                <property role="3oM_SC" value="returned" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyU" role="1PaTwD">
+                <property role="3oM_SC" value="Builder" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZogl" role="1PaTwD">
+                <property role="3oM_SC" value="from" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZogm" role="1PaTwD">
+                <property role="3oM_SC" value="the" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZogn" role="1PaTwD">
+                <property role="3oM_SC" value="closure" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyV" role="1PaTwD">
+                <property role="3oM_SC" value="is" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyW" role="1PaTwD">
+                <property role="3oM_SC" value="returned," />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyX" role="1PaTwD">
+                <property role="3oM_SC" value="but" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyY" role="1PaTwD">
+                <property role="3oM_SC" value="given" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnyZ" role="1PaTwD">
+                <property role="3oM_SC" value="that" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnz0" role="1PaTwD">
+                <property role="3oM_SC" value="the" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnz1" role="1PaTwD">
+                <property role="3oM_SC" value="append" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnz2" role="1PaTwD">
+                <property role="3oM_SC" value="methods" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnz3" role="1PaTwD">
+                <property role="3oM_SC" value="return" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnz4" role="1PaTwD">
+                <property role="3oM_SC" value="the" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnz5" role="1PaTwD">
+                <property role="3oM_SC" value="original" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnz6" role="1PaTwD">
+                <property role="3oM_SC" value="builder" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnz7" role="1PaTwD">
+                <property role="3oM_SC" value="as" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnz8" role="1PaTwD">
+                <property role="3oM_SC" value="well," />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnz9" role="1PaTwD">
+                <property role="3oM_SC" value="this" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnza" role="1PaTwD">
+                <property role="3oM_SC" value="behaves" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnzb" role="1PaTwD">
+                <property role="3oM_SC" value="exactly" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnzc" role="1PaTwD">
+                <property role="3oM_SC" value="the" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZnzd" role="1PaTwD">
+                <property role="3oM_SC" value="same" />
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="2oJmO5LZ9VG" role="3cqZAp">
+            <node concept="3cpWsn" id="2oJmO5LZ9VH" role="3cpWs9">
+              <property role="TrG5h" value="actual" />
+              <node concept="3uibUv" id="2oJmO5LZ9VI" role="1tU5fm">
+                <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+              </node>
+              <node concept="2OqwBi" id="2oJmO5LZ9VJ" role="33vP2m">
+                <node concept="2YIFZM" id="2oJmO5LZaNv" role="2Oq$k0">
+                  <ref role="37wK5l" to="96gm:2oJmO5LUeQ4" resolve="let" />
+                  <ref role="1Pybhc" to="96gm:2oJmO5LUej2" resolve="ScopeFunctionUtil" />
+                  <node concept="2YIFZM" id="2oJmO5LZbz8" role="37wK5m">
+                    <ref role="37wK5l" to="96gm:2oJmO5LUeQ4" resolve="let" />
+                    <ref role="1Pybhc" to="96gm:2oJmO5LUej2" resolve="ScopeFunctionUtil" />
+                    <node concept="2YIFZM" id="2oJmO5LZbz9" role="37wK5m">
+                      <ref role="37wK5l" to="96gm:2oJmO5LUeQ4" resolve="let" />
+                      <ref role="1Pybhc" to="96gm:2oJmO5LUej2" resolve="ScopeFunctionUtil" />
+                      <node concept="2YIFZM" id="2oJmO5LZbMV" role="37wK5m">
+                        <ref role="37wK5l" to="96gm:2oJmO5LUeQ4" resolve="let" />
+                        <ref role="1Pybhc" to="96gm:2oJmO5LUej2" resolve="ScopeFunctionUtil" />
+                        <node concept="2ShNRf" id="2oJmO5LZbMW" role="37wK5m">
+                          <node concept="1pGfFk" id="2oJmO5LZbMX" role="2ShVmc">
+                            <property role="373rjd" value="true" />
+                            <ref role="37wK5l" to="wyt6:~StringBuilder.&lt;init&gt;()" resolve="StringBuilder" />
+                          </node>
+                        </node>
+                        <node concept="1bVj0M" id="2oJmO5LZbMY" role="37wK5m">
+                          <node concept="3clFbS" id="2oJmO5LZbMZ" role="1bW5cS">
+                            <node concept="3clFbF" id="2oJmO5LZbN0" role="3cqZAp">
+                              <node concept="2OqwBi" id="2oJmO5LZbN1" role="3clFbG">
+                                <node concept="37vLTw" id="2oJmO5LZbN2" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="2oJmO5LZbN5" resolve="builder" />
+                                </node>
+                                <node concept="liA8E" id="2oJmO5LZbN3" role="2OqNvi">
+                                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
+                                  <node concept="Xl_RD" id="2oJmO5LZbN4" role="37wK5m">
+                                    <property role="Xl_RC" value="Hello" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="37vLTG" id="2oJmO5LZbN5" role="1bW2Oz">
+                            <property role="TrG5h" value="builder" />
+                            <node concept="3uibUv" id="2oJmO5LZbN6" role="1tU5fm">
+                              <ref role="3uigEE" to="wyt6:~StringBuilder" resolve="StringBuilder" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="1bVj0M" id="2oJmO5LZbzm" role="37wK5m">
+                        <node concept="3clFbS" id="2oJmO5LZbzn" role="1bW5cS">
+                          <node concept="3clFbF" id="2oJmO5LZbzo" role="3cqZAp">
+                            <node concept="2OqwBi" id="2oJmO5LZbzp" role="3clFbG">
+                              <node concept="37vLTw" id="2oJmO5LZbzq" role="2Oq$k0">
+                                <ref role="3cqZAo" node="2oJmO5LZbzt" resolve="builder" />
+                              </node>
+                              <node concept="liA8E" id="2oJmO5LZbzr" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
+                                <node concept="Xl_RD" id="2oJmO5LZbzs" role="37wK5m">
+                                  <property role="Xl_RC" value=", " />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="37vLTG" id="2oJmO5LZbzt" role="1bW2Oz">
+                          <property role="TrG5h" value="builder" />
+                          <node concept="3uibUv" id="2oJmO5LZbzu" role="1tU5fm">
+                            <ref role="3uigEE" to="wyt6:~StringBuilder" resolve="StringBuilder" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1bVj0M" id="2oJmO5LZbzv" role="37wK5m">
+                      <node concept="3clFbS" id="2oJmO5LZbzw" role="1bW5cS">
+                        <node concept="3clFbF" id="2oJmO5LZbzx" role="3cqZAp">
+                          <node concept="2OqwBi" id="2oJmO5LZbzy" role="3clFbG">
+                            <node concept="37vLTw" id="2oJmO5LZbzz" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2oJmO5LZbzA" resolve="builder" />
+                            </node>
+                            <node concept="liA8E" id="2oJmO5LZbz$" role="2OqNvi">
+                              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
+                              <node concept="Xl_RD" id="2oJmO5LZbz_" role="37wK5m">
+                                <property role="Xl_RC" value="World" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="37vLTG" id="2oJmO5LZbzA" role="1bW2Oz">
+                        <property role="TrG5h" value="builder" />
+                        <node concept="3uibUv" id="2oJmO5LZbzB" role="1tU5fm">
+                          <ref role="3uigEE" to="wyt6:~StringBuilder" resolve="StringBuilder" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="1bVj0M" id="2oJmO5LZaO0" role="37wK5m">
+                    <node concept="3clFbS" id="2oJmO5LZaO1" role="1bW5cS">
+                      <node concept="3clFbF" id="2oJmO5LZaO2" role="3cqZAp">
+                        <node concept="2OqwBi" id="2oJmO5LZaO3" role="3clFbG">
+                          <node concept="37vLTw" id="2oJmO5LZaO4" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2oJmO5LZaO7" resolve="builder" />
+                          </node>
+                          <node concept="liA8E" id="2oJmO5LZaO5" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
+                            <node concept="Xl_RD" id="2oJmO5LZaO6" role="37wK5m">
+                              <property role="Xl_RC" value="!" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="37vLTG" id="2oJmO5LZaO7" role="1bW2Oz">
+                      <property role="TrG5h" value="builder" />
+                      <node concept="3uibUv" id="2oJmO5LZaO8" role="1tU5fm">
+                        <ref role="3uigEE" to="wyt6:~StringBuilder" resolve="StringBuilder" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="2oJmO5LZ9Wq" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="2oJmO5LZ9Wr" role="3cqZAp" />
+          <node concept="3vlDli" id="2oJmO5LZ9Ws" role="3cqZAp">
+            <node concept="Xl_RD" id="2oJmO5LZ9Wt" role="3tpDZB">
+              <property role="Xl_RC" value="Hello, World!" />
+            </node>
+            <node concept="37vLTw" id="2oJmO5LZ9Wu" role="3tpDZA">
+              <ref role="3cqZAo" node="2oJmO5LZ9VH" resolve="actual" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3s$Bmu" id="2oJmO5LYbe8" role="3s_gse">
+        <property role="3s$Bm0" value="chainPrint" />
+        <node concept="3cqZAl" id="2oJmO5LYbe9" role="3clF45" />
+        <node concept="3Tm1VV" id="2oJmO5LYbea" role="1B3o_S" />
+        <node concept="3clFbS" id="2oJmO5LYbeb" role="3clF47">
+          <node concept="3SKdUt" id="2oJmO5LZq_M" role="3cqZAp">
+            <node concept="1PaTwC" id="2oJmO5LZq_N" role="1aUNEU">
+              <node concept="3oM_SD" id="2oJmO5LZqMQ" role="1PaTwD">
+                <property role="3oM_SC" value="this" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZqMR" role="1PaTwD">
+                <property role="3oM_SC" value="is" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZqMS" role="1PaTwD">
+                <property role="3oM_SC" value="the" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZqMT" role="1PaTwD">
+                <property role="3oM_SC" value="actual" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZqMU" role="1PaTwD">
+                <property role="3oM_SC" value="value" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZqMV" role="1PaTwD">
+                <property role="3oM_SC" value="of" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZqMW" role="1PaTwD">
+                <property role="3oM_SC" value="the" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZqMX" role="1PaTwD">
+                <property role="3oM_SC" value="apply" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZqMY" role="1PaTwD">
+                <property role="3oM_SC" value="functionality," />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZqMZ" role="1PaTwD">
+                <property role="3oM_SC" value="even" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZqN0" role="1PaTwD">
+                <property role="3oM_SC" value="if" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZqN1" role="1PaTwD">
+                <property role="3oM_SC" value="a" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZqN2" role="1PaTwD">
+                <property role="3oM_SC" value="but" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZqN3" role="1PaTwD">
+                <property role="3oM_SC" value="clunky" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZqN4" role="1PaTwD">
+                <property role="3oM_SC" value="in" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZqN5" role="1PaTwD">
+                <property role="3oM_SC" value="&quot;runtime&quot;" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZqN6" role="1PaTwD">
+                <property role="3oM_SC" value="style" />
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="2oJmO5LYbec" role="3cqZAp">
+            <node concept="3cpWsn" id="2oJmO5LYbed" role="3cpWs9">
+              <property role="TrG5h" value="actual" />
+              <node concept="3uibUv" id="2oJmO5LYbee" role="1tU5fm">
+                <ref role="3uigEE" to="guwi:~PrintStream" resolve="PrintStream" />
+              </node>
+              <node concept="2YIFZM" id="2oJmO5LZ1Aw" role="33vP2m">
+                <ref role="37wK5l" to="96gm:2oJmO5LXrKn" resolve="applyVoid" />
+                <ref role="1Pybhc" to="96gm:2oJmO5LUej2" resolve="ScopeFunctionUtil" />
+                <node concept="2YIFZM" id="2oJmO5LZgUj" role="37wK5m">
+                  <ref role="37wK5l" to="96gm:2oJmO5LXrKn" resolve="applyVoid" />
+                  <ref role="1Pybhc" to="96gm:2oJmO5LUej2" resolve="ScopeFunctionUtil" />
+                  <node concept="10M0yZ" id="2oJmO5LZgUk" role="37wK5m">
+                    <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
+                    <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                  </node>
+                  <node concept="1bVj0M" id="2oJmO5LZgUl" role="37wK5m">
+                    <node concept="3clFbS" id="2oJmO5LZgUm" role="1bW5cS">
+                      <node concept="3clFbF" id="2oJmO5LZgUn" role="3cqZAp">
+                        <node concept="2OqwBi" id="2oJmO5LZgUo" role="3clFbG">
+                          <node concept="37vLTw" id="2oJmO5LZgUp" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2oJmO5LZgUs" resolve="out" />
+                          </node>
+                          <node concept="liA8E" id="2oJmO5LZgUq" role="2OqNvi">
+                            <ref role="37wK5l" to="guwi:~PrintStream.print(java.lang.String)" resolve="print" />
+                            <node concept="Xl_RD" id="2oJmO5LZgUr" role="37wK5m">
+                              <property role="Xl_RC" value="Hello, " />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="37vLTG" id="2oJmO5LZgUs" role="1bW2Oz">
+                      <property role="TrG5h" value="out" />
+                      <node concept="3uibUv" id="2oJmO5LZgUt" role="1tU5fm">
+                        <ref role="3uigEE" to="guwi:~PrintStream" resolve="PrintStream" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1bVj0M" id="2oJmO5LZ1Ay" role="37wK5m">
+                  <node concept="3clFbS" id="2oJmO5LZ1Az" role="1bW5cS">
+                    <node concept="3clFbF" id="2oJmO5LZ1A$" role="3cqZAp">
+                      <node concept="2OqwBi" id="2oJmO5LZ1A_" role="3clFbG">
+                        <node concept="37vLTw" id="2oJmO5LZ1AA" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2oJmO5LZ1AD" resolve="out" />
+                        </node>
+                        <node concept="liA8E" id="2oJmO5LZ1AB" role="2OqNvi">
+                          <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                          <node concept="Xl_RD" id="2oJmO5LZ1AC" role="37wK5m">
+                            <property role="Xl_RC" value="World!" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTG" id="2oJmO5LZ1AD" role="1bW2Oz">
+                    <property role="TrG5h" value="out" />
+                    <node concept="3uibUv" id="2oJmO5LZ1AE" role="1tU5fm">
+                      <ref role="3uigEE" to="guwi:~PrintStream" resolve="PrintStream" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="2oJmO5LYbet" role="3cqZAp" />
+          <node concept="3SKdUt" id="2oJmO5LZfnR" role="3cqZAp">
+            <node concept="1PaTwC" id="2oJmO5LZfnS" role="1aUNEU">
+              <node concept="3oM_SD" id="2oJmO5LZfqT" role="1PaTwD">
+                <property role="3oM_SC" value="we" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZfqU" role="1PaTwD">
+                <property role="3oM_SC" value="explicitly" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZfqV" role="1PaTwD">
+                <property role="3oM_SC" value="want" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZfqW" role="1PaTwD">
+                <property role="3oM_SC" value="to" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZfqX" role="1PaTwD">
+                <property role="3oM_SC" value="check" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZfqY" role="1PaTwD">
+                <property role="3oM_SC" value="for" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZfqZ" role="1PaTwD">
+                <property role="3oM_SC" value="identify" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZfr0" role="1PaTwD">
+                <property role="3oM_SC" value="here," />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZfr1" role="1PaTwD">
+                <property role="3oM_SC" value="not" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZfr2" role="1PaTwD">
+                <property role="3oM_SC" value="just" />
+              </node>
+              <node concept="3oM_SD" id="2oJmO5LZfr3" role="1PaTwD">
+                <property role="3oM_SC" value="equality" />
+              </node>
+            </node>
+          </node>
+          <node concept="3vwNmj" id="2oJmO5LZekU" role="3cqZAp">
+            <node concept="3clFbC" id="2oJmO5LZf90" role="3vwVQn">
+              <node concept="37vLTw" id="2oJmO5LZfhY" role="3uHU7w">
+                <ref role="3cqZAo" node="2oJmO5LYbed" resolve="actual" />
+              </node>
+              <node concept="10M0yZ" id="2oJmO5LZeK0" role="3uHU7B">
+                <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
+                <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+</model>
+

From fc8e13cd2b127cecb3c097daae6e762d3e3251c0 Mon Sep 17 00:00:00 2001
From: Dennis Albrecht <dalbrecht@itemis.com>
Date: Thu, 25 Sep 2025 14:29:05 +0200
Subject: [PATCH 16/18] added the scope function operations as base language
 operation

---
 ...mis.mps.baseLanguageExtensions.sandbox.mps | 143 +++++-
 ...tensions.generator.templates@generator.mps | 344 +++++++++++++-
 ...mis.mps.baseLanguageExtensions.actions.mps | 274 ++++++++++-
 ...emis.mps.baseLanguageExtensions.editor.mps |  26 +
 ...s.mps.baseLanguageExtensions.structure.mps |  62 ++-
 ....mps.baseLanguageExtensions.typesystem.mps | 443 +++++++++++++++---
 ...tensions.test.withIndexOperation@tests.mps |   2 +-
 7 files changed, 1200 insertions(+), 94 deletions(-)

diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
index 1b5d7efc2d..6f50aa8933 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
@@ -59,9 +59,11 @@
       <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="1225271484915" name="jetbrains.mps.baseLanguage.structure.SubstringExpression" flags="nn" index="17RM3I">
+        <child id="1225271484917" name="startIndex" index="17RM3C" />
         <child id="1225271484916" name="operand" index="17RM3D" />
         <child id="1225271484918" name="endIndex" index="17RM3F" />
       </concept>
+      <concept id="1225271546410" name="jetbrains.mps.baseLanguage.structure.TrimOperation" flags="nn" index="17S1cR" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -135,6 +137,12 @@
       <concept id="7915817776605258993" name="de.itemis.mps.baseLanguageExtensions.structure.SelectWithIndexOperation" flags="ng" index="2kBsqy" />
       <concept id="5842252078326680676" name="de.itemis.mps.baseLanguageExtensions.structure.GroupByOperation" flags="ng" index="2pSdkF" />
       <concept id="7488777117048605758" name="de.itemis.mps.baseLanguageExtensions.structure.ZipOperation" flags="ng" index="Kbfsy" />
+      <concept id="2751518233990321717" name="de.itemis.mps.baseLanguageExtensions.structure.ScopeFunctionOperation" flags="ng" index="1kbSPO">
+        <child id="2751518233990321719" name="closure" index="1kbSPQ" />
+      </concept>
+      <concept id="2751518233990321721" name="de.itemis.mps.baseLanguageExtensions.structure.ApplyScopeFunctionOperation" flags="ng" index="1kbSPS" />
+      <concept id="2751518233990321724" name="de.itemis.mps.baseLanguageExtensions.structure.LetScopeFunctionOperation" flags="ng" index="1kbSPX" />
+      <concept id="5566040892496752333" name="de.itemis.mps.baseLanguageExtensions.structure.SmartAtomicClosureParameterDeclaration" flags="ig" index="3nFU9Y" />
       <concept id="8919968723020343837" name="de.itemis.mps.baseLanguageExtensions.structure.ForEachWithIndexOperation" flags="ng" index="1sWJ9m" />
       <concept id="8919968723020245069" name="de.itemis.mps.baseLanguageExtensions.structure.WhereWithIndexOperation" flags="ng" index="1sZn06" />
       <concept id="578371460444482140" name="de.itemis.mps.baseLanguageExtensions.structure.ElvisOperation" flags="ng" index="1w0Eer" />
@@ -1250,8 +1258,8 @@
         <node concept="3clFbF" id="7Ja64GBeUXK" role="3cqZAp">
           <node concept="2OqwBi" id="7Ja64GBeUXH" role="3clFbG">
             <node concept="10M0yZ" id="7Ja64GBeUXI" role="2Oq$k0">
-              <ref role="1PxDUh" to="wyt6:~System" />
-              <ref role="3cqZAo" to="wyt6:~System.out" />
+              <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+              <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
             </node>
             <node concept="liA8E" id="7Ja64GBeUXJ" role="2OqNvi">
               <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.Object)" resolve="println" />
@@ -1271,7 +1279,7 @@
             <node concept="2OqwBi" id="7Ja64GBeNL_" role="33vP2m">
               <property role="hSjvv" value="true" />
               <node concept="37vLTw" id="7Ja64GBeOxn" role="2Oq$k0">
-                <ref role="3cqZAo" node="7Ja64GBeOxf" resolve="list" />
+                <ref role="3cqZAo" node="7Ja64GBeOxf" resolve="numsAsStrings" />
               </node>
               <node concept="1sZn06" id="7Ja64GBeNLH" role="2OqNvi">
                 <node concept="1bVj0M" id="7Ja64GBeNLI" role="23t8la">
@@ -1308,8 +1316,8 @@
         <node concept="3clFbF" id="7Ja64GBeOec" role="3cqZAp">
           <node concept="2OqwBi" id="7Ja64GBeOe9" role="3clFbG">
             <node concept="10M0yZ" id="7Ja64GBeOea" role="2Oq$k0">
-              <ref role="1PxDUh" to="wyt6:~System" />
-              <ref role="3cqZAo" to="wyt6:~System.out" />
+              <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+              <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
             </node>
             <node concept="liA8E" id="7Ja64GBeOeb" role="2OqNvi">
               <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.Object)" resolve="println" />
@@ -1332,8 +1340,8 @@
                   <node concept="3clFbF" id="7Ja64GBeXa7" role="3cqZAp">
                     <node concept="2OqwBi" id="7Ja64GBeXa4" role="3clFbG">
                       <node concept="10M0yZ" id="7Ja64GBeXa5" role="2Oq$k0">
-                        <ref role="1PxDUh" to="wyt6:~System" />
-                        <ref role="3cqZAo" to="wyt6:~System.out" />
+                        <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                        <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
                       </node>
                       <node concept="liA8E" id="7Ja64GBeXa6" role="2OqNvi">
                         <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
@@ -1377,5 +1385,126 @@
     </node>
     <node concept="3Tm1VV" id="7Ja64GBeFG7" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="2oJmO5M1vQc">
+    <property role="TrG5h" value="ScopeFunctionSandbox" />
+    <node concept="2YIFZL" id="2oJmO5M1vRw" role="jymVt">
+      <property role="TrG5h" value="usage" />
+      <node concept="3clFbS" id="2oJmO5M1vRz" role="3clF47">
+        <node concept="3cpWs8" id="2oJmO5M4ASK" role="3cqZAp">
+          <node concept="3cpWsn" id="2oJmO5M4ASL" role="3cpWs9">
+            <property role="TrG5h" value="string" />
+            <node concept="17QB3L" id="2oJmO5M4AQI" role="1tU5fm" />
+            <node concept="2OqwBi" id="2oJmO5M4ASM" role="33vP2m">
+              <node concept="Xl_RD" id="2oJmO5M4ASN" role="2Oq$k0">
+                <property role="Xl_RC" value="Test" />
+              </node>
+              <node concept="1kbSPS" id="2oJmO5M4ASO" role="2OqNvi">
+                <node concept="1bVj0M" id="2oJmO5M4ASP" role="1kbSPQ">
+                  <node concept="37vLTG" id="2oJmO5M4ASQ" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="17QB3L" id="2oJmO5M4ASR" role="1tU5fm" />
+                  </node>
+                  <node concept="3clFbS" id="2oJmO5M4ASS" role="1bW5cS">
+                    <node concept="3clFbF" id="2oJmO5M4AST" role="3cqZAp">
+                      <node concept="2OqwBi" id="2oJmO5M4ASU" role="3clFbG">
+                        <node concept="37vLTw" id="2oJmO5M4ASV" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2oJmO5M4ASQ" resolve="it" />
+                        </node>
+                        <node concept="liA8E" id="2oJmO5M4ASW" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2oJmO5M54P1" role="3cqZAp">
+          <node concept="3cpWsn" id="2oJmO5M54P2" role="3cpWs9">
+            <property role="TrG5h" value="i" />
+            <node concept="10Oyi0" id="2oJmO5M54Cw" role="1tU5fm" />
+            <node concept="2OqwBi" id="2oJmO5M54P3" role="33vP2m">
+              <node concept="Xl_RD" id="2oJmO5M54P4" role="2Oq$k0">
+                <property role="Xl_RC" value="Test" />
+              </node>
+              <node concept="1kbSPX" id="2oJmO5M54P5" role="2OqNvi">
+                <node concept="1bVj0M" id="2oJmO5M54P6" role="1kbSPQ">
+                  <node concept="37vLTG" id="2oJmO5M54P7" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="17QB3L" id="2oJmO5M54P8" role="1tU5fm" />
+                  </node>
+                  <node concept="3clFbS" id="2oJmO5M54P9" role="1bW5cS">
+                    <node concept="3clFbF" id="2oJmO5M54Pa" role="3cqZAp">
+                      <node concept="2OqwBi" id="2oJmO5M54Pb" role="3clFbG">
+                        <node concept="37vLTw" id="2oJmO5M54Pc" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2oJmO5M54P7" resolve="it" />
+                        </node>
+                        <node concept="liA8E" id="2oJmO5M54Pd" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4OYzbeq$4t9" role="3cqZAp">
+          <node concept="2OqwBi" id="4OYzbeq$4Si" role="3clFbG">
+            <node concept="Xl_RD" id="4OYzbeq$4t8" role="2Oq$k0">
+              <property role="Xl_RC" value="Text" />
+            </node>
+            <node concept="1kbSPS" id="4OYzbeqB09M" role="2OqNvi">
+              <node concept="1bVj0M" id="4OYzbeqB09O" role="1kbSPQ">
+                <node concept="3clFbS" id="4OYzbeqB09P" role="1bW5cS">
+                  <node concept="3clFbF" id="4OYzbeqCCWw" role="3cqZAp">
+                    <node concept="2OqwBi" id="4OYzbeqCDkV" role="3clFbG">
+                      <node concept="10M0yZ" id="4OYzbeqCCWE" role="2Oq$k0">
+                        <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
+                        <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                      </node>
+                      <node concept="liA8E" id="4OYzbeqCD_d" role="2OqNvi">
+                        <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                        <node concept="17RM3I" id="4OYzbeqCEUj" role="37wK5m">
+                          <node concept="37vLTw" id="4OYzbeqCDCt" role="17RM3D">
+                            <ref role="3cqZAo" node="4OYzbeqB09Q" resolve="it" />
+                          </node>
+                          <node concept="3cmrfG" id="4OYzbeqCF5s" role="17RM3C">
+                            <property role="3cmrfH" value="1" />
+                          </node>
+                          <node concept="3cmrfG" id="4OYzbeqCF8Z" role="17RM3F">
+                            <property role="3cmrfH" value="3" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3nFU9Y" id="4OYzbeqB09Q" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="4OYzbeqB09R" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2oJmO5MkFel" role="3cqZAp" />
+        <node concept="3clFbF" id="2oJmO5M1U_l" role="3cqZAp">
+          <node concept="2OqwBi" id="2oJmO5M2lvm" role="3clFbG">
+            <node concept="Xl_RD" id="2oJmO5M1U_k" role="2Oq$k0">
+              <property role="Xl_RC" value="Test" />
+            </node>
+            <node concept="17S1cR" id="2oJmO5M2lD8" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2oJmO5M1vR9" role="1B3o_S" />
+      <node concept="3cqZAl" id="2oJmO5M1vRm" role="3clF45" />
+    </node>
+    <node concept="3Tm1VV" id="2oJmO5M1vQd" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
index 45a1a8a71c..377562bbf5 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
@@ -428,7 +428,7 @@
           </node>
           <node concept="10Nm6u" id="54jQkZ9fKdF" role="37wK5m">
             <node concept="1sPUBX" id="54jQkZ9fKkf" role="lGtFl">
-              <ref role="v9R2y" node="54jQkZ9fKWX" resolve="GroupByOperation" />
+              <ref role="v9R2y" node="54jQkZ9fKWX" resolve="switchClosureLiteral" />
               <node concept="3NFfHV" id="54jQkZ9ghak" role="1sPUBK">
                 <node concept="3clFbS" id="54jQkZ9ghal" role="2VODD2">
                   <node concept="3clFbF" id="54jQkZ9ghe5" role="3cqZAp">
@@ -480,7 +480,7 @@
       <node concept="gft3U" id="7Ja64GBaq9Z" role="1lVwrX">
         <node concept="2YIFZM" id="7Ja64GBar5T" role="gfFT$">
           <ref role="37wK5l" to="96gm:7Ja64GBadQG" resolve="selectWithIndex" />
-          <ref role="1Pybhc" to="96gm:7Ja64GBadPz" resolve="SelectWithIndexOperationUtil" />
+          <ref role="1Pybhc" to="96gm:7Ja64GBadPz" resolve="WithIndexOperationUtil" />
           <node concept="10Nm6u" id="7Ja64GBar5U" role="37wK5m">
             <node concept="29HgVG" id="7Ja64GBar5V" role="lGtFl">
               <node concept="3NFfHV" id="7Ja64GBar5W" role="3NFExx">
@@ -499,7 +499,7 @@
           </node>
           <node concept="10Nm6u" id="7Ja64GBar62" role="37wK5m">
             <node concept="1sPUBX" id="7Ja64GBar63" role="lGtFl">
-              <ref role="v9R2y" node="54jQkZ9fKWX" resolve="GroupByOperation" />
+              <ref role="v9R2y" node="54jQkZ9fKWX" resolve="switchClosureLiteral" />
               <node concept="3NFfHV" id="7Ja64GBar6b" role="1sPUBK">
                 <node concept="3clFbS" id="7Ja64GBar6c" role="2VODD2">
                   <node concept="3clFbF" id="7Ja64GBar6d" role="3cqZAp">
@@ -688,9 +688,342 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="2oJmO5M55Or" role="3acgRq">
+      <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
+      <node concept="gft3U" id="2oJmO5M57Ad" role="1lVwrX">
+        <node concept="2YIFZM" id="2oJmO5M5beM" role="gfFT$">
+          <ref role="37wK5l" to="96gm:2oJmO5LXrKn" resolve="applyVoid" />
+          <ref role="1Pybhc" to="96gm:2oJmO5LUej2" resolve="ScopeFunctionUtil" />
+          <node concept="1W57fq" id="2oJmO5M5beN" role="lGtFl">
+            <node concept="3IZrLx" id="2oJmO5M5beO" role="3IZSJc">
+              <node concept="3clFbS" id="2oJmO5M5beP" role="2VODD2">
+                <node concept="3clFbF" id="2oJmO5M5beQ" role="3cqZAp">
+                  <node concept="2OqwBi" id="2oJmO5M5beR" role="3clFbG">
+                    <node concept="2OqwBi" id="2oJmO5M5beS" role="2Oq$k0">
+                      <node concept="1PxgMI" id="2oJmO5M5beT" role="2Oq$k0">
+                        <node concept="chp4Y" id="2oJmO5M5beU" role="3oSUPX">
+                          <ref role="cht4Q" to="tp2c:htajhBZ" resolve="FunctionType" />
+                        </node>
+                        <node concept="2OqwBi" id="2oJmO5M5beV" role="1m5AlR">
+                          <node concept="2OqwBi" id="2oJmO5Mi59l" role="2Oq$k0">
+                            <node concept="1PxgMI" id="2oJmO5Mi4HA" role="2Oq$k0">
+                              <node concept="chp4Y" id="2oJmO5Mi4YS" role="3oSUPX">
+                                <ref role="cht4Q" to="pkab:2oJmO5M0doT" resolve="ApplyScopeFunctionOperation" />
+                              </node>
+                              <node concept="2OqwBi" id="2oJmO5M5beW" role="1m5AlR">
+                                <node concept="3TrEf2" id="2oJmO5M5beX" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                                </node>
+                                <node concept="30H73N" id="2oJmO5M5beY" role="2Oq$k0" />
+                              </node>
+                            </node>
+                            <node concept="3TrEf2" id="2oJmO5Mi5yq" role="2OqNvi">
+                              <ref role="3Tt5mk" to="pkab:2oJmO5M0doR" resolve="closure" />
+                            </node>
+                          </node>
+                          <node concept="3JvlWi" id="2oJmO5M5beZ" role="2OqNvi" />
+                        </node>
+                      </node>
+                      <node concept="3TrEf2" id="2oJmO5M5bf0" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tp2c:htajldL" resolve="resultType" />
+                      </node>
+                    </node>
+                    <node concept="1mIQ4w" id="2oJmO5M5bf1" role="2OqNvi">
+                      <node concept="chp4Y" id="2oJmO5M5bf2" role="cj9EA">
+                        <ref role="cht4Q" to="tpee:fzcqZ_H" resolve="VoidType" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="gft3U" id="2oJmO5M5bf3" role="UU_$l">
+              <node concept="2YIFZM" id="2oJmO5M5bhc" role="gfFT$">
+                <ref role="37wK5l" to="96gm:2oJmO5LUek_" resolve="apply" />
+                <ref role="1Pybhc" to="96gm:2oJmO5LUej2" resolve="ScopeFunctionUtil" />
+                <node concept="10Nm6u" id="2oJmO5M7f2i" role="37wK5m">
+                  <node concept="29HgVG" id="2oJmO5M7f2j" role="lGtFl">
+                    <node concept="3NFfHV" id="2oJmO5M7f2k" role="3NFExx">
+                      <node concept="3clFbS" id="2oJmO5M7f2l" role="2VODD2">
+                        <node concept="3clFbF" id="2oJmO5M7f2m" role="3cqZAp">
+                          <node concept="2OqwBi" id="2oJmO5M7f2n" role="3clFbG">
+                            <node concept="30H73N" id="2oJmO5M7f2o" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="2oJmO5M7f2p" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="10Nm6u" id="2oJmO5M5cfb" role="37wK5m">
+                  <node concept="1sPUBX" id="4OYzbeqyZ5C" role="lGtFl">
+                    <ref role="v9R2y" node="54jQkZ9fKWX" resolve="switchClosureLiteral" />
+                    <node concept="3NFfHV" id="4OYzbeqz1eH" role="1sPUBK">
+                      <node concept="3clFbS" id="4OYzbeqz1eI" role="2VODD2">
+                        <node concept="3clFbF" id="4OYzbeqz1eJ" role="3cqZAp">
+                          <node concept="2OqwBi" id="4OYzbeqz1eK" role="3clFbG">
+                            <node concept="1PxgMI" id="4OYzbeqz1eL" role="2Oq$k0">
+                              <node concept="chp4Y" id="4OYzbeqz1eM" role="3oSUPX">
+                                <ref role="cht4Q" to="pkab:2oJmO5M0doT" resolve="ApplyScopeFunctionOperation" />
+                              </node>
+                              <node concept="2OqwBi" id="4OYzbeqz1eN" role="1m5AlR">
+                                <node concept="30H73N" id="4OYzbeqz1eO" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="4OYzbeqz1eP" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3TrEf2" id="4OYzbeqz1eQ" role="2OqNvi">
+                              <ref role="3Tt5mk" to="pkab:2oJmO5M0doR" resolve="closure" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="10Nm6u" id="2oJmO5M7f7v" role="37wK5m">
+            <node concept="29HgVG" id="2oJmO5M7f7w" role="lGtFl">
+              <node concept="3NFfHV" id="2oJmO5M7f7x" role="3NFExx">
+                <node concept="3clFbS" id="2oJmO5M7f7y" role="2VODD2">
+                  <node concept="3clFbF" id="2oJmO5M7f7z" role="3cqZAp">
+                    <node concept="2OqwBi" id="2oJmO5M7f7$" role="3clFbG">
+                      <node concept="30H73N" id="2oJmO5M7f7_" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="2oJmO5M7f7A" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="10Nm6u" id="2oJmO5M5bXg" role="37wK5m">
+            <node concept="1sPUBX" id="4OYzbeqyZ1m" role="lGtFl">
+              <ref role="v9R2y" node="54jQkZ9fKWX" resolve="switchClosureLiteral" />
+              <node concept="3NFfHV" id="4OYzbeqyZcv" role="1sPUBK">
+                <node concept="3clFbS" id="4OYzbeqyZcw" role="2VODD2">
+                  <node concept="3clFbF" id="4OYzbeqyZdg" role="3cqZAp">
+                    <node concept="2OqwBi" id="4OYzbeqz0ue" role="3clFbG">
+                      <node concept="1PxgMI" id="4OYzbeqz0b0" role="2Oq$k0">
+                        <node concept="chp4Y" id="4OYzbeqz0bY" role="3oSUPX">
+                          <ref role="cht4Q" to="pkab:2oJmO5M0doT" resolve="ApplyScopeFunctionOperation" />
+                        </node>
+                        <node concept="2OqwBi" id="4OYzbeqyZEs" role="1m5AlR">
+                          <node concept="30H73N" id="4OYzbeqyZdf" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="4OYzbeqyZZh" role="2OqNvi">
+                            <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3TrEf2" id="4OYzbeqz18j" role="2OqNvi">
+                        <ref role="3Tt5mk" to="pkab:2oJmO5M0doR" resolve="closure" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="2oJmO5M564Q" role="30HLyM">
+        <node concept="3clFbS" id="2oJmO5M564R" role="2VODD2">
+          <node concept="3clFbF" id="2oJmO5M56m7" role="3cqZAp">
+            <node concept="2OqwBi" id="2oJmO5M57af" role="3clFbG">
+              <node concept="2OqwBi" id="2oJmO5M56DI" role="2Oq$k0">
+                <node concept="30H73N" id="2oJmO5M56m6" role="2Oq$k0" />
+                <node concept="3TrEf2" id="2oJmO5M56X_" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                </node>
+              </node>
+              <node concept="1mIQ4w" id="2oJmO5M57zv" role="2OqNvi">
+                <node concept="chp4Y" id="2oJmO5M57$s" role="cj9EA">
+                  <ref role="cht4Q" to="pkab:2oJmO5M0doT" resolve="ApplyScopeFunctionOperation" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="2oJmO5M57Be" role="3acgRq">
+      <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
+      <node concept="gft3U" id="2oJmO5M57Bf" role="1lVwrX">
+        <node concept="2YIFZM" id="2oJmO5M5bUr" role="gfFT$">
+          <ref role="37wK5l" to="96gm:2oJmO5LUfj9" resolve="letVoid" />
+          <ref role="1Pybhc" to="96gm:2oJmO5LUej2" resolve="ScopeFunctionUtil" />
+          <node concept="10Nm6u" id="2oJmO5M7eX8" role="37wK5m">
+            <node concept="29HgVG" id="2oJmO5M7eX9" role="lGtFl">
+              <node concept="3NFfHV" id="2oJmO5M7eXa" role="3NFExx">
+                <node concept="3clFbS" id="2oJmO5M7eXb" role="2VODD2">
+                  <node concept="3clFbF" id="2oJmO5M7eXc" role="3cqZAp">
+                    <node concept="2OqwBi" id="2oJmO5M7eXd" role="3clFbG">
+                      <node concept="30H73N" id="2oJmO5M7eXe" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="2oJmO5M7eXf" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="10Nm6u" id="2oJmO5M5cfY" role="37wK5m">
+            <node concept="1sPUBX" id="4OYzbeqyZ6Z" role="lGtFl">
+              <ref role="v9R2y" node="54jQkZ9fKWX" resolve="switchClosureLiteral" />
+              <node concept="3NFfHV" id="4OYzbeqz1ml" role="1sPUBK">
+                <node concept="3clFbS" id="4OYzbeqz1mm" role="2VODD2">
+                  <node concept="3clFbF" id="4OYzbeqz1mn" role="3cqZAp">
+                    <node concept="2OqwBi" id="4OYzbeqz1mo" role="3clFbG">
+                      <node concept="1PxgMI" id="4OYzbeqz1mp" role="2Oq$k0">
+                        <node concept="chp4Y" id="4OYzbeqz1mq" role="3oSUPX">
+                          <ref role="cht4Q" to="pkab:2oJmO5M0doW" resolve="LetScopeFunctionOperation" />
+                        </node>
+                        <node concept="2OqwBi" id="4OYzbeqz1mr" role="1m5AlR">
+                          <node concept="30H73N" id="4OYzbeqz1ms" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="4OYzbeqz1mt" role="2OqNvi">
+                            <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3TrEf2" id="4OYzbeqz1mu" role="2OqNvi">
+                        <ref role="3Tt5mk" to="pkab:2oJmO5M0doR" resolve="closure" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1W57fq" id="2oJmO5M5bUs" role="lGtFl">
+            <node concept="3IZrLx" id="2oJmO5M5bUt" role="3IZSJc">
+              <node concept="3clFbS" id="2oJmO5M5bUu" role="2VODD2">
+                <node concept="3clFbF" id="2oJmO5M5bUv" role="3cqZAp">
+                  <node concept="2OqwBi" id="2oJmO5M5bUw" role="3clFbG">
+                    <node concept="2OqwBi" id="2oJmO5M5bUx" role="2Oq$k0">
+                      <node concept="1PxgMI" id="2oJmO5M5bUy" role="2Oq$k0">
+                        <node concept="chp4Y" id="2oJmO5M5bUz" role="3oSUPX">
+                          <ref role="cht4Q" to="tp2c:htajhBZ" resolve="FunctionType" />
+                        </node>
+                        <node concept="2OqwBi" id="2oJmO5M5bU$" role="1m5AlR">
+                          <node concept="3JvlWi" id="2oJmO5M5bUC" role="2OqNvi" />
+                          <node concept="2OqwBi" id="2oJmO5Mi5Am" role="2Oq$k0">
+                            <node concept="1PxgMI" id="2oJmO5Mi5An" role="2Oq$k0">
+                              <node concept="chp4Y" id="2oJmO5Mi5Ao" role="3oSUPX">
+                                <ref role="cht4Q" to="pkab:2oJmO5M0doW" resolve="LetScopeFunctionOperation" />
+                              </node>
+                              <node concept="2OqwBi" id="2oJmO5Mi5Ap" role="1m5AlR">
+                                <node concept="3TrEf2" id="2oJmO5Mi5Aq" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                                </node>
+                                <node concept="30H73N" id="2oJmO5Mi5Ar" role="2Oq$k0" />
+                              </node>
+                            </node>
+                            <node concept="3TrEf2" id="2oJmO5Mi5As" role="2OqNvi">
+                              <ref role="3Tt5mk" to="pkab:2oJmO5M0doR" resolve="closure" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3TrEf2" id="2oJmO5M5bUD" role="2OqNvi">
+                        <ref role="3Tt5mk" to="tp2c:htajldL" resolve="resultType" />
+                      </node>
+                    </node>
+                    <node concept="1mIQ4w" id="2oJmO5M5bUE" role="2OqNvi">
+                      <node concept="chp4Y" id="2oJmO5M5bUF" role="cj9EA">
+                        <ref role="cht4Q" to="tpee:fzcqZ_H" resolve="VoidType" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="gft3U" id="2oJmO5M5bUG" role="UU_$l">
+              <node concept="2YIFZM" id="2oJmO5M5bUH" role="gfFT$">
+                <ref role="37wK5l" to="96gm:2oJmO5LUeQ4" resolve="let" />
+                <ref role="1Pybhc" to="96gm:2oJmO5LUej2" resolve="ScopeFunctionUtil" />
+                <node concept="10Nm6u" id="2oJmO5M5cxQ" role="37wK5m">
+                  <node concept="29HgVG" id="2oJmO5M5czb" role="lGtFl">
+                    <node concept="3NFfHV" id="2oJmO5M5czM" role="3NFExx">
+                      <node concept="3clFbS" id="2oJmO5M5czN" role="2VODD2">
+                        <node concept="3clFbF" id="2oJmO5M5cD2" role="3cqZAp">
+                          <node concept="2OqwBi" id="2oJmO5M5d7I" role="3clFbG">
+                            <node concept="30H73N" id="2oJmO5M5cD1" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="2oJmO5M7ebg" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="10Nm6u" id="2oJmO5M5cxR" role="37wK5m">
+                  <node concept="1sPUBX" id="4OYzbeqyZbc" role="lGtFl">
+                    <ref role="v9R2y" node="54jQkZ9fKWX" resolve="switchClosureLiteral" />
+                    <node concept="3NFfHV" id="4OYzbeqz1NY" role="1sPUBK">
+                      <node concept="3clFbS" id="4OYzbeqz1NZ" role="2VODD2">
+                        <node concept="3clFbF" id="4OYzbeqz1O0" role="3cqZAp">
+                          <node concept="2OqwBi" id="4OYzbeqz1O1" role="3clFbG">
+                            <node concept="1PxgMI" id="4OYzbeqz1O2" role="2Oq$k0">
+                              <node concept="chp4Y" id="4OYzbeqz1O3" role="3oSUPX">
+                                <ref role="cht4Q" to="pkab:2oJmO5M0doW" resolve="LetScopeFunctionOperation" />
+                              </node>
+                              <node concept="2OqwBi" id="4OYzbeqz1O4" role="1m5AlR">
+                                <node concept="30H73N" id="4OYzbeqz1O5" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="4OYzbeqz1O6" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3TrEf2" id="4OYzbeqz1O7" role="2OqNvi">
+                              <ref role="3Tt5mk" to="pkab:2oJmO5M0doR" resolve="closure" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="2oJmO5M57Bh" role="30HLyM">
+        <node concept="3clFbS" id="2oJmO5M57Bi" role="2VODD2">
+          <node concept="3clFbF" id="2oJmO5M57Bj" role="3cqZAp">
+            <node concept="2OqwBi" id="2oJmO5M57Bk" role="3clFbG">
+              <node concept="2OqwBi" id="2oJmO5M57Bl" role="2Oq$k0">
+                <node concept="30H73N" id="2oJmO5M57Bm" role="2Oq$k0" />
+                <node concept="3TrEf2" id="2oJmO5M57Bn" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                </node>
+              </node>
+              <node concept="1mIQ4w" id="2oJmO5M57Bo" role="2OqNvi">
+                <node concept="chp4Y" id="2oJmO5M57Bp" role="cj9EA">
+                  <ref role="cht4Q" to="pkab:2oJmO5M0doW" resolve="LetScopeFunctionOperation" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="jVnub" id="54jQkZ9fKWX">
     <property role="TrG5h" value="switchClosureLiteral" />
+    <node concept="gft3U" id="54jQkZ9g94P" role="jxRDz">
+      <node concept="10Nm6u" id="54jQkZ9g97V" role="gfFT$">
+        <node concept="29HgVG" id="54jQkZ9g984" role="lGtFl" />
+      </node>
+    </node>
     <node concept="3aamgX" id="7Ja64GBawMh" role="3aUrZf">
       <property role="36QftV" value="true" />
       <ref role="30HIoZ" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
@@ -847,11 +1180,6 @@
         </node>
       </node>
     </node>
-    <node concept="gft3U" id="54jQkZ9g94P" role="jxRDz">
-      <node concept="10Nm6u" id="54jQkZ9g97V" role="gfFT$">
-        <node concept="29HgVG" id="54jQkZ9g984" role="lGtFl" />
-      </node>
-    </node>
   </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps
index dc8d51ef51..44c1b6a523 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.actions.mps
@@ -374,7 +374,7 @@
                       <node concept="2OqwBi" id="7Ja64GB9RLQ" role="3clFbG">
                         <node concept="2OqwBi" id="7Ja64GB9NTc" role="2Oq$k0">
                           <node concept="37vLTw" id="7Ja64GB9Nw8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7Ja64GB9JEq" resolve="pDecl" />
+                            <ref role="3cqZAo" node="7Ja64GB9JEq" resolve="pDeclIt" />
                           </node>
                           <node concept="3TrcHB" id="7Ja64GB9Omk" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -853,5 +853,277 @@
       </node>
     </node>
   </node>
+  <node concept="37WguZ" id="2oJmO5MktDH">
+    <property role="TrG5h" value="ScopeFunction_operations" />
+    <property role="3GE5qa" value="scopeFunction" />
+    <node concept="37WvkG" id="2oJmO5MkuVJ" role="37WGs$">
+      <ref role="37XkoT" to="pkab:2oJmO5M0doT" resolve="ApplyScopeFunctionOperation" />
+      <node concept="37Y9Zx" id="2oJmO5MkuVK" role="37ZfLb">
+        <node concept="3clFbS" id="2oJmO5MkuVL" role="2VODD2">
+          <node concept="3clFbJ" id="2oJmO5MkuWm" role="3cqZAp">
+            <node concept="3clFbS" id="2oJmO5MkuWn" role="3clFbx">
+              <node concept="3clFbF" id="2oJmO5MkuWo" role="3cqZAp">
+                <node concept="2OqwBi" id="2oJmO5MkuWp" role="3clFbG">
+                  <node concept="2OqwBi" id="2oJmO5MkuWq" role="2Oq$k0">
+                    <node concept="1r4Lsj" id="2oJmO5MkuWr" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="2oJmO5MkuWs" role="2OqNvi">
+                      <ref role="3Tt5mk" to="pkab:2oJmO5M0doR" resolve="closure" />
+                    </node>
+                  </node>
+                  <node concept="2oxUTD" id="2oJmO5MkuWt" role="2OqNvi">
+                    <node concept="2OqwBi" id="2oJmO5MkuWu" role="2oxUTC">
+                      <node concept="2OqwBi" id="2oJmO5MkuWv" role="2Oq$k0">
+                        <node concept="1PxgMI" id="2oJmO5MkuWw" role="2Oq$k0">
+                          <node concept="1r4N5L" id="2oJmO5MkuWx" role="1m5AlR" />
+                          <node concept="chp4Y" id="2oJmO5MkuWy" role="3oSUPX">
+                            <ref role="cht4Q" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
+                          </node>
+                        </node>
+                        <node concept="3TrEf2" id="2oJmO5MkuWz" role="2OqNvi">
+                          <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                        </node>
+                      </node>
+                      <node concept="3YRAZt" id="2oJmO5MkuW$" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="2oJmO5MkuW_" role="3clFbw">
+              <node concept="1r4N5L" id="2oJmO5MkuWA" role="2Oq$k0" />
+              <node concept="1mIQ4w" id="2oJmO5MkuWB" role="2OqNvi">
+                <node concept="chp4Y" id="2oJmO5MkuWC" role="cj9EA">
+                  <ref role="cht4Q" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
+                </node>
+              </node>
+            </node>
+            <node concept="9aQIb" id="2oJmO5MkuWD" role="9aQIa">
+              <node concept="3clFbS" id="2oJmO5MkuWE" role="9aQI4">
+                <node concept="3cpWs8" id="2oJmO5MkuWF" role="3cqZAp">
+                  <node concept="3cpWsn" id="2oJmO5MkuWG" role="3cpWs9">
+                    <property role="TrG5h" value="sel" />
+                    <node concept="3Tqbb2" id="2oJmO5MkuWH" role="1tU5fm">
+                      <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
+                    </node>
+                    <node concept="2OqwBi" id="2oJmO5MkuWI" role="33vP2m">
+                      <node concept="1r4Lsj" id="2oJmO5MkuWJ" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="2oJmO5MkuWK" role="2OqNvi">
+                        <ref role="3Tt5mk" to="pkab:2oJmO5M0doR" resolve="closure" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="2oJmO5MkuWL" role="3cqZAp">
+                  <node concept="3clFbS" id="2oJmO5MkuWM" role="3clFbx">
+                    <node concept="3clFbF" id="2oJmO5MkuWN" role="3cqZAp">
+                      <node concept="37vLTI" id="2oJmO5MkuWO" role="3clFbG">
+                        <node concept="2OqwBi" id="2oJmO5MkuWP" role="37vLTx">
+                          <node concept="2OqwBi" id="2oJmO5MkuWQ" role="2Oq$k0">
+                            <node concept="1r4Lsj" id="2oJmO5MkuWR" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="2oJmO5MkuWS" role="2OqNvi">
+                              <ref role="3Tt5mk" to="pkab:2oJmO5M0doR" resolve="closure" />
+                            </node>
+                          </node>
+                          <node concept="2DeJnY" id="2oJmO5MkuWT" role="2OqNvi">
+                            <ref role="1A9B2P" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="2oJmO5MkuWU" role="37vLTJ">
+                          <ref role="3cqZAo" node="2oJmO5MkuWG" resolve="sel" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="2oJmO5MkuWV" role="3clFbw">
+                    <node concept="37vLTw" id="2oJmO5MkuWW" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2oJmO5MkuWG" resolve="sel" />
+                    </node>
+                    <node concept="3w_OXm" id="2oJmO5MkuWX" role="2OqNvi" />
+                  </node>
+                </node>
+                <node concept="3cpWs8" id="2oJmO5MkuWY" role="3cqZAp">
+                  <node concept="3cpWsn" id="2oJmO5MkuWZ" role="3cpWs9">
+                    <property role="TrG5h" value="pd" />
+                    <node concept="3Tqbb2" id="2oJmO5MkuX0" role="1tU5fm">
+                      <ref role="ehGHo" to="pkab:4OYzbeq$iVd" resolve="SmartAtomicClosureParameterDeclaration" />
+                    </node>
+                    <node concept="2OqwBi" id="2oJmO5MkuX1" role="33vP2m">
+                      <node concept="2OqwBi" id="2oJmO5MkuX2" role="2Oq$k0">
+                        <node concept="1PxgMI" id="2oJmO5MkuX3" role="2Oq$k0">
+                          <node concept="37vLTw" id="2oJmO5MkuX4" role="1m5AlR">
+                            <ref role="3cqZAo" node="2oJmO5MkuWG" resolve="sel" />
+                          </node>
+                          <node concept="chp4Y" id="2oJmO5MkuX5" role="3oSUPX">
+                            <ref role="cht4Q" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+                          </node>
+                        </node>
+                        <node concept="3Tsc0h" id="2oJmO5MkuX6" role="2OqNvi">
+                          <ref role="3TtcxE" to="tp2c:htbW2KO" resolve="parameter" />
+                        </node>
+                      </node>
+                      <node concept="2DeJg1" id="2oJmO5MkuX7" role="2OqNvi">
+                        <ref role="1A0vxQ" to="pkab:4OYzbeq$iVd" resolve="SmartAtomicClosureParameterDeclaration" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="2oJmO5MkuX8" role="3cqZAp">
+                  <node concept="2OqwBi" id="2oJmO5MkuX9" role="3clFbG">
+                    <node concept="2OqwBi" id="2oJmO5MkuXa" role="2Oq$k0">
+                      <node concept="37vLTw" id="2oJmO5MkuXb" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2oJmO5MkuWZ" resolve="pd" />
+                      </node>
+                      <node concept="3TrcHB" id="2oJmO5MkuXc" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                    <node concept="tyxLq" id="2oJmO5MkuXd" role="2OqNvi">
+                      <node concept="Xl_RD" id="2oJmO5MkuXe" role="tz02z">
+                        <property role="Xl_RC" value="it" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="37WvkG" id="2oJmO5MkuW2" role="37WGs$">
+      <ref role="37XkoT" to="pkab:2oJmO5M0doW" resolve="LetScopeFunctionOperation" />
+      <node concept="37Y9Zx" id="2oJmO5MkuW3" role="37ZfLb">
+        <node concept="3clFbS" id="2oJmO5MkuW4" role="2VODD2">
+          <node concept="3clFbJ" id="2oJmO5Mkwjy" role="3cqZAp">
+            <node concept="3clFbS" id="2oJmO5Mkwjz" role="3clFbx">
+              <node concept="3clFbF" id="2oJmO5Mkwj$" role="3cqZAp">
+                <node concept="2OqwBi" id="2oJmO5Mkwj_" role="3clFbG">
+                  <node concept="2OqwBi" id="2oJmO5MkwjA" role="2Oq$k0">
+                    <node concept="1r4Lsj" id="2oJmO5MkwjB" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="2oJmO5MkwjC" role="2OqNvi">
+                      <ref role="3Tt5mk" to="pkab:2oJmO5M0doR" resolve="closure" />
+                    </node>
+                  </node>
+                  <node concept="2oxUTD" id="2oJmO5MkwjD" role="2OqNvi">
+                    <node concept="2OqwBi" id="2oJmO5MkwjE" role="2oxUTC">
+                      <node concept="2OqwBi" id="2oJmO5MkwjF" role="2Oq$k0">
+                        <node concept="1PxgMI" id="2oJmO5MkwjG" role="2Oq$k0">
+                          <node concept="1r4N5L" id="2oJmO5MkwjH" role="1m5AlR" />
+                          <node concept="chp4Y" id="2oJmO5MkwjI" role="3oSUPX">
+                            <ref role="cht4Q" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
+                          </node>
+                        </node>
+                        <node concept="3TrEf2" id="2oJmO5MkwjJ" role="2OqNvi">
+                          <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
+                        </node>
+                      </node>
+                      <node concept="3YRAZt" id="2oJmO5MkwjK" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="2oJmO5MkwjL" role="3clFbw">
+              <node concept="1r4N5L" id="2oJmO5MkwjM" role="2Oq$k0" />
+              <node concept="1mIQ4w" id="2oJmO5MkwjN" role="2OqNvi">
+                <node concept="chp4Y" id="2oJmO5MkwjO" role="cj9EA">
+                  <ref role="cht4Q" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
+                </node>
+              </node>
+            </node>
+            <node concept="9aQIb" id="2oJmO5MkwjP" role="9aQIa">
+              <node concept="3clFbS" id="2oJmO5MkwjQ" role="9aQI4">
+                <node concept="3cpWs8" id="2oJmO5MkwjR" role="3cqZAp">
+                  <node concept="3cpWsn" id="2oJmO5MkwjS" role="3cpWs9">
+                    <property role="TrG5h" value="sel" />
+                    <node concept="3Tqbb2" id="2oJmO5MkwjT" role="1tU5fm">
+                      <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
+                    </node>
+                    <node concept="2OqwBi" id="2oJmO5MkwjU" role="33vP2m">
+                      <node concept="1r4Lsj" id="2oJmO5MkwjV" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="2oJmO5MkwjW" role="2OqNvi">
+                        <ref role="3Tt5mk" to="pkab:2oJmO5M0doR" resolve="closure" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="2oJmO5MkwjX" role="3cqZAp">
+                  <node concept="3clFbS" id="2oJmO5MkwjY" role="3clFbx">
+                    <node concept="3clFbF" id="2oJmO5MkwjZ" role="3cqZAp">
+                      <node concept="37vLTI" id="2oJmO5Mkwk0" role="3clFbG">
+                        <node concept="2OqwBi" id="2oJmO5Mkwk1" role="37vLTx">
+                          <node concept="2OqwBi" id="2oJmO5Mkwk2" role="2Oq$k0">
+                            <node concept="1r4Lsj" id="2oJmO5Mkwk3" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="2oJmO5Mkwk4" role="2OqNvi">
+                              <ref role="3Tt5mk" to="pkab:2oJmO5M0doR" resolve="closure" />
+                            </node>
+                          </node>
+                          <node concept="2DeJnY" id="2oJmO5Mkwk5" role="2OqNvi">
+                            <ref role="1A9B2P" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="2oJmO5Mkwk6" role="37vLTJ">
+                          <ref role="3cqZAo" node="2oJmO5MkwjS" resolve="sel" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="2oJmO5Mkwk7" role="3clFbw">
+                    <node concept="37vLTw" id="2oJmO5Mkwk8" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2oJmO5MkwjS" resolve="sel" />
+                    </node>
+                    <node concept="3w_OXm" id="2oJmO5Mkwk9" role="2OqNvi" />
+                  </node>
+                </node>
+                <node concept="3cpWs8" id="2oJmO5Mkwka" role="3cqZAp">
+                  <node concept="3cpWsn" id="2oJmO5Mkwkb" role="3cpWs9">
+                    <property role="TrG5h" value="pd" />
+                    <node concept="3Tqbb2" id="2oJmO5Mkwkc" role="1tU5fm">
+                      <ref role="ehGHo" to="pkab:4OYzbeq$iVd" resolve="SmartAtomicClosureParameterDeclaration" />
+                    </node>
+                    <node concept="2OqwBi" id="2oJmO5Mkwkd" role="33vP2m">
+                      <node concept="2OqwBi" id="2oJmO5Mkwke" role="2Oq$k0">
+                        <node concept="1PxgMI" id="2oJmO5Mkwkf" role="2Oq$k0">
+                          <node concept="37vLTw" id="2oJmO5Mkwkg" role="1m5AlR">
+                            <ref role="3cqZAo" node="2oJmO5MkwjS" resolve="sel" />
+                          </node>
+                          <node concept="chp4Y" id="2oJmO5Mkwkh" role="3oSUPX">
+                            <ref role="cht4Q" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+                          </node>
+                        </node>
+                        <node concept="3Tsc0h" id="2oJmO5Mkwki" role="2OqNvi">
+                          <ref role="3TtcxE" to="tp2c:htbW2KO" resolve="parameter" />
+                        </node>
+                      </node>
+                      <node concept="2DeJg1" id="2oJmO5Mkwkj" role="2OqNvi">
+                        <ref role="1A0vxQ" to="pkab:4OYzbeq$iVd" resolve="SmartAtomicClosureParameterDeclaration" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="2oJmO5Mkwkk" role="3cqZAp">
+                  <node concept="2OqwBi" id="2oJmO5Mkwkl" role="3clFbG">
+                    <node concept="2OqwBi" id="2oJmO5Mkwkm" role="2Oq$k0">
+                      <node concept="37vLTw" id="2oJmO5Mkwkn" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2oJmO5Mkwkb" resolve="pd" />
+                      </node>
+                      <node concept="3TrcHB" id="2oJmO5Mkwko" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                    <node concept="tyxLq" id="2oJmO5Mkwkp" role="2OqNvi">
+                      <node concept="Xl_RD" id="2oJmO5Mkwkq" role="tz02z">
+                        <property role="Xl_RC" value="it" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.editor.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.editor.mps
index 3f7449b55d..fa47bcea24 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.editor.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.editor.mps
@@ -10,6 +10,7 @@
     <import index="pkab" ref="r:63a6d225-96f6-404a-a9eb-033dc2f950a1(de.itemis.mps.baseLanguageExtensions.structure)" implicit="true" />
     <import index="tpen" ref="r:00000000-0000-4000-0000-011c895902c3(jetbrains.mps.baseLanguage.editor)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+    <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -34,6 +35,9 @@
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
         <child id="1080736633877" name="cellModel" index="2wV5jI" />
       </concept>
+      <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
+        <reference id="1078939183255" name="editorComponent" index="PMmxG" />
+      </concept>
       <concept id="615427434521884870" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Subconcepts" flags="ng" index="2VfDsV" />
       <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
         <property id="1186414551515" name="flag" index="VOm3f" />
@@ -412,5 +416,27 @@
     <ref role="aqKnT" to="pkab:vJfcQmma$O" resolve="IntegerRangeConstantBound" />
     <node concept="22hDWj" id="6vHuLLnCVGp" role="22hAXT" />
   </node>
+  <node concept="24kQdi" id="2oJmO5M1wK0">
+    <property role="3GE5qa" value="scopeFunction" />
+    <ref role="1XX52x" to="pkab:2oJmO5M0doP" resolve="ScopeFunctionOperation" />
+    <node concept="3EZMnI" id="2oJmO5M1wK2" role="2wV5jI">
+      <node concept="PMmxH" id="2oJmO5M1wK8" role="3EZMnx">
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+        <ref role="1k5W1q" to="tpen:hFITtyA" resolve="CompactKeyWord" />
+      </node>
+      <node concept="3F0ifn" id="2oJmO5M1wKa" role="3EZMnx">
+        <property role="3F0ifm" value="(" />
+        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
+      </node>
+      <node concept="3F1sOY" id="2oJmO5M1wKf" role="3EZMnx">
+        <ref role="1NtTu8" to="pkab:2oJmO5M0doR" resolve="closure" />
+      </node>
+      <node concept="3F0ifn" id="2oJmO5M1wKi" role="3EZMnx">
+        <property role="3F0ifm" value=")" />
+        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
+      </node>
+      <node concept="2iRfu4" id="2oJmO5M1wK5" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
index c24835c5ad..06e37d757d 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.structure.mps
@@ -14,6 +14,7 @@
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
         <property id="6714410169261853888" name="conceptId" index="EcuMT" />
         <property id="4628067390765907488" name="conceptShortDescription" index="R4oN_" />
+        <property id="4628067390765956802" name="abstract" index="R5$K7" />
         <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
         <child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
@@ -128,11 +129,11 @@
     <property role="3GE5qa" value="groupByOperation" />
     <ref role="1TJDcQ" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
   </node>
-  <node concept="1TIwiD" id="6RqC_fThQjL">
-    <property role="EcuMT" value="7915817776605258993" />
-    <property role="TrG5h" value="SelectWithIndexOperation" />
-    <property role="34LRSv" value="selectIdx" />
-    <property role="R4oN_" value="transform each element and index" />
+  <node concept="1TIwiD" id="7Ja64GBeeCt">
+    <property role="EcuMT" value="8919968723020343837" />
+    <property role="TrG5h" value="ForEachWithIndexOperation" />
+    <property role="34LRSv" value="forEachIdx" />
+    <property role="R4oN_" value="execute for each element with index" />
     <property role="3GE5qa" value="withIndexOperations" />
     <ref role="1TJDcQ" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
   </node>
@@ -144,13 +145,54 @@
     <property role="3GE5qa" value="withIndexOperations" />
     <ref role="1TJDcQ" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
   </node>
-  <node concept="1TIwiD" id="7Ja64GBeeCt">
-    <property role="EcuMT" value="8919968723020343837" />
-    <property role="TrG5h" value="ForEachWithIndexOperation" />
-    <property role="34LRSv" value="forEachIdx" />
-    <property role="R4oN_" value="execute for each element with index" />
+  <node concept="1TIwiD" id="6RqC_fThQjL">
+    <property role="EcuMT" value="7915817776605258993" />
+    <property role="TrG5h" value="SelectWithIndexOperation" />
+    <property role="34LRSv" value="selectIdx" />
+    <property role="R4oN_" value="transform each element and index" />
     <property role="3GE5qa" value="withIndexOperations" />
     <ref role="1TJDcQ" to="tp2q:hy3sC_q" resolve="InternalSequenceOperation" />
   </node>
+  <node concept="1TIwiD" id="2oJmO5M0doW">
+    <property role="EcuMT" value="2751518233990321724" />
+    <property role="3GE5qa" value="scopeFunction" />
+    <property role="TrG5h" value="LetScopeFunctionOperation" />
+    <property role="34LRSv" value="let" />
+    <property role="R4oN_" value="select anything from any object/instance" />
+    <ref role="1TJDcQ" node="2oJmO5M0doP" resolve="ScopeFunctionOperation" />
+  </node>
+  <node concept="1TIwiD" id="2oJmO5M0doT">
+    <property role="EcuMT" value="2751518233990321721" />
+    <property role="3GE5qa" value="scopeFunction" />
+    <property role="TrG5h" value="ApplyScopeFunctionOperation" />
+    <property role="34LRSv" value="apply" />
+    <property role="R4oN_" value="configure a given object/instance" />
+    <ref role="1TJDcQ" node="2oJmO5M0doP" resolve="ScopeFunctionOperation" />
+  </node>
+  <node concept="1TIwiD" id="2oJmO5M0doP">
+    <property role="EcuMT" value="2751518233990321717" />
+    <property role="R5$K7" value="true" />
+    <property role="TrG5h" value="ScopeFunctionOperation" />
+    <property role="3GE5qa" value="scopeFunction" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="PrWs8" id="2oJmO5M0doQ" role="PzmwI">
+      <ref role="PrY4T" to="tpee:hqOqG0K" resolve="IOperation" />
+    </node>
+    <node concept="1TJgyj" id="2oJmO5M0doR" role="1TKVEi">
+      <property role="IQ2ns" value="2751518233990321719" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="closure" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="4OYzbeq$iVd">
+    <property role="EcuMT" value="5566040892496752333" />
+    <property role="3GE5qa" value="scopeFunction" />
+    <property role="TrG5h" value="SmartAtomicClosureParameterDeclaration" />
+    <property role="34LRSv" value="~ &lt;name&gt;" />
+    <property role="R4oN_" value="smart closure parameter" />
+    <ref role="1TJDcQ" to="tp2q:hwRh6j$" resolve="SmartClosureParameterDeclaration" />
+  </node>
 </model>
 
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
index 5ba1ffdb81..2285cada8f 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.typesystem.mps
@@ -11,6 +11,7 @@
     <import index="pkab" ref="r:63a6d225-96f6-404a-a9eb-033dc2f950a1(de.itemis.mps.baseLanguageExtensions.structure)" implicit="true" />
     <import index="tp2q" ref="r:00000000-0000-4000-0000-011c8959032e(jetbrains.mps.baseLanguage.collections.structure)" implicit="true" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
+    <import index="tp2c" ref="r:00000000-0000-4000-0000-011c89590338(jetbrains.mps.baseLanguage.closures.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -158,6 +159,7 @@
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
+      <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
@@ -828,7 +830,7 @@
       <node concept="1ZobV4" id="6RqC_fThTkm" role="3cqZAp">
         <node concept="mw_s8" id="6RqC_fThTlB" role="1ZfhK$">
           <node concept="1Z$b5t" id="6RqC_fThTl_" role="mwGJk">
-            <ref role="1Z$eMM" node="6RqC_fThS0E" resolve="paramType" />
+            <ref role="1Z$eMM" node="6RqC_fThS0E" resolve="seqParamType" />
           </node>
         </node>
         <node concept="mw_s8" id="6RqC_fThTlK" role="1ZfhKB">
@@ -845,7 +847,7 @@
             <ref role="1YBMHb" node="6RqC_fThRO1" resolve="selectWithIndexOperation" />
           </node>
           <node concept="1Z$b5t" id="6RqC_fThS0J" role="37wK5m">
-            <ref role="1Z$eMM" node="6RqC_fThS0E" resolve="paramType" />
+            <ref role="1Z$eMM" node="6RqC_fThS0E" resolve="seqParamType" />
           </node>
           <node concept="2c44tf" id="6RqC_fThS0K" role="37wK5m">
             <node concept="1ajhzC" id="6RqC_fThS0L" role="2c44tc">
@@ -860,7 +862,7 @@
               <node concept="33vP2l" id="6RqC_fThS0P" role="1ajl9A">
                 <node concept="2c44te" id="6RqC_fThS0Q" role="lGtFl">
                   <node concept="1Z$b5t" id="6RqC_fThS0R" role="2c44t1">
-                    <ref role="1Z$eMM" node="6RqC_fThS0F" resolve="keyType" />
+                    <ref role="1Z$eMM" node="6RqC_fThS0F" resolve="returnType" />
                   </node>
                 </node>
               </node>
@@ -896,66 +898,6 @@
       <ref role="1YaFvo" to="pkab:6RqC_fThQjL" resolve="SelectWithIndexOperation" />
     </node>
   </node>
-  <node concept="1YbPZF" id="7Ja64GBdQEI">
-    <property role="TrG5h" value="typeof_WhereWithIndexOperation" />
-    <property role="3GE5qa" value="withIndexOperations" />
-    <node concept="3clFbS" id="7Ja64GBdQEJ" role="18ibNy">
-      <node concept="1ZxtTE" id="hwyZbXq" role="3cqZAp">
-        <property role="TrG5h" value="paramType" />
-      </node>
-      <node concept="3clFbF" id="34jUqC_VPJv" role="3cqZAp">
-        <node concept="2YIFZM" id="34jUqC_VR5x" role="3clFbG">
-          <ref role="37wK5l" to="tp2v:4Iwp2tSBzXf" resolve="inferInternalOperation" />
-          <ref role="1Pybhc" to="tp2v:4Iwp2tSBvWa" resolve="OperationInference" />
-          <node concept="1YBJjd" id="34jUqC_VR5y" role="37wK5m">
-            <ref role="1YBMHb" node="7Ja64GBdQEL" resolve="wo" />
-          </node>
-          <node concept="1Z$b5t" id="34jUqC_VR5z" role="37wK5m">
-            <ref role="1Z$eMM" node="hwyZbXq" resolve="paramType" />
-          </node>
-          <node concept="2c44tf" id="7Ja64GBdQER" role="37wK5m">
-            <node concept="1ajhzC" id="7Ja64GBdQES" role="2c44tc">
-              <node concept="33vP2l" id="7Ja64GBdQET" role="1ajw0F">
-                <node concept="2c44te" id="7Ja64GBdQEU" role="lGtFl">
-                  <node concept="1Z$b5t" id="7Ja64GBdQEV" role="2c44t1">
-                    <ref role="1Z$eMM" node="hwyZbXq" resolve="paramType" />
-                  </node>
-                </node>
-              </node>
-              <node concept="10Oyi0" id="7Ja64GBdR9R" role="1ajw0F" />
-              <node concept="10P_77" id="34jUqC_VR5D" role="1ajl9A" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1Z5TYs" id="hwyZxSY" role="3cqZAp">
-        <node concept="mw_s8" id="hwyZRij" role="1ZfhKB">
-          <node concept="2c44tf" id="hwyZRik" role="mwGJk">
-            <node concept="A3Dl8" id="hwyZRB2" role="2c44tc">
-              <node concept="33vP2l" id="hwyZRB3" role="A3Ik2">
-                <node concept="2c44te" id="hwyZRRP" role="lGtFl">
-                  <node concept="1Z$b5t" id="hwyZS6_" role="2c44t1">
-                    <ref role="1Z$eMM" node="hwyZbXq" resolve="paramType" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="mw_s8" id="hwyZxT1" role="1ZfhK$">
-          <node concept="1Z2H0r" id="hwyZwPr" role="mwGJk">
-            <node concept="1YBJjd" id="hwyZxjd" role="1Z2MuG">
-              <ref role="1YBMHb" node="7Ja64GBdQEL" resolve="wo" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="7Ja64GBdQEL" role="1YuTPh">
-      <property role="TrG5h" value="whereIdxOp" />
-      <ref role="1YaFvo" to="pkab:7Ja64GBdQxd" resolve="WhereWithIndexOperation" />
-    </node>
-  </node>
   <node concept="1YbPZF" id="7Ja64GBegld">
     <property role="TrG5h" value="typeof_ForEachWithIndexOperation" />
     <property role="3GE5qa" value="withIndexOperations" />
@@ -969,7 +911,7 @@
             <property role="3wDh2S" value="false" />
             <node concept="mw_s8" id="3qDC_E6zv71" role="1ZfhKB">
               <node concept="2X3wrD" id="3qDC_E6zv6V" role="mwGJk">
-                <ref role="2X3Bk0" node="3qDC_E6ztIR" resolve="O" />
+                <ref role="2X3Bk0" node="3qDC_E6ztIR" resolve="operandType" />
               </node>
             </node>
             <node concept="mw_s8" id="hPGtiwH" role="1ZfhK$">
@@ -1006,7 +948,7 @@
               <node concept="1Z2H0r" id="hPGmR$c" role="mwGJk">
                 <node concept="2OqwBi" id="hPGmS7e" role="1Z2MuG">
                   <node concept="1YBJjd" id="hPGmRZV" role="2Oq$k0">
-                    <ref role="1YBMHb" node="7Ja64GBeglg" resolve="vo" />
+                    <ref role="1YBMHb" node="7Ja64GBeglg" resolve="forEachIdxOp" />
                   </node>
                   <node concept="3TrEf2" id="7Ja64GBegM7" role="2OqNvi">
                     <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
@@ -1023,7 +965,7 @@
         <node concept="1Z2H0r" id="3qDC_E6zWkg" role="nvjzm">
           <node concept="2OqwBi" id="3qDC_E6zu0P" role="1Z2MuG">
             <node concept="1YBJjd" id="3qDC_E6ztQz" role="2Oq$k0">
-              <ref role="1YBMHb" node="7Ja64GBeglg" resolve="vo" />
+              <ref role="1YBMHb" node="7Ja64GBeglg" resolve="forEachIdxOp" />
             </node>
             <node concept="2qgKlT" id="3qDC_E6zuz8" role="2OqNvi">
               <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
@@ -1035,7 +977,7 @@
         <node concept="mw_s8" id="hz1N55C" role="1ZfhK$">
           <node concept="1Z2H0r" id="hz1N55D" role="mwGJk">
             <node concept="1YBJjd" id="hz1N5qN" role="1Z2MuG">
-              <ref role="1YBMHb" node="7Ja64GBeglg" resolve="vo" />
+              <ref role="1YBMHb" node="7Ja64GBeglg" resolve="forEachIdxOp" />
             </node>
           </node>
         </node>
@@ -1051,5 +993,372 @@
       <ref role="1YaFvo" to="pkab:7Ja64GBeeCt" resolve="ForEachWithIndexOperation" />
     </node>
   </node>
+  <node concept="1YbPZF" id="7Ja64GBdQEI">
+    <property role="TrG5h" value="typeof_WhereWithIndexOperation" />
+    <property role="3GE5qa" value="withIndexOperations" />
+    <node concept="3clFbS" id="7Ja64GBdQEJ" role="18ibNy">
+      <node concept="1ZxtTE" id="hwyZbXq" role="3cqZAp">
+        <property role="TrG5h" value="paramType" />
+      </node>
+      <node concept="3clFbF" id="34jUqC_VPJv" role="3cqZAp">
+        <node concept="2YIFZM" id="34jUqC_VR5x" role="3clFbG">
+          <ref role="37wK5l" to="tp2v:4Iwp2tSBzXf" resolve="inferInternalOperation" />
+          <ref role="1Pybhc" to="tp2v:4Iwp2tSBvWa" resolve="OperationInference" />
+          <node concept="1YBJjd" id="34jUqC_VR5y" role="37wK5m">
+            <ref role="1YBMHb" node="7Ja64GBdQEL" resolve="whereIdxOp" />
+          </node>
+          <node concept="1Z$b5t" id="34jUqC_VR5z" role="37wK5m">
+            <ref role="1Z$eMM" node="hwyZbXq" resolve="paramType" />
+          </node>
+          <node concept="2c44tf" id="7Ja64GBdQER" role="37wK5m">
+            <node concept="1ajhzC" id="7Ja64GBdQES" role="2c44tc">
+              <node concept="33vP2l" id="7Ja64GBdQET" role="1ajw0F">
+                <node concept="2c44te" id="7Ja64GBdQEU" role="lGtFl">
+                  <node concept="1Z$b5t" id="7Ja64GBdQEV" role="2c44t1">
+                    <ref role="1Z$eMM" node="hwyZbXq" resolve="paramType" />
+                  </node>
+                </node>
+              </node>
+              <node concept="10Oyi0" id="7Ja64GBdR9R" role="1ajw0F" />
+              <node concept="10P_77" id="34jUqC_VR5D" role="1ajl9A" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1Z5TYs" id="hwyZxSY" role="3cqZAp">
+        <node concept="mw_s8" id="hwyZRij" role="1ZfhKB">
+          <node concept="2c44tf" id="hwyZRik" role="mwGJk">
+            <node concept="A3Dl8" id="hwyZRB2" role="2c44tc">
+              <node concept="33vP2l" id="hwyZRB3" role="A3Ik2">
+                <node concept="2c44te" id="hwyZRRP" role="lGtFl">
+                  <node concept="1Z$b5t" id="hwyZS6_" role="2c44t1">
+                    <ref role="1Z$eMM" node="hwyZbXq" resolve="paramType" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="hwyZxT1" role="1ZfhK$">
+          <node concept="1Z2H0r" id="hwyZwPr" role="mwGJk">
+            <node concept="1YBJjd" id="hwyZxjd" role="1Z2MuG">
+              <ref role="1YBMHb" node="7Ja64GBdQEL" resolve="whereIdxOp" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="7Ja64GBdQEL" role="1YuTPh">
+      <property role="TrG5h" value="whereIdxOp" />
+      <ref role="1YaFvo" to="pkab:7Ja64GBdQxd" resolve="WhereWithIndexOperation" />
+    </node>
+  </node>
+  <node concept="1YbPZF" id="2oJmO5M4B3W">
+    <property role="TrG5h" value="typeof_LetScopeFunctionOperation" />
+    <property role="3GE5qa" value="scopeFunction" />
+    <node concept="3clFbS" id="2oJmO5M4B3X" role="18ibNy">
+      <node concept="1ZxtTE" id="2oJmO5M4BiO" role="3cqZAp">
+        <property role="TrG5h" value="operandType" />
+      </node>
+      <node concept="1ZxtTE" id="2oJmO5M4Bty" role="3cqZAp">
+        <property role="TrG5h" value="resultType" />
+      </node>
+      <node concept="1ZobV4" id="2oJmO5M4BL7" role="3cqZAp">
+        <node concept="mw_s8" id="2oJmO5M4BL8" role="1ZfhK$">
+          <node concept="1Z2H0r" id="2oJmO5M4BL9" role="mwGJk">
+            <node concept="2OqwBi" id="2oJmO5M4BLa" role="1Z2MuG">
+              <node concept="1YBJjd" id="2oJmO5M4BLb" role="2Oq$k0">
+                <ref role="1YBMHb" node="2oJmO5M4B3Z" resolve="letScopeFunctionOperation" />
+              </node>
+              <node concept="3TrEf2" id="2oJmO5M4BLc" role="2OqNvi">
+                <ref role="3Tt5mk" to="pkab:2oJmO5M0doR" resolve="closure" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="2oJmO5M4BLd" role="1ZfhKB">
+          <node concept="2c44tf" id="2oJmO5M4BLe" role="mwGJk">
+            <node concept="1ajhzC" id="2oJmO5M4BLf" role="2c44tc">
+              <node concept="33vP2l" id="2oJmO5M4BLg" role="1ajw0F">
+                <node concept="2c44te" id="2oJmO5M4BLh" role="lGtFl">
+                  <node concept="1Z$b5t" id="2oJmO5M4BLi" role="2c44t1">
+                    <ref role="1Z$eMM" node="2oJmO5M4BiO" resolve="operandType" />
+                  </node>
+                </node>
+              </node>
+              <node concept="33vP2l" id="2oJmO5M4BLj" role="1ajl9A">
+                <node concept="2c44te" id="2oJmO5M4BLk" role="lGtFl">
+                  <node concept="1Z$b5t" id="2oJmO5M4BLl" role="2c44t1">
+                    <ref role="1Z$eMM" node="2oJmO5M4Bty" resolve="resultType" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1Z5TYs" id="2oJmO5M4CwA" role="3cqZAp">
+        <node concept="mw_s8" id="2oJmO5M4CwK" role="1ZfhKB">
+          <node concept="1Z$b5t" id="2oJmO5M4CwI" role="mwGJk">
+            <ref role="1Z$eMM" node="2oJmO5M4Bty" resolve="resultType" />
+          </node>
+        </node>
+        <node concept="mw_s8" id="2oJmO5M4CwD" role="1ZfhK$">
+          <node concept="1Z2H0r" id="2oJmO5M4C8c" role="mwGJk">
+            <node concept="1YBJjd" id="2oJmO5M4Ca5" role="1Z2MuG">
+              <ref role="1YBMHb" node="2oJmO5M4B3Z" resolve="letScopeFunctionOperation" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="2oJmO5M4B3Z" role="1YuTPh">
+      <property role="TrG5h" value="letScopeFunctionOperation" />
+      <ref role="1YaFvo" to="pkab:2oJmO5M0doW" resolve="LetScopeFunctionOperation" />
+    </node>
+  </node>
+  <node concept="1YbPZF" id="2oJmO5M48Z6">
+    <property role="TrG5h" value="typeof_ApplyScopeFunctionOperation" />
+    <property role="3GE5qa" value="scopeFunction" />
+    <node concept="3clFbS" id="2oJmO5M48Z7" role="18ibNy">
+      <node concept="1ZxtTE" id="2oJmO5M49dR" role="3cqZAp">
+        <property role="TrG5h" value="operandType" />
+      </node>
+      <node concept="1Z5TYs" id="2oJmO5M4aAQ" role="3cqZAp">
+        <node concept="mw_s8" id="2oJmO5M4aAS" role="1ZfhK$">
+          <node concept="1Z2H0r" id="2oJmO5M4aAT" role="mwGJk">
+            <node concept="2OqwBi" id="2oJmO5M4aAU" role="1Z2MuG">
+              <node concept="1PxgMI" id="2oJmO5M4aAV" role="2Oq$k0">
+                <node concept="chp4Y" id="2oJmO5M4aAW" role="3oSUPX">
+                  <ref role="cht4Q" to="tpee:hqOqwz4" resolve="DotExpression" />
+                </node>
+                <node concept="2OqwBi" id="2oJmO5M4aAX" role="1m5AlR">
+                  <node concept="1YBJjd" id="2oJmO5M4aAY" role="2Oq$k0">
+                    <ref role="1YBMHb" node="2oJmO5M48Z9" resolve="applyScopeFunctionOperation" />
+                  </node>
+                  <node concept="1mfA1w" id="2oJmO5M4aAZ" role="2OqNvi" />
+                </node>
+              </node>
+              <node concept="3TrEf2" id="2oJmO5M4aB0" role="2OqNvi">
+                <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="2oJmO5M4aBH" role="1ZfhKB">
+          <node concept="1Z$b5t" id="2oJmO5M4aBF" role="mwGJk">
+            <ref role="1Z$eMM" node="2oJmO5M49dR" resolve="operandType" />
+          </node>
+        </node>
+      </node>
+      <node concept="1Z5TYs" id="2oJmO5M4b93" role="3cqZAp">
+        <node concept="mw_s8" id="2oJmO5M4b9d" role="1ZfhKB">
+          <node concept="1Z$b5t" id="2oJmO5M4b9b" role="mwGJk">
+            <ref role="1Z$eMM" node="2oJmO5M49dR" resolve="operandType" />
+          </node>
+        </node>
+        <node concept="mw_s8" id="2oJmO5M4b96" role="1ZfhK$">
+          <node concept="1Z2H0r" id="2oJmO5M4aMj" role="mwGJk">
+            <node concept="1YBJjd" id="2oJmO5M4aOc" role="1Z2MuG">
+              <ref role="1YBMHb" node="2oJmO5M48Z9" resolve="applyScopeFunctionOperation" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="2oJmO5M48Z9" role="1YuTPh">
+      <property role="TrG5h" value="applyScopeFunctionOperation" />
+      <ref role="1YaFvo" to="pkab:2oJmO5M0doT" resolve="ApplyScopeFunctionOperation" />
+    </node>
+  </node>
+  <node concept="1YbPZF" id="2oJmO5M2lEY">
+    <property role="TrG5h" value="typeof_ScopeFunctionOperation" />
+    <property role="3GE5qa" value="scopeFunction" />
+    <node concept="3clFbS" id="2oJmO5M2lEZ" role="18ibNy">
+      <node concept="1ZxtTE" id="2oJmO5M2m2j" role="3cqZAp">
+        <property role="TrG5h" value="operandType" />
+      </node>
+      <node concept="1ZxtTE" id="2oJmO5M2mh1" role="3cqZAp">
+        <property role="TrG5h" value="resultType" />
+      </node>
+      <node concept="1Z5TYs" id="2oJmO5M2o91" role="3cqZAp">
+        <node concept="mw_s8" id="2oJmO5M2o93" role="1ZfhK$">
+          <node concept="1Z2H0r" id="2oJmO5M2o94" role="mwGJk">
+            <node concept="2OqwBi" id="2oJmO5M2o95" role="1Z2MuG">
+              <node concept="1PxgMI" id="2oJmO5M2o96" role="2Oq$k0">
+                <node concept="chp4Y" id="2oJmO5M2o97" role="3oSUPX">
+                  <ref role="cht4Q" to="tpee:hqOqwz4" resolve="DotExpression" />
+                </node>
+                <node concept="2OqwBi" id="2oJmO5M2o98" role="1m5AlR">
+                  <node concept="1YBJjd" id="2oJmO5M2o99" role="2Oq$k0">
+                    <ref role="1YBMHb" node="2oJmO5M2lF1" resolve="scopeFunctionOperation" />
+                  </node>
+                  <node concept="1mfA1w" id="2oJmO5M2o9a" role="2OqNvi" />
+                </node>
+              </node>
+              <node concept="3TrEf2" id="2oJmO5M2o9b" role="2OqNvi">
+                <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="2oJmO5M2o9c" role="1ZfhKB">
+          <node concept="1Z$b5t" id="2oJmO5M2o9d" role="mwGJk">
+            <ref role="1Z$eMM" node="2oJmO5M2m2j" resolve="operandType" />
+          </node>
+        </node>
+      </node>
+      <node concept="1ZobV4" id="2oJmO5M2oq0" role="3cqZAp">
+        <node concept="mw_s8" id="2oJmO5M2oq7" role="1ZfhK$">
+          <node concept="1Z2H0r" id="2oJmO5M2oq3" role="mwGJk">
+            <node concept="2OqwBi" id="2oJmO5M2ozm" role="1Z2MuG">
+              <node concept="1YBJjd" id="2oJmO5M2oql" role="2Oq$k0">
+                <ref role="1YBMHb" node="2oJmO5M2lF1" resolve="scopeFunctionOperation" />
+              </node>
+              <node concept="3TrEf2" id="2oJmO5M2oPs" role="2OqNvi">
+                <ref role="3Tt5mk" to="pkab:2oJmO5M0doR" resolve="closure" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="2oJmO5M2oSn" role="1ZfhKB">
+          <node concept="2c44tf" id="2oJmO5M2oSj" role="mwGJk">
+            <node concept="1ajhzC" id="2oJmO5M2pBm" role="2c44tc">
+              <node concept="33vP2l" id="2oJmO5M2pBG" role="1ajw0F">
+                <node concept="2c44te" id="2oJmO5M2pC2" role="lGtFl">
+                  <node concept="1Z$b5t" id="2oJmO5M2pCa" role="2c44t1">
+                    <ref role="1Z$eMM" node="2oJmO5M2m2j" resolve="operandType" />
+                  </node>
+                </node>
+              </node>
+              <node concept="33vP2l" id="2oJmO5M2pBn" role="1ajl9A">
+                <node concept="2c44te" id="2oJmO5M2pCh" role="lGtFl">
+                  <node concept="1Z$b5t" id="2oJmO5M2pCp" role="2c44t1">
+                    <ref role="1Z$eMM" node="2oJmO5M2mh1" resolve="resultType" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="2oJmO5M2lF1" role="1YuTPh">
+      <property role="TrG5h" value="scopeFunctionOperation" />
+      <ref role="1YaFvo" to="pkab:2oJmO5M0doP" resolve="ScopeFunctionOperation" />
+    </node>
+  </node>
+  <node concept="1YbPZF" id="4OYzbeq$kbQ">
+    <property role="TrG5h" value="typeof_SmartAtomicClosureParameterDeclaration" />
+    <property role="3GE5qa" value="scopeFunction" />
+    <node concept="3clFbS" id="4OYzbeq$kbR" role="18ibNy">
+      <node concept="3clFbJ" id="4OYzbeq$kFd" role="3cqZAp">
+        <node concept="3clFbS" id="4OYzbeq$kFf" role="3clFbx">
+          <node concept="1ZxtTE" id="2l26Z_sw2Vl" role="3cqZAp">
+            <property role="TrG5h" value="opType" />
+          </node>
+          <node concept="1Z5TYs" id="2l26Z_sw2VH" role="3cqZAp">
+            <node concept="mw_s8" id="2l26Z_sw2VK" role="1ZfhK$">
+              <node concept="1Z$b5t" id="2l26Z_sw2Vo" role="mwGJk">
+                <ref role="1Z$eMM" node="2l26Z_sw2Vl" resolve="opType" />
+              </node>
+            </node>
+            <node concept="mw_s8" id="2l26Z_sw2VM" role="1ZfhKB">
+              <node concept="1Z2H0r" id="2l26Z_sw2VN" role="mwGJk">
+                <node concept="2OqwBi" id="2l26Z_sw2VO" role="1Z2MuG">
+                  <node concept="1PxgMI" id="2l26Z_sw2VP" role="2Oq$k0">
+                    <node concept="2OqwBi" id="2l26Z_sw2VQ" role="1m5AlR">
+                      <node concept="2OqwBi" id="2l26Z_sw2VR" role="2Oq$k0">
+                        <node concept="1YBJjd" id="2l26Z_sw2VS" role="2Oq$k0">
+                          <ref role="1YBMHb" node="4OYzbeq$kbT" resolve="sacpd" />
+                        </node>
+                        <node concept="1mfA1w" id="2l26Z_sw2VT" role="2OqNvi" />
+                      </node>
+                      <node concept="1mfA1w" id="2l26Z_sw2VU" role="2OqNvi" />
+                    </node>
+                    <node concept="chp4Y" id="714IaVdGYDV" role="3oSUPX">
+                      <ref role="cht4Q" to="pkab:2oJmO5M0doP" resolve="ScopeFunctionOperation" />
+                    </node>
+                  </node>
+                  <node concept="2qgKlT" id="2l26Z_sw2VV" role="2OqNvi">
+                    <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="nvevp" id="2l26Z_sw2VX" role="3cqZAp">
+            <node concept="3clFbS" id="2l26Z_sw2VY" role="nvhr_">
+              <node concept="1Z5TYs" id="6DFN5BsVqJ1" role="3cqZAp">
+                <node concept="mw_s8" id="6DFN5BsVqJ2" role="1ZfhKB">
+                  <node concept="1Z$b5t" id="6DFN5BsVqJ3" role="mwGJk">
+                    <ref role="1Z$eMM" node="2l26Z_sw2Vl" resolve="opType" />
+                  </node>
+                </node>
+                <node concept="mw_s8" id="6DFN5BsVqJ4" role="1ZfhK$">
+                  <node concept="1Z2H0r" id="6DFN5BsVqJ5" role="mwGJk">
+                    <node concept="1YBJjd" id="6DFN5BsVqJ6" role="1Z2MuG">
+                      <ref role="1YBMHb" node="4OYzbeq$kbT" resolve="sacpd" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1Z$b5t" id="2l26Z_sw2W2" role="nvjzm">
+              <ref role="1Z$eMM" node="2l26Z_sw2Vl" resolve="opType" />
+            </node>
+            <node concept="2X1qdy" id="2l26Z_sw2W0" role="2X0Ygz">
+              <property role="TrG5h" value="opTypeConcrete" />
+              <node concept="2jxLKc" id="2l26Z_sw2W1" role="1tU5fm" />
+            </node>
+          </node>
+        </node>
+        <node concept="1Wc70l" id="hTOyrmC" role="3clFbw">
+          <node concept="2OqwBi" id="hTOyt8S" role="3uHU7w">
+            <node concept="2OqwBi" id="hTOys4S" role="2Oq$k0">
+              <node concept="2OqwBi" id="hTOyrDE" role="2Oq$k0">
+                <node concept="1YBJjd" id="hTOyrAw" role="2Oq$k0">
+                  <ref role="1YBMHb" node="4OYzbeq$kbT" resolve="sacpd" />
+                </node>
+                <node concept="1mfA1w" id="hTOyrZu" role="2OqNvi" />
+              </node>
+              <node concept="1mfA1w" id="hTOyskn" role="2OqNvi" />
+            </node>
+            <node concept="1mIQ4w" id="hTOytGB" role="2OqNvi">
+              <node concept="chp4Y" id="hTOyEtR" role="cj9EA">
+                <ref role="cht4Q" to="pkab:2oJmO5M0doP" resolve="ScopeFunctionOperation" />
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="hTOypeF" role="3uHU7B">
+            <node concept="2OqwBi" id="hTOyoSO" role="2Oq$k0">
+              <node concept="1YBJjd" id="hTOyoPy" role="2Oq$k0">
+                <ref role="1YBMHb" node="4OYzbeq$kbT" resolve="sacpd" />
+              </node>
+              <node concept="1mfA1w" id="hTOyp8H" role="2OqNvi" />
+            </node>
+            <node concept="1mIQ4w" id="hTOyq9Z" role="2OqNvi">
+              <node concept="chp4Y" id="hTOyqZj" role="cj9EA">
+                <ref role="cht4Q" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="4OYzbeq$kbT" role="1YuTPh">
+      <property role="TrG5h" value="sacpd" />
+      <ref role="1YaFvo" to="pkab:4OYzbeq$iVd" resolve="SmartAtomicClosureParameterDeclaration" />
+    </node>
+    <node concept="bXqS6" id="4OYzbeq$kbX" role="ujSXK">
+      <node concept="3clFbS" id="4OYzbeq$kbY" role="2VODD2">
+        <node concept="3clFbF" id="4OYzbeq$kpu" role="3cqZAp">
+          <node concept="3clFbT" id="4OYzbeq$kpt" role="3clFbG">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.withIndexOperation@tests.mps b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.withIndexOperation@tests.mps
index df3dd8a55f..31da01ff29 100644
--- a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.withIndexOperation@tests.mps
+++ b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.withIndexOperation@tests.mps
@@ -193,7 +193,7 @@
               </node>
               <node concept="2YIFZM" id="7Ja64GBcext" role="33vP2m">
                 <ref role="37wK5l" to="96gm:7Ja64GBadQG" resolve="selectWithIndex" />
-                <ref role="1Pybhc" to="96gm:7Ja64GBadPz" resolve="SelectWithIndexOperationUtil" />
+                <ref role="1Pybhc" to="96gm:7Ja64GBadPz" resolve="WithIndexOperationUtil" />
                 <node concept="37vLTw" id="7Ja64GBcexu" role="37wK5m">
                   <ref role="3cqZAo" node="7Ja64GBcaru" resolve="nums" />
                 </node>

From 56756dee1ab407fb82602cce2bf6acf5218d5211 Mon Sep 17 00:00:00 2001
From: Dennis Albrecht <dalbrecht@itemis.com>
Date: Fri, 26 Sep 2025 11:46:58 +0200
Subject: [PATCH 17/18] restricted presence of
 SmartClosureParameterDeclarations

---
 ...mis.mps.baseLanguageExtensions.sandbox.mps |  81 ++++++++++++
 ...mps.baseLanguageExtensions.constraints.mps | 117 ++++++++++++++++++
 2 files changed, 198 insertions(+)

diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
index 6f50aa8933..c09016bc49 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.sandbox/models/de.itemis.mps.baseLanguageExtensions.sandbox.mps
@@ -1491,6 +1491,87 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="4OYzber0qre" role="3cqZAp">
+          <node concept="2OqwBi" id="4OYzber0qS5" role="3clFbG">
+            <node concept="Xl_RD" id="4OYzber0qrd" role="2Oq$k0">
+              <property role="Xl_RC" value="test" />
+            </node>
+            <node concept="1kbSPS" id="4OYzber0r4O" role="2OqNvi">
+              <node concept="1bVj0M" id="4OYzber0raC" role="1kbSPQ">
+                <node concept="3clFbS" id="4OYzber0raE" role="1bW5cS" />
+                <node concept="3nFU9Y" id="4OYzber0XmH" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="4OYzber0XmI" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4OYzber0rrZ" role="3cqZAp">
+          <node concept="2OqwBi" id="4OYzber0tnQ" role="3clFbG">
+            <node concept="2ShNRf" id="4OYzber0rrV" role="2Oq$k0">
+              <node concept="Tc6Ow" id="4OYzber0rIm" role="2ShVmc">
+                <node concept="17QB3L" id="4OYzber0slS" role="HW$YZ" />
+              </node>
+            </node>
+            <node concept="3$u5V9" id="4OYzber0ufT" role="2OqNvi">
+              <node concept="1bVj0M" id="4OYzber0uvd" role="23t8la">
+                <node concept="3clFbS" id="4OYzber0uvf" role="1bW5cS" />
+                <node concept="Rh6nW" id="4OYzber0X$t" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="4OYzber0X$u" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4OYzber0XGF" role="3cqZAp" />
+        <node concept="3clFbF" id="4OYzber0XMg" role="3cqZAp">
+          <node concept="2OqwBi" id="4OYzber0Yf7" role="3clFbG">
+            <node concept="Xl_RD" id="4OYzber0XMf" role="2Oq$k0">
+              <property role="Xl_RC" value="Test" />
+            </node>
+            <node concept="1kbSPS" id="4OYzber0YwI" role="2OqNvi">
+              <node concept="1bVj0M" id="4OYzber0YwK" role="1kbSPQ">
+                <node concept="3clFbS" id="4OYzber0YwL" role="1bW5cS">
+                  <node concept="3clFbF" id="4OYzber0Y$9" role="3cqZAp">
+                    <node concept="2OqwBi" id="4OYzber10mU" role="3clFbG">
+                      <node concept="2ShNRf" id="4OYzber0Y$7" role="2Oq$k0">
+                        <node concept="Tc6Ow" id="4OYzber0YQV" role="2ShVmc">
+                          <node concept="17QB3L" id="4OYzber0Z_8" role="HW$YZ" />
+                        </node>
+                      </node>
+                      <node concept="3$u5V9" id="4OYzber11fU" role="2OqNvi">
+                        <node concept="1bVj0M" id="4OYzber7aX3" role="23t8la">
+                          <node concept="3clFbS" id="4OYzber7aX5" role="1bW5cS">
+                            <node concept="3clFbF" id="4OYzber7CJJ" role="3cqZAp">
+                              <node concept="3cpWs3" id="4OYzber7Ee_" role="3clFbG">
+                                <node concept="37vLTw" id="4OYzber7Ef8" role="3uHU7w">
+                                  <ref role="3cqZAo" node="4OYzber0YwM" resolve="outer" />
+                                </node>
+                                <node concept="37vLTw" id="4OYzber7CJI" role="3uHU7B">
+                                  <ref role="3cqZAo" node="4OYzber7Czi" resolve="it" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="Rh6nW" id="4OYzber7Czi" role="1bW2Oz">
+                            <property role="TrG5h" value="it" />
+                            <node concept="2jxLKc" id="4OYzber7Czj" role="1tU5fm" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3nFU9Y" id="4OYzber0YwM" role="1bW2Oz">
+                  <property role="TrG5h" value="outer" />
+                  <node concept="2jxLKc" id="4OYzber0YwN" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbH" id="2oJmO5MkFel" role="3cqZAp" />
         <node concept="3clFbF" id="2oJmO5M1U_l" role="3cqZAp">
           <node concept="2OqwBi" id="2oJmO5M2lvm" role="3clFbG">
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.constraints.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.constraints.mps
index 1abf125080..50d719bcb8 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.constraints.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/models/de.itemis.mps.baseLanguageExtensions.constraints.mps
@@ -7,9 +7,13 @@
   </languages>
   <imports>
     <import index="pkab" ref="r:63a6d225-96f6-404a-a9eb-033dc2f950a1(de.itemis.mps.baseLanguageExtensions.structure)" implicit="true" />
+    <import index="tp2c" ref="r:00000000-0000-4000-0000-011c89590338(jetbrains.mps.baseLanguage.closures.structure)" implicit="true" />
+    <import index="tp2q" ref="r:00000000-0000-4000-0000-011c8959032e(jetbrains.mps.baseLanguage.collections.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -17,18 +21,40 @@
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
+      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
+        <child id="1081516765348" name="expression" index="3fr31v" />
+      </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
+        <reference id="5497648299878491909" name="baseVariableDeclaration" index="1M0zk5" />
+      </concept>
     </language>
     <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints">
       <concept id="6702802731807351367" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_CanBeAChild" flags="in" index="9S07l" />
+      <concept id="6702802731807424858" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_CanBeAnAncestor" flags="in" index="9SQb8" />
       <concept id="1202989658459" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_parentNode" flags="nn" index="nLn13" />
+      <concept id="4303308395523096213" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_childConcept" flags="ng" index="2DD5aU" />
       <concept id="1213093968558" name="jetbrains.mps.lang.constraints.structure.ConceptConstraints" flags="ng" index="1M2fIO">
         <reference id="1213093996982" name="concept" index="1M2myG" />
+        <child id="6702802731807532730" name="canBeAncestor" index="9SGkC" />
         <child id="6702802731807737306" name="canBeChild" index="9Vyp8" />
       </concept>
     </language>
@@ -36,14 +62,29 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
+      <concept id="1883223317721008708" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfStatement" flags="nn" index="Jncv_">
+        <reference id="1883223317721008712" name="nodeConcept" index="JncvD" />
+        <child id="1883223317721008709" name="body" index="Jncv$" />
+        <child id="1883223317721008711" name="variable" index="JncvA" />
+        <child id="1883223317721008710" name="nodeExpression" index="JncvB" />
+      </concept>
+      <concept id="1883223317721008713" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVariable" flags="ng" index="JncvC" />
+      <concept id="1883223317721107059" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVarReference" flags="nn" index="Jnkvi" />
+      <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
+      <concept id="1172326502327" name="jetbrains.mps.lang.smodel.structure.Concept_IsExactlyOperation" flags="nn" index="3O6GUB">
+        <child id="1206733650006" name="conceptArgument" index="3QVz_e" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
     </language>
   </registry>
   <node concept="1M2fIO" id="vJfcQmmcil">
@@ -64,5 +105,81 @@
       </node>
     </node>
   </node>
+  <node concept="1M2fIO" id="4OYzbeqXIYw">
+    <property role="3GE5qa" value="scopeFunction" />
+    <ref role="1M2myG" to="pkab:4OYzbeq$iVd" resolve="SmartAtomicClosureParameterDeclaration" />
+    <node concept="9S07l" id="4OYzbeqXIYx" role="9Vyp8">
+      <node concept="3clFbS" id="4OYzbeqXIYy" role="2VODD2">
+        <node concept="Jncv_" id="4OYzbeqXJOr" role="3cqZAp">
+          <ref role="JncvD" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+          <node concept="3clFbS" id="4OYzbeqXJOt" role="Jncv$">
+            <node concept="Jncv_" id="4OYzbeqXKSY" role="3cqZAp">
+              <ref role="JncvD" to="pkab:2oJmO5M0doP" resolve="ScopeFunctionOperation" />
+              <node concept="2OqwBi" id="4OYzbeqXLAB" role="JncvB">
+                <node concept="Jnkvi" id="4OYzbeqXKTD" role="2Oq$k0">
+                  <ref role="1M0zk5" node="4OYzbeqXJOu" resolve="closure" />
+                </node>
+                <node concept="1mfA1w" id="4OYzbeqXMBu" role="2OqNvi" />
+              </node>
+              <node concept="3clFbS" id="4OYzbeqXKT0" role="Jncv$">
+                <node concept="3cpWs6" id="4OYzbeqXMER" role="3cqZAp">
+                  <node concept="3clFbT" id="4OYzbeqXMFt" role="3cqZAk">
+                    <property role="3clFbU" value="true" />
+                  </node>
+                </node>
+              </node>
+              <node concept="JncvC" id="4OYzbeqXKT1" role="JncvA">
+                <property role="TrG5h" value="scopeFunctionOperation" />
+                <node concept="2jxLKc" id="4OYzbeqXKT2" role="1tU5fm" />
+              </node>
+            </node>
+          </node>
+          <node concept="JncvC" id="4OYzbeqXJOu" role="JncvA">
+            <property role="TrG5h" value="closure" />
+            <node concept="2jxLKc" id="4OYzbeqXJOv" role="1tU5fm" />
+          </node>
+          <node concept="nLn13" id="4OYzbeqXKif" role="JncvB" />
+        </node>
+        <node concept="3cpWs6" id="4OYzbeqXMGP" role="3cqZAp">
+          <node concept="3clFbT" id="4OYzbeqXMIp" role="3cqZAk" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="1M2fIO" id="4OYzber0nbi">
+    <property role="3GE5qa" value="scopeFunction" />
+    <ref role="1M2myG" to="pkab:2oJmO5M0doP" resolve="ScopeFunctionOperation" />
+    <node concept="9SQb8" id="4OYzber0nbk" role="9SGkC">
+      <node concept="3clFbS" id="4OYzber0nbl" role="2VODD2">
+        <node concept="3clFbF" id="4OYzber1TvQ" role="3cqZAp">
+          <node concept="22lmx$" id="4OYzber1ULz" role="3clFbG">
+            <node concept="3fqX7Q" id="4OYzber1TvM" role="3uHU7B">
+              <node concept="2OqwBi" id="4OYzber1Tx1" role="3fr31v">
+                <node concept="2DD5aU" id="4OYzber1Tx2" role="2Oq$k0" />
+                <node concept="3O6GUB" id="4OYzber1Tx3" role="2OqNvi">
+                  <node concept="chp4Y" id="4OYzber1Tx4" role="3QVz_e">
+                    <ref role="cht4Q" to="tp2q:hwRh6j$" resolve="SmartClosureParameterDeclaration" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3fqX7Q" id="4OYzber7bac" role="3uHU7w">
+              <node concept="2OqwBi" id="4OYzber7bae" role="3fr31v">
+                <node concept="2OqwBi" id="4OYzber7baf" role="2Oq$k0">
+                  <node concept="nLn13" id="4OYzber7bag" role="2Oq$k0" />
+                  <node concept="1mfA1w" id="4OYzber7bah" role="2OqNvi" />
+                </node>
+                <node concept="1mIQ4w" id="4OYzber7bai" role="2OqNvi">
+                  <node concept="chp4Y" id="4OYzber7baj" role="cj9EA">
+                    <ref role="cht4Q" to="pkab:2oJmO5M0doP" resolve="ScopeFunctionOperation" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 

From 061b80647dcd965e2a073b0ca2db3dcffc6b9660 Mon Sep 17 00:00:00 2001
From: Dennis Albrecht <dalbrecht@itemis.com>
Date: Fri, 26 Sep 2025 11:16:23 +0200
Subject: [PATCH 18/18] rewrote groupBy-runtime to mps-collection-types to
 support type inference

---
 ...mis.mps.baseLanguageExtensions.runtime.msd |   1 -
 ...mis.mps.baseLanguageExtensions.runtime.mps |  93 ++++-----
 ...tensions.generator.templates@generator.mps |  42 ++--
 ...Extensions.test.groupByOperation@tests.mps | 182 ++++++++----------
 4 files changed, 147 insertions(+), 171 deletions(-)

diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
index 3331a10da2..6081d5e7f6 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/de.itemis.mps.baseLanguageExtensions.runtime.msd
@@ -18,7 +18,6 @@
   <languageVersions>
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-    <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
index 6e52fc80a1..c0c8920643 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions.runtime/models/de.itemis.mps.baseLanguageExtensions.runtime.mps
@@ -6,7 +6,6 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
   </languages>
@@ -202,6 +201,9 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
+      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
+        <child id="540871147943773366" name="argument" index="25WWJ7" />
+      </concept>
       <concept id="1172650591544" name="jetbrains.mps.baseLanguage.collections.structure.SkipOperation" flags="nn" index="7r0gD">
         <child id="1172658456740" name="elementsToSkip" index="7T0AP" />
       </concept>
@@ -210,10 +212,22 @@
         <child id="1224414456414" name="elementType" index="kMuH3" />
         <child id="1224414466839" name="initializer" index="kMx8a" />
       </concept>
+      <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
+        <child id="1151688676805" name="elementType" index="_ZDj9" />
+      </concept>
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
+      <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
+        <child id="1237721435807" name="elementType" index="HW$YZ" />
+      </concept>
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
+      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
+      <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
+        <child id="1197683466920" name="keyType" index="3rvQeY" />
+        <child id="1197683475734" name="valueType" index="3rvSg0" />
+      </concept>
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -600,9 +614,8 @@
               <node concept="16syzq" id="54jQkZ8R3wI" role="11_B2D">
                 <ref role="16sUi3" node="54jQkZ8QpwM" resolve="K" />
               </node>
-              <node concept="3uibUv" id="54jQkZ8R3Xb" role="11_B2D">
-                <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
-                <node concept="16syzq" id="54jQkZ8R4qE" role="11_B2D">
+              <node concept="A3Dl8" id="4OYzbeqFOMl" role="11_B2D">
+                <node concept="16syzq" id="4OYzbeqFOMn" role="A3Ik2">
                   <ref role="16sUi3" node="54jQkZ8QoI8" resolve="T" />
                 </node>
               </node>
@@ -616,14 +629,13 @@
           </node>
         </node>
         <node concept="3clFbF" id="54jQkZ8RztP" role="3cqZAp">
-          <node concept="2OqwBi" id="54jQkZ8R$PK" role="3clFbG">
+          <node concept="2OqwBi" id="4OYzbeqDIG9" role="3clFbG">
             <node concept="37vLTw" id="54jQkZ8RztN" role="2Oq$k0">
               <ref role="3cqZAo" node="54jQkZ8QoIN" resolve="seq" />
             </node>
-            <node concept="liA8E" id="54jQkZ8RCeI" role="2OqNvi">
-              <ref role="37wK5l" to="urs3:5Ffu4tBUx7B" resolve="visitAll" />
-              <node concept="1bVj0M" id="54jQkZ8S7B8" role="37wK5m">
-                <node concept="3clFbS" id="54jQkZ8S7B9" role="1bW5cS">
+            <node concept="2es0OD" id="4OYzbeqDJyd" role="2OqNvi">
+              <node concept="1bVj0M" id="4OYzbeqDJyf" role="23t8la">
+                <node concept="3clFbS" id="4OYzbeqDJyg" role="1bW5cS">
                   <node concept="3cpWs8" id="54jQkZ8S7Ba" role="3cqZAp">
                     <node concept="3cpWsn" id="54jQkZ8S7Bb" role="3cpWs9">
                       <property role="TrG5h" value="key" />
@@ -636,7 +648,7 @@
                         </node>
                         <node concept="1Bd96e" id="54jQkZ8S7Bf" role="2OqNvi">
                           <node concept="37vLTw" id="54jQkZ8S7Bg" role="1BdPVh">
-                            <ref role="3cqZAo" node="54jQkZ8S7BC" resolve="elem" />
+                            <ref role="3cqZAo" node="4OYzbeqDJyh" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -667,9 +679,12 @@
                             <node concept="37vLTw" id="54jQkZ8S7Bs" role="37wK5m">
                               <ref role="3cqZAo" node="54jQkZ8S7Bb" resolve="key" />
                             </node>
-                            <node concept="2YIFZM" id="54jQkZ8ST1S" role="37wK5m">
-                              <ref role="37wK5l" to="urs3:5Ffu4tBUyJX" resolve="fromArray" />
-                              <ref role="1Pybhc" to="urs3:5Ffu4tBUyJF" resolve="ListSequence" />
+                            <node concept="2ShNRf" id="4OYzbeqFrKv" role="37wK5m">
+                              <node concept="Tc6Ow" id="4OYzbeqFt$A" role="2ShVmc">
+                                <node concept="16syzq" id="4OYzbeqFwwB" role="HW$YZ">
+                                  <ref role="16sUi3" node="54jQkZ8QoI8" resolve="T" />
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -677,18 +692,16 @@
                     </node>
                   </node>
                   <node concept="3clFbF" id="54jQkZ8S7Bw" role="3cqZAp">
-                    <node concept="2OqwBi" id="54jQkZ8S7Bx" role="3clFbG">
-                      <node concept="liA8E" id="54jQkZ8S7BA" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
-                        <node concept="37vLTw" id="54jQkZ8S7BB" role="37wK5m">
-                          <ref role="3cqZAo" node="54jQkZ8S7BC" resolve="elem" />
+                    <node concept="2OqwBi" id="4OYzbeqFALU" role="3clFbG">
+                      <node concept="TSZUe" id="4OYzbeqFEuV" role="2OqNvi">
+                        <node concept="37vLTw" id="4OYzbeqFFgN" role="25WWJ7">
+                          <ref role="3cqZAo" node="4OYzbeqDJyh" resolve="it" />
                         </node>
                       </node>
-                      <node concept="1eOMI4" id="54jQkZ8Tedk" role="2Oq$k0">
-                        <node concept="10QFUN" id="54jQkZ8Tedh" role="1eOMHV">
-                          <node concept="3uibUv" id="54jQkZ8Tg2M" role="10QFUM">
-                            <ref role="3uigEE" to="urs3:5Ffu4tBUyv1" resolve="IListSequence" />
-                            <node concept="16syzq" id="54jQkZ8TiOt" role="11_B2D">
+                      <node concept="1eOMI4" id="4OYzbeqFSDM" role="2Oq$k0">
+                        <node concept="10QFUN" id="4OYzbeqFSDJ" role="1eOMHV">
+                          <node concept="_YKpA" id="4OYzbeqFU10" role="10QFUM">
+                            <node concept="16syzq" id="4OYzbeqFUU5" role="_ZDj9">
                               <ref role="16sUi3" node="54jQkZ8QoI8" resolve="T" />
                             </node>
                           </node>
@@ -708,44 +721,39 @@
                     </node>
                   </node>
                 </node>
-                <node concept="37vLTG" id="54jQkZ8S7BC" role="1bW2Oz">
-                  <property role="TrG5h" value="elem" />
-                  <node concept="16syzq" id="54jQkZ8S7BD" role="1tU5fm">
-                    <ref role="16sUi3" node="54jQkZ8QoI8" resolve="T" />
-                  </node>
+                <node concept="Rh6nW" id="4OYzbeqDJyh" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="4OYzbeqDJyi" role="1tU5fm" />
                 </node>
               </node>
             </node>
           </node>
         </node>
         <node concept="3clFbF" id="54jQkZ8QS3r" role="3cqZAp">
-          <node concept="2YIFZM" id="54jQkZ8SdyN" role="3clFbG">
+          <node concept="2YIFZM" id="4OYzbeqFWOZ" role="3clFbG">
             <ref role="37wK5l" to="urs3:5Ffu4tBUzHn" resolve="fromMap" />
             <ref role="1Pybhc" to="urs3:5Ffu4tBUzBg" resolve="MapSequence" />
-            <node concept="16syzq" id="54jQkZ8SdyO" role="3PaCim">
+            <node concept="16syzq" id="4OYzbeqFWP0" role="3PaCim">
               <ref role="16sUi3" node="54jQkZ8QpwM" resolve="K" />
             </node>
-            <node concept="3uibUv" id="54jQkZ8Swgo" role="3PaCim">
-              <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
-              <node concept="16syzq" id="54jQkZ8SxY3" role="11_B2D">
+            <node concept="A3Dl8" id="4OYzbeqFWP1" role="3PaCim">
+              <node concept="16syzq" id="4OYzbeqFWP2" role="A3Ik2">
                 <ref role="16sUi3" node="54jQkZ8QoI8" resolve="T" />
               </node>
             </node>
-            <node concept="37vLTw" id="54jQkZ8Sez5" role="37wK5m">
+            <node concept="37vLTw" id="4OYzbeqFWP3" role="37wK5m">
               <ref role="3cqZAo" node="54jQkZ8R36Q" resolve="cache" />
             </node>
           </node>
         </node>
       </node>
       <node concept="3Tm1VV" id="54jQkZ8QoH9" role="1B3o_S" />
-      <node concept="3uibUv" id="54jQkZ8QQ0a" role="3clF45">
-        <ref role="3uigEE" to="urs3:5Ffu4tBU$6H" resolve="IMapSequence" />
-        <node concept="16syzq" id="54jQkZ8QQ11" role="11_B2D">
+      <node concept="3rvAFt" id="4OYzbeqFYyT" role="3clF45">
+        <node concept="16syzq" id="4OYzbeqFZWB" role="3rvQeY">
           <ref role="16sUi3" node="54jQkZ8QpwM" resolve="K" />
         </node>
-        <node concept="3uibUv" id="54jQkZ8QQ1W" role="11_B2D">
-          <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
-          <node concept="16syzq" id="54jQkZ8QQ3y" role="11_B2D">
+        <node concept="A3Dl8" id="4OYzbeqG0Mn" role="3rvSg0">
+          <node concept="16syzq" id="4OYzbeqG1$G" role="A3Ik2">
             <ref role="16sUi3" node="54jQkZ8QoI8" resolve="T" />
           </node>
         </node>
@@ -758,9 +766,8 @@
       </node>
       <node concept="37vLTG" id="54jQkZ8QoIN" role="3clF46">
         <property role="TrG5h" value="seq" />
-        <node concept="3uibUv" id="54jQkZ8QoIM" role="1tU5fm">
-          <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
-          <node concept="16syzq" id="54jQkZ8QpuE" role="11_B2D">
+        <node concept="A3Dl8" id="4OYzbeqDFKX" role="1tU5fm">
+          <node concept="16syzq" id="4OYzbeqDGDY" role="A3Ik2">
             <ref role="16sUi3" node="54jQkZ8QoI8" resolve="T" />
           </node>
         </node>
diff --git a/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
index 377562bbf5..821cdabd2d 100644
--- a/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
+++ b/code/languages/de.itemis.mps.baseLanguageExtensions/generator/templates/de.itemis.mps.baseLanguageExtensions.generator.templates@generator.mps
@@ -407,44 +407,44 @@
     <node concept="3aamgX" id="54jQkZ97WKE" role="3acgRq">
       <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
       <node concept="gft3U" id="54jQkZ986e1" role="1lVwrX">
-        <node concept="2YIFZM" id="54jQkZ986eg" role="gfFT$">
+        <node concept="2YIFZM" id="4OYzbeqPZZX" role="gfFT$">
           <ref role="37wK5l" to="96gm:54jQkZ8QoHD" resolve="apply" />
           <ref role="1Pybhc" to="96gm:54jQkZ8QoGe" resolve="GroupByOperationUtil" />
-          <node concept="10Nm6u" id="54jQkZ9fwtV" role="37wK5m">
-            <node concept="29HgVG" id="54jQkZ9fwz6" role="lGtFl">
-              <node concept="3NFfHV" id="54jQkZ9fwz7" role="3NFExx">
-                <node concept="3clFbS" id="54jQkZ9fwz8" role="2VODD2">
-                  <node concept="3clFbF" id="54jQkZ9fwze" role="3cqZAp">
-                    <node concept="2OqwBi" id="54jQkZ9fwz9" role="3clFbG">
-                      <node concept="3TrEf2" id="54jQkZ9fwzc" role="2OqNvi">
+          <node concept="10Nm6u" id="4OYzbeqPZZY" role="37wK5m">
+            <node concept="29HgVG" id="4OYzbeqPZZZ" role="lGtFl">
+              <node concept="3NFfHV" id="4OYzbeqQ000" role="3NFExx">
+                <node concept="3clFbS" id="4OYzbeqQ001" role="2VODD2">
+                  <node concept="3clFbF" id="4OYzbeqQ002" role="3cqZAp">
+                    <node concept="2OqwBi" id="4OYzbeqQ003" role="3clFbG">
+                      <node concept="3TrEf2" id="4OYzbeqQ004" role="2OqNvi">
                         <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
                       </node>
-                      <node concept="30H73N" id="54jQkZ9fwzd" role="2Oq$k0" />
+                      <node concept="30H73N" id="4OYzbeqQ005" role="2Oq$k0" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="10Nm6u" id="54jQkZ9fKdF" role="37wK5m">
-            <node concept="1sPUBX" id="54jQkZ9fKkf" role="lGtFl">
+          <node concept="10Nm6u" id="4OYzbeqQ006" role="37wK5m">
+            <node concept="1sPUBX" id="4OYzbeqQ007" role="lGtFl">
               <ref role="v9R2y" node="54jQkZ9fKWX" resolve="switchClosureLiteral" />
-              <node concept="3NFfHV" id="54jQkZ9ghak" role="1sPUBK">
-                <node concept="3clFbS" id="54jQkZ9ghal" role="2VODD2">
-                  <node concept="3clFbF" id="54jQkZ9ghe5" role="3cqZAp">
-                    <node concept="2OqwBi" id="54jQkZ9gi8_" role="3clFbG">
-                      <node concept="1PxgMI" id="54jQkZ9ghTt" role="2Oq$k0">
-                        <node concept="chp4Y" id="54jQkZ9ghUr" role="3oSUPX">
+              <node concept="3NFfHV" id="4OYzbeqQ008" role="1sPUBK">
+                <node concept="3clFbS" id="4OYzbeqQ009" role="2VODD2">
+                  <node concept="3clFbF" id="4OYzbeqQ00a" role="3cqZAp">
+                    <node concept="2OqwBi" id="4OYzbeqQ00b" role="3clFbG">
+                      <node concept="1PxgMI" id="4OYzbeqQ00c" role="2Oq$k0">
+                        <node concept="chp4Y" id="4OYzbeqQ00d" role="3oSUPX">
                           <ref role="cht4Q" to="pkab:54jQkZ8WKL$" resolve="GroupByOperation" />
                         </node>
-                        <node concept="2OqwBi" id="54jQkZ9ghtg" role="1m5AlR">
-                          <node concept="30H73N" id="54jQkZ9ghe4" role="2Oq$k0" />
-                          <node concept="3TrEf2" id="54jQkZ9ghIq" role="2OqNvi">
+                        <node concept="2OqwBi" id="4OYzbeqQ00e" role="1m5AlR">
+                          <node concept="30H73N" id="4OYzbeqQ00f" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="4OYzbeqQ00g" role="2OqNvi">
                             <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
                           </node>
                         </node>
                       </node>
-                      <node concept="3TrEf2" id="54jQkZ9giOQ" role="2OqNvi">
+                      <node concept="3TrEf2" id="4OYzbeqQ00h" role="2OqNvi">
                         <ref role="3Tt5mk" to="tp2q:hy3t8hi" resolve="closure" />
                       </node>
                     </node>
diff --git a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.groupByOperation@tests.mps b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.groupByOperation@tests.mps
index bc2325cc2d..6e6d4a8873 100644
--- a/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.groupByOperation@tests.mps
+++ b/code/solutions/de.itemis.mps.baseLanguageExtensions.test/models/de.itemis.mps.baseLanguageExtensions.test.groupByOperation@tests.mps
@@ -5,36 +5,23 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
   </languages>
   <imports>
     <import index="urs3" ref="r:fc76aa36-3cff-41c7-b94b-eee0e8341932(jetbrains.mps.internal.collections.runtime)" />
     <import index="96gm" ref="r:2eaed950-3bc1-47cd-9b02-e917ff994d7c(de.itemis.mps.baseLanguageExtensions.runtime)" />
-    <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
-        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
-      </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
-        <child id="1188208488637" name="annotation" index="2AJF6D" />
-      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
-      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
-        <child id="1145553007750" name="creator" index="2ShVmc" />
-      </concept>
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
-      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
-        <child id="1182160096073" name="cls" index="YeSDq" />
-      </concept>
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
@@ -44,9 +31,6 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
-        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
-      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -81,7 +65,6 @@
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
       <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
@@ -93,10 +76,6 @@
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
-        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
-        <child id="1201186121363" name="typeParameter" index="2Ghqu4" />
-      </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
@@ -130,6 +109,25 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
+        <child id="1204796294226" name="closure" index="23t8la" />
+      </concept>
+      <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
+      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
+        <child id="1151689745422" name="elementType" index="A3Ik2" />
+      </concept>
+      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
+      <concept id="1240424373525" name="jetbrains.mps.baseLanguage.collections.structure.MappingType" flags="in" index="3f3tKP">
+        <child id="1240424397093" name="keyType" index="3f3zw5" />
+        <child id="1240424402756" name="valueType" index="3f3$T$" />
+      </concept>
+      <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
+        <child id="1197683466920" name="keyType" index="3rvQeY" />
+        <child id="1197683475734" name="valueType" index="3rvSg0" />
+      </concept>
+      <concept id="1240824834947" name="jetbrains.mps.baseLanguage.collections.structure.ValueAccessOperation" flags="nn" index="3AV6Ez" />
+    </language>
   </registry>
   <node concept="3s_ewN" id="54jQkZ8THzt">
     <property role="3s_ewP" value="GroupByOperation" />
@@ -169,9 +167,6 @@
           <node concept="3cpWs8" id="54jQkZ8TU_b" role="3cqZAp">
             <node concept="3cpWsn" id="54jQkZ8TU_c" role="3cpWs9">
               <property role="TrG5h" value="actual" />
-              <node concept="3uibUv" id="54jQkZ8TU_d" role="1tU5fm">
-                <ref role="3uigEE" to="urs3:5Ffu4tBU$6H" resolve="IMapSequence" />
-              </node>
               <node concept="2YIFZM" id="54jQkZ8TW8k" role="33vP2m">
                 <ref role="37wK5l" to="96gm:54jQkZ8QoHD" resolve="apply" />
                 <ref role="1Pybhc" to="96gm:54jQkZ8QoGe" resolve="GroupByOperationUtil" />
@@ -182,6 +177,12 @@
                   <ref role="3cqZAo" node="54jQkZ8VJJO" resolve="lengthExtractor" />
                 </node>
               </node>
+              <node concept="3rvAFt" id="4OYzbeqJxja" role="1tU5fm">
+                <node concept="10Oyi0" id="4OYzbeqJxT$" role="3rvQeY" />
+                <node concept="A3Dl8" id="4OYzbeqJzc5" role="3rvSg0">
+                  <node concept="17QB3L" id="4OYzbeqJzc6" role="A3Ik2" />
+                </node>
+              </node>
             </node>
           </node>
           <node concept="3clFbH" id="54jQkZ8U0oQ" role="3cqZAp" />
@@ -193,22 +194,19 @@
               <node concept="37vLTw" id="54jQkZ8U2wp" role="2Oq$k0">
                 <ref role="3cqZAo" node="54jQkZ8TU_c" resolve="actual" />
               </node>
-              <node concept="liA8E" id="54jQkZ8U6ck" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Map.size()" resolve="size" />
-              </node>
+              <node concept="34oBXx" id="4OYzbeqJ$Pc" role="2OqNvi" />
             </node>
           </node>
           <node concept="3clFbH" id="54jQkZ8U6Kl" role="3cqZAp" />
           <node concept="3clFbF" id="54jQkZ8U8fV" role="3cqZAp">
-            <node concept="2OqwBi" id="54jQkZ8U9dF" role="3clFbG">
+            <node concept="2OqwBi" id="4OYzbeqJITc" role="3clFbG">
               <node concept="37vLTw" id="54jQkZ8U8fT" role="2Oq$k0">
                 <ref role="3cqZAo" node="54jQkZ8TU_c" resolve="actual" />
               </node>
-              <node concept="liA8E" id="54jQkZ8Udsh" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Map.forEach(java.util.function.BiConsumer)" resolve="forEach" />
-                <node concept="1rXfSq" id="54jQkZ8Wh2j" role="37wK5m">
+              <node concept="2es0OD" id="4OYzbeqJJYG" role="2OqNvi">
+                <node concept="1rXfSq" id="4OYzbeqJSVq" role="23t8la">
                   <ref role="37wK5l" node="54jQkZ8VWA9" resolve="valueCountMatcher" />
-                  <node concept="3cmrfG" id="54jQkZ8W_lQ" role="37wK5m">
+                  <node concept="3cmrfG" id="4OYzbeqJSVr" role="37wK5m">
                     <property role="3cmrfH" value="1" />
                   </node>
                 </node>
@@ -251,9 +249,6 @@
           <node concept="3cpWs8" id="54jQkZ8UZzI" role="3cqZAp">
             <node concept="3cpWsn" id="54jQkZ8UZzJ" role="3cpWs9">
               <property role="TrG5h" value="actual" />
-              <node concept="3uibUv" id="54jQkZ8UZzK" role="1tU5fm">
-                <ref role="3uigEE" to="urs3:5Ffu4tBU$6H" resolve="IMapSequence" />
-              </node>
               <node concept="2YIFZM" id="54jQkZ8UZzL" role="33vP2m">
                 <ref role="37wK5l" to="96gm:54jQkZ8QoHD" resolve="apply" />
                 <ref role="1Pybhc" to="96gm:54jQkZ8QoGe" resolve="GroupByOperationUtil" />
@@ -264,6 +259,12 @@
                   <ref role="3cqZAo" node="54jQkZ8VJJO" resolve="lengthExtractor" />
                 </node>
               </node>
+              <node concept="3rvAFt" id="4OYzbeqJzMS" role="1tU5fm">
+                <node concept="10Oyi0" id="4OYzbeqJzMT" role="3rvQeY" />
+                <node concept="A3Dl8" id="4OYzbeqJzMU" role="3rvSg0">
+                  <node concept="17QB3L" id="4OYzbeqJzMV" role="A3Ik2" />
+                </node>
+              </node>
             </node>
           </node>
           <node concept="3clFbH" id="54jQkZ8V1WL" role="3cqZAp" />
@@ -275,23 +276,20 @@
               <node concept="37vLTw" id="54jQkZ8V3pk" role="2Oq$k0">
                 <ref role="3cqZAo" node="54jQkZ8UZzJ" resolve="actual" />
               </node>
-              <node concept="liA8E" id="54jQkZ8V6D7" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Map.size()" resolve="size" />
-              </node>
+              <node concept="34oBXx" id="4OYzbeqJ_Rm" role="2OqNvi" />
             </node>
           </node>
           <node concept="3clFbH" id="54jQkZ8V7yQ" role="3cqZAp" />
-          <node concept="3clFbF" id="54jQkZ8Vf93" role="3cqZAp">
-            <node concept="2OqwBi" id="54jQkZ8Vf94" role="3clFbG">
-              <node concept="37vLTw" id="54jQkZ8Vf95" role="2Oq$k0">
+          <node concept="3clFbF" id="4OYzbeqKpIm" role="3cqZAp">
+            <node concept="2OqwBi" id="4OYzbeqKpIn" role="3clFbG">
+              <node concept="37vLTw" id="4OYzbeqKpIo" role="2Oq$k0">
                 <ref role="3cqZAo" node="54jQkZ8UZzJ" resolve="actual" />
               </node>
-              <node concept="liA8E" id="54jQkZ8Vf96" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Map.forEach(java.util.function.BiConsumer)" resolve="forEach" />
-                <node concept="1rXfSq" id="54jQkZ8WjRt" role="37wK5m">
+              <node concept="2es0OD" id="4OYzbeqKpIp" role="2OqNvi">
+                <node concept="1rXfSq" id="4OYzbeqKpIq" role="23t8la">
                   <ref role="37wK5l" node="54jQkZ8VWA9" resolve="valueCountMatcher" />
-                  <node concept="3cmrfG" id="54jQkZ8Wld6" role="37wK5m">
-                    <property role="3cmrfH" value="2" />
+                  <node concept="3cmrfG" id="4OYzbeqKpIr" role="37wK5m">
+                    <property role="3cmrfH" value="1" />
                   </node>
                 </node>
               </node>
@@ -328,78 +326,50 @@
     <node concept="3clFb_" id="54jQkZ8VWA9" role="jymVt">
       <property role="TrG5h" value="valueCountMatcher" />
       <node concept="3clFbS" id="54jQkZ8VWAc" role="3clF47">
-        <node concept="3clFbF" id="54jQkZ8W5Rs" role="3cqZAp">
-          <node concept="2ShNRf" id="54jQkZ8Wacy" role="3clFbG">
-            <node concept="YeOm9" id="54jQkZ8Wacz" role="2ShVmc">
-              <node concept="1Y3b0j" id="54jQkZ8Wac$" role="YeSDq">
-                <property role="2bfB8j" value="true" />
-                <property role="373rjd" value="true" />
-                <ref role="1Y3XeK" to="82uw:~BiConsumer" resolve="BiConsumer" />
-                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                <node concept="3Tm1VV" id="54jQkZ8Wac_" role="1B3o_S" />
-                <node concept="3clFb_" id="54jQkZ8WacA" role="jymVt">
-                  <property role="TrG5h" value="accept" />
-                  <node concept="3Tm1VV" id="54jQkZ8WacB" role="1B3o_S" />
-                  <node concept="3cqZAl" id="54jQkZ8WacC" role="3clF45" />
-                  <node concept="37vLTG" id="54jQkZ8WacD" role="3clF46">
-                    <property role="TrG5h" value="p1" />
-                    <node concept="3uibUv" id="54jQkZ8WacE" role="1tU5fm">
-                      <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
-                    </node>
-                  </node>
-                  <node concept="37vLTG" id="54jQkZ8WacF" role="3clF46">
-                    <property role="TrG5h" value="p2" />
-                    <node concept="3uibUv" id="54jQkZ8WacG" role="1tU5fm">
-                      <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
-                      <node concept="17QB3L" id="54jQkZ8WacH" role="11_B2D" />
-                    </node>
-                  </node>
-                  <node concept="3clFbS" id="54jQkZ8WacI" role="3clF47">
-                    <node concept="3vlDli" id="54jQkZ8WacJ" role="3cqZAp">
-                      <node concept="37vLTw" id="54jQkZ8Wdsy" role="3tpDZB">
-                        <ref role="3cqZAo" node="54jQkZ8VZ7k" resolve="count" />
-                      </node>
-                      <node concept="2OqwBi" id="54jQkZ8WacL" role="3tpDZA">
-                        <node concept="37vLTw" id="54jQkZ8WacM" role="2Oq$k0">
-                          <ref role="3cqZAo" node="54jQkZ8WacF" resolve="p2" />
-                        </node>
-                        <node concept="liA8E" id="54jQkZ8WacN" role="2OqNvi">
-                          <ref role="37wK5l" to="urs3:5Ffu4tBUx9j" resolve="count" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2AHcQZ" id="54jQkZ8WacO" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                  </node>
+        <node concept="3clFbF" id="4OYzbeqKr_C" role="3cqZAp">
+          <node concept="1bVj0M" id="4OYzbeqKr_$" role="3clFbG">
+            <node concept="37vLTG" id="4OYzbeqKsHR" role="1bW2Oz">
+              <property role="TrG5h" value="mapping" />
+              <node concept="3f3tKP" id="4OYzbeqKtLq" role="1tU5fm">
+                <node concept="10Oyi0" id="4OYzbeqKuPf" role="3f3zw5" />
+                <node concept="A3Dl8" id="4OYzbeqKvT0" role="3f3$T$">
+                  <node concept="17QB3L" id="4OYzbeqKxmW" role="A3Ik2" />
                 </node>
-                <node concept="3uibUv" id="54jQkZ8WacP" role="2Ghqu4">
-                  <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+              </node>
+            </node>
+            <node concept="3clFbS" id="4OYzbeqKr_A" role="1bW5cS">
+              <node concept="3vlDli" id="54jQkZ8WacJ" role="3cqZAp">
+                <node concept="37vLTw" id="54jQkZ8Wdsy" role="3tpDZB">
+                  <ref role="3cqZAo" node="54jQkZ8VZ7k" resolve="count" />
                 </node>
-                <node concept="3uibUv" id="54jQkZ8WacQ" role="2Ghqu4">
-                  <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
-                  <node concept="17QB3L" id="54jQkZ8WacR" role="11_B2D" />
+                <node concept="2OqwBi" id="54jQkZ8WacL" role="3tpDZA">
+                  <node concept="2OqwBi" id="4OYzbeqKDt9" role="2Oq$k0">
+                    <node concept="37vLTw" id="54jQkZ8WacM" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4OYzbeqKsHR" resolve="mapping" />
+                    </node>
+                    <node concept="3AV6Ez" id="4OYzbeqKEZ9" role="2OqNvi" />
+                  </node>
+                  <node concept="34oBXx" id="4OYzbeqKIwa" role="2OqNvi" />
                 </node>
               </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="3uibUv" id="54jQkZ8VSlM" role="3clF45">
-        <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
-        <node concept="3uibUv" id="54jQkZ8VUQm" role="11_B2D">
-          <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
-        </node>
-        <node concept="3uibUv" id="54jQkZ8VVqA" role="11_B2D">
-          <ref role="3uigEE" to="urs3:5Ffu4tBUx5R" resolve="ISequence" />
-          <node concept="17QB3L" id="54jQkZ8VWA4" role="11_B2D" />
-        </node>
-      </node>
       <node concept="37vLTG" id="54jQkZ8VZ7k" role="3clF46">
         <property role="TrG5h" value="count" />
         <property role="3TUv4t" value="true" />
         <node concept="10Oyi0" id="54jQkZ8VZ7j" role="1tU5fm" />
       </node>
+      <node concept="1ajhzC" id="4OYzbeqJNbW" role="3clF45">
+        <node concept="3cqZAl" id="4OYzbeqJR36" role="1ajl9A" />
+        <node concept="3f3tKP" id="4OYzbeqK5yR" role="1ajw0F">
+          <node concept="10Oyi0" id="4OYzbeqKgl8" role="3f3zw5" />
+          <node concept="A3Dl8" id="4OYzbeqKb7S" role="3f3$T$">
+            <node concept="17QB3L" id="4OYzbeqKcAy" role="A3Ik2" />
+          </node>
+        </node>
+      </node>
     </node>
   </node>
 </model>