diff --git a/build.xml b/build.xml
index fef49054..a451d64c 100644
--- a/build.xml
+++ b/build.xml
@@ -219,6 +219,7 @@
           <module ref="9abaaae2-decf-4e97-bf80-9109e8b759cc(jetbrains.mps.lang.messages.api)" kind="rt" />
           <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
+          <module ref="7350a1d7-537e-4f0d-9965-e91c82522d7d(io.lionweb.mps.m3.runtime)" kind="cl" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" kind="cl" />
           <module ref="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" kind="cl" />
           <module ref="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" kind="cl" />
@@ -3232,7 +3233,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.io.lionweb.mps.m3, java.compile.io.lionweb.mps.m3.runtime, java.compile.io.lionweb.mps.structure.attribute, java.compile.io.lionweb.mps.specific, java.compile.io.lionweb.mps.server.plugin, java.compile.io.lionweb.mps.converter, java.compile.io.lionweb.mps.json, java.compile.java.modules.cycle.1, java.compile.io.lionweb.mps.converter.lang, java.compile.io.lionweb.mps.converter.lang.runtime, java.compile.io.lionweb.mps.client.connector, java.compile.io.lionweb.mps.client.ideaPlugin, java.compile.io.lionweb.mps.client.persistence, java.compile.io.lionweb.mps.cmdline, java.compile.io.lionweb.mps.build, java.compile.io.lionweb.mps.converter.TestAllBuiltins, java.compile.io.lionweb.mps.testsupport, java.compile.io.lionweb.mps.testsupport.generator, java.compile.io.lionweb.mps.converter.TestLang, java.compile.io.lionweb.mps.converter.TestLang2, java.compile.io.lionweb.mps.converter.TestLang3, java.compile.library, java.compile.MultiRefLang, java.compile.io.lionweb.mps.converter.TestCoreRefLang, java.compile.io.lionweb.mps.converter.TestCustomDatatype, java.compile.io.lionweb.mps.converter.TestAnnotation, java.compile.io.lionweb.mps.converter.TestRefs, java.compile.io.lionweb.mps.converter.deps.AnnotationAnnotates, java.compile.io.lionweb.mps.converter.deps.AnnotationAnnotates_Node, java.compile.io.lionweb.mps.converter.deps.AnnotationExtends, java.compile.io.lionweb.mps.converter.deps.AnnotationImplements, java.compile.io.lionweb.mps.converter.deps.ConceptExtends, java.compile.io.lionweb.mps.converter.deps.ConceptImplements, java.compile.io.lionweb.mps.converter.deps.ContainmentType, java.compile.io.lionweb.mps.converter.deps.InterfaceExtends, java.compile.io.lionweb.mps.converter.deps.LanguageDepends, java.compile.io.lionweb.mps.converter.deps.OnlyBuiltins, java.compile.io.lionweb.mps.converter.deps.PropertyType, java.compile.io.lionweb.mps.converter.deps.ReferenceType, java.compile.io.lionweb.mps.converter.deps.SmartReferenceType, java.compile.io.lionweb.mps.converter.deps.Standalone, java.compile.io.lionweb.mps.converter.deps.AvoidMultipleConcepts, java.compile.io.lionweb.mps.converter.TestAbstract, java.compile.io.lionweb.mps.converter.TestComputedProperty, java.compile.io.lionweb.mps.converter.TestLanguageAnnotation, java.compile.io.lionweb.mps.converter.TestDeprecated, java.compile.io.lionweb.mps.converter.TestEnum, java.compile.io.lionweb.mps.converter.test.support, java.compile.io.lionweb.mps.json.test.support, java.compile.io.lionweb.mps.lang.test, java.compile.io.lionweb.mps.json.test, java.compile.io.lionweb.mps.converter.test" />
+  <target name="compileJava" depends="java.compile.io.lionweb.mps.m3, java.compile.java.modules.cycle.1, java.compile.io.lionweb.mps.m3.runtime, java.compile.io.lionweb.mps.structure.attribute, java.compile.io.lionweb.mps.specific, java.compile.io.lionweb.mps.server.plugin, java.compile.io.lionweb.mps.converter, java.compile.io.lionweb.mps.json, java.compile.java.modules.cycle.2, java.compile.io.lionweb.mps.converter.lang, java.compile.io.lionweb.mps.converter.lang.runtime, java.compile.io.lionweb.mps.client.connector, java.compile.io.lionweb.mps.client.ideaPlugin, java.compile.io.lionweb.mps.client.persistence, java.compile.io.lionweb.mps.cmdline, java.compile.io.lionweb.mps.build, java.compile.io.lionweb.mps.converter.TestAllBuiltins, java.compile.io.lionweb.mps.testsupport, java.compile.io.lionweb.mps.testsupport.generator, java.compile.io.lionweb.mps.converter.TestLang, java.compile.io.lionweb.mps.converter.TestLang2, java.compile.io.lionweb.mps.converter.TestLang3, java.compile.library, java.compile.MultiRefLang, java.compile.io.lionweb.mps.converter.TestCoreRefLang, java.compile.io.lionweb.mps.converter.TestCustomDatatype, java.compile.io.lionweb.mps.converter.TestAnnotation, java.compile.io.lionweb.mps.converter.TestRefs, java.compile.io.lionweb.mps.converter.deps.AnnotationAnnotates, java.compile.io.lionweb.mps.converter.deps.AnnotationAnnotates_Node, java.compile.io.lionweb.mps.converter.deps.AnnotationExtends, java.compile.io.lionweb.mps.converter.deps.AnnotationImplements, java.compile.io.lionweb.mps.converter.deps.ConceptExtends, java.compile.io.lionweb.mps.converter.deps.ConceptImplements, java.compile.io.lionweb.mps.converter.deps.ContainmentType, java.compile.io.lionweb.mps.converter.deps.InterfaceExtends, java.compile.io.lionweb.mps.converter.deps.LanguageDepends, java.compile.io.lionweb.mps.converter.deps.OnlyBuiltins, java.compile.io.lionweb.mps.converter.deps.PropertyType, java.compile.io.lionweb.mps.converter.deps.ReferenceType, java.compile.io.lionweb.mps.converter.deps.SmartReferenceType, java.compile.io.lionweb.mps.converter.deps.Standalone, java.compile.io.lionweb.mps.converter.deps.AvoidMultipleConcepts, java.compile.io.lionweb.mps.converter.TestAbstract, java.compile.io.lionweb.mps.converter.TestComputedProperty, java.compile.io.lionweb.mps.converter.TestLanguageAnnotation, java.compile.io.lionweb.mps.converter.TestDeprecated, java.compile.io.lionweb.mps.converter.TestEnum, java.compile.io.lionweb.mps.converter.test.support, java.compile.io.lionweb.mps.json.test.support, java.compile.io.lionweb.mps.lang.test, java.compile.io.lionweb.mps.json.test, java.compile.io.lionweb.mps.converter.test" />
   
   <target name="processResources" />
   
@@ -3377,6 +3378,9 @@
         <module file="${lionweb-mps.home}/languages/io.lionweb.mps.converter.TestLang/io.lionweb.mps.converter.TestLang.mpl" />
         <module file="${lionweb-mps.home}/languages/io.lionweb.mps.converter.TestLanguageAnnotation/io.lionweb.mps.converter.TestLanguageAnnotation.mpl" bootstrap="true" />
         <module file="${lionweb-mps.home}/languages/io.lionweb.mps.converter.deps.AvoidMultipleConcepts/io.lionweb.mps.converter.deps.AvoidMultipleConcepts.mpl" />
+        <module file="${lionweb-mps.home}/languages/io.lionweb.mps.m3/io.lionweb.mps.m3.mpl" bootstrap="true" />
+        <module file="${lionweb-mps.home}/solutions/io.lionweb.mps.m3.runtime/io.lionweb.mps.m3.runtime.msd" />
+        <module file="${lionweb-mps.home}/languages/io.lionweb.mps.specific/io.lionweb.mps.specific.mpl" bootstrap="true" />
         <module file="${lionweb-mps.home}/languages/io.lionweb.mps.structure.attribute/io.lionweb.mps.structure.attribute.mpl" />
         <module file="${lionweb-mps.home}/languages/io.lionweb.mps.testsupport/io.lionweb.mps.testsupport.mpl" />
         <module file="${lionweb-mps.home}/languages/library/library.mpl" />
@@ -3417,15 +3421,12 @@
         <module file="${lionweb-mps.home}/solutions/io.lionweb.mps.converter.test.support/io.lionweb.mps.converter.test.support.msd" />
         <module file="${lionweb-mps.home}/solutions/io.lionweb.mps.json/io.lionweb.mps.json.msd" />
         <module file="${lionweb-mps.home}/solutions/io.lionweb.mps.json.test.support/io.lionweb.mps.json.test.support.msd" />
-        <module file="${lionweb-mps.home}/languages/io.lionweb.mps.m3/io.lionweb.mps.m3.mpl" />
-        <module file="${lionweb-mps.home}/solutions/io.lionweb.mps.m3.runtime/io.lionweb.mps.m3.runtime.msd" />
+        <module file="${lionweb-mps.home}/solutions/io.lionweb.mps.lang.test/io.lionweb.mps.lang.test.msd" />
         <module file="${lionweb-mps.home}/solutions/io.lionweb.mps.server.plugin/io.lionweb.mps.server.plugin.msd" />
-        <module file="${lionweb-mps.home}/languages/io.lionweb.mps.specific/io.lionweb.mps.specific.mpl" />
       </chunk>
       <chunk>
         <module file="${lionweb-mps.home}/solutions/io.lionweb.mps.converter.test/io.lionweb.mps.converter.test.msd" />
         <module file="${lionweb-mps.home}/solutions/io.lionweb.mps.json.test/io.lionweb.mps.json.test.msd" />
-        <module file="${lionweb-mps.home}/solutions/io.lionweb.mps.lang.test/io.lionweb.mps.lang.test.msd" />
       </chunk>
       <jvmargs>
         <arg value="-ea" />
@@ -3501,13 +3502,13 @@
     </copy>
   </target>
   
-  <target name="java.compile.io.lionweb.mps.m3.runtime" depends="java.compile.io.lionweb.mps.m3, java.compile.io.lionweb.mps.specific, java.compile.io.lionweb.mps.structure.attribute, fetchDependencies">
-    <mkdir dir="${lionweb-mps.home}/solutions/io.lionweb.mps.m3.runtime/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/io.lionweb.mps.m3.runtime" />
-    <javac destdir="${build.tmp}/java/out/io.lionweb.mps.m3.runtime" fork="false" encoding="utf8" includeantruntime="false" debug="true">
+  <target name="java.compile.java.modules.cycle.1" depends="java.compile.io.lionweb.mps.m3, java.compile.io.lionweb.mps.specific, fetchDependencies">
+    <mkdir dir="${build.tmp}/java.modules.cycle.1" />
+    <javac destdir="${build.tmp}/java.modules.cycle.1" fork="false" encoding="utf8" nowarn="true" includeantruntime="false">
       <compilerarg value="-Xlint:none" />
       <src>
         <path location="${lionweb-mps.home}/solutions/io.lionweb.mps.m3.runtime/source_gen" />
+        <path location="${lionweb-mps.home}/languages/io.lionweb.mps.structure.attribute/source_gen" />
       </src>
       <classpath>
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
@@ -3537,9 +3538,6 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
-        <pathelement path="${build.tmp}/java/out/io.lionweb.mps.m3" />
-        <pathelement path="${build.tmp}/java/out/io.lionweb.mps.specific" />
-        <pathelement path="${build.tmp}/java/out/io.lionweb.mps.structure.attribute" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset dir="${artifacts.IDEA}/lib" includes="*.jar" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
@@ -3557,20 +3555,22 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
+        <pathelement path="${build.tmp}/java/out/io.lionweb.mps.m3" />
+        <pathelement path="${build.tmp}/java/out/io.lionweb.mps.specific" />
       </classpath>
     </javac>
-    <copy todir="${build.tmp}/java/out/io.lionweb.mps.m3.runtime">
-      <fileset dir="${lionweb-mps.home}/solutions/io.lionweb.mps.m3.runtime/source_gen" excludes="**/*.java" />
-    </copy>
   </target>
   
-  <target name="java.compile.io.lionweb.mps.structure.attribute" depends="fetchDependencies">
-    <mkdir dir="${lionweb-mps.home}/languages/io.lionweb.mps.structure.attribute/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/io.lionweb.mps.structure.attribute" />
-    <javac destdir="${build.tmp}/java/out/io.lionweb.mps.structure.attribute" fork="false" encoding="utf8" includeantruntime="false" debug="true">
+  <target name="java.compile.io.lionweb.mps.m3.runtime" depends="java.compile.io.lionweb.mps.m3, java.compile.io.lionweb.mps.specific, java.compile.java.modules.cycle.1, fetchDependencies">
+    <mkdir dir="${lionweb-mps.home}/solutions/io.lionweb.mps.m3.runtime/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/io.lionweb.mps.m3.runtime" />
+    <javac destdir="${build.tmp}/java/out/io.lionweb.mps.m3.runtime" fork="false" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${lionweb-mps.home}/languages/io.lionweb.mps.structure.attribute/source_gen" />
+        <path location="${lionweb-mps.home}/solutions/io.lionweb.mps.m3.runtime/source_gen" />
       </src>
       <classpath>
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
@@ -3600,6 +3600,8 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
+        <pathelement path="${build.tmp}/java/out/io.lionweb.mps.m3" />
+        <pathelement path="${build.tmp}/java/out/io.lionweb.mps.specific" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset dir="${artifacts.IDEA}/lib" includes="*.jar" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
@@ -3607,12 +3609,74 @@
         <fileset file="${artifacts.IDEA}/lib/trove4j.jar" />
         <fileset file="${artifacts.IDEA}/lib/ecj-4.16.jar" />
         <fileset file="${artifacts.IDEA}/plugins/java/lib/ecj-4.16.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <pathelement path="${build.tmp}/java.modules.cycle.1" />
+      </classpath>
+    </javac>
+    <copy todir="${build.tmp}/java/out/io.lionweb.mps.m3.runtime">
+      <fileset dir="${lionweb-mps.home}/solutions/io.lionweb.mps.m3.runtime/source_gen" excludes="**/*.java" />
+    </copy>
+  </target>
+  
+  <target name="java.compile.io.lionweb.mps.structure.attribute" depends="java.compile.java.modules.cycle.1, fetchDependencies">
+    <mkdir dir="${lionweb-mps.home}/languages/io.lionweb.mps.structure.attribute/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/io.lionweb.mps.structure.attribute" />
+    <javac destdir="${build.tmp}/java/out/io.lionweb.mps.structure.attribute" fork="false" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${lionweb-mps.home}/languages/io.lionweb.mps.structure.attribute/source_gen" />
+      </src>
+      <classpath>
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-references.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-context.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
+        <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
+        <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
+        <fileset file="${artifacts.IDEA}/lib/trove4j.jar" />
+        <fileset file="${artifacts.IDEA}/lib/ecj-4.16.jar" />
+        <fileset file="${artifacts.IDEA}/plugins/java/lib/ecj-4.16.jar" />
+        <fileset dir="${artifacts.IDEA}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
+        <pathelement path="${build.tmp}/java.modules.cycle.1" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/io.lionweb.mps.structure.attribute">
@@ -3838,9 +3902,9 @@
     </copy>
   </target>
   
-  <target name="java.compile.java.modules.cycle.1" depends="java.compile.io.lionweb.mps.converter, java.compile.io.lionweb.mps.json, java.compile.io.lionweb.mps.m3, java.compile.io.lionweb.mps.m3.runtime, fetchDependencies">
-    <mkdir dir="${build.tmp}/java.modules.cycle.1" />
-    <javac destdir="${build.tmp}/java.modules.cycle.1" fork="false" encoding="utf8" nowarn="true" includeantruntime="false">
+  <target name="java.compile.java.modules.cycle.2" depends="java.compile.io.lionweb.mps.converter, java.compile.io.lionweb.mps.json, java.compile.io.lionweb.mps.m3, java.compile.io.lionweb.mps.m3.runtime, fetchDependencies">
+    <mkdir dir="${build.tmp}/java.modules.cycle.2" />
+    <javac destdir="${build.tmp}/java.modules.cycle.2" fork="false" encoding="utf8" nowarn="true" includeantruntime="false">
       <compilerarg value="-Xlint:none" />
       <src>
         <path location="${lionweb-mps.home}/languages/io.lionweb.mps.converter.lang/source_gen" />
@@ -3905,7 +3969,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.io.lionweb.mps.converter.lang" depends="java.compile.io.lionweb.mps.converter, java.compile.io.lionweb.mps.json, java.compile.io.lionweb.mps.m3, java.compile.io.lionweb.mps.m3.runtime, java.compile.java.modules.cycle.1, fetchDependencies">
+  <target name="java.compile.io.lionweb.mps.converter.lang" depends="java.compile.io.lionweb.mps.converter, java.compile.io.lionweb.mps.json, java.compile.io.lionweb.mps.m3, java.compile.io.lionweb.mps.m3.runtime, java.compile.java.modules.cycle.2, fetchDependencies">
     <mkdir dir="${lionweb-mps.home}/languages/io.lionweb.mps.converter.lang/source_gen" />
     <mkdir dir="${build.tmp}/java/out/io.lionweb.mps.converter.lang" />
     <javac destdir="${build.tmp}/java/out/io.lionweb.mps.converter.lang" fork="false" encoding="utf8" includeantruntime="false" debug="true">
@@ -3968,7 +4032,7 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.1" />
+        <pathelement path="${build.tmp}/java.modules.cycle.2" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/io.lionweb.mps.converter.lang">
@@ -3976,7 +4040,7 @@
     </copy>
   </target>
   
-  <target name="java.compile.io.lionweb.mps.converter.lang.runtime" depends="java.compile.io.lionweb.mps.converter, java.compile.io.lionweb.mps.m3, java.compile.io.lionweb.mps.m3.runtime, java.compile.java.modules.cycle.1, fetchDependencies">
+  <target name="java.compile.io.lionweb.mps.converter.lang.runtime" depends="java.compile.io.lionweb.mps.converter, java.compile.io.lionweb.mps.m3, java.compile.io.lionweb.mps.m3.runtime, java.compile.java.modules.cycle.2, fetchDependencies">
     <mkdir dir="${lionweb-mps.home}/solutions/io.lionweb.mps.converter.lang.runtime/source_gen" />
     <mkdir dir="${build.tmp}/java/out/io.lionweb.mps.converter.lang.runtime" />
     <javac destdir="${build.tmp}/java/out/io.lionweb.mps.converter.lang.runtime" fork="false" encoding="utf8" includeantruntime="false" debug="true">
@@ -4035,7 +4099,7 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.1" />
+        <pathelement path="${build.tmp}/java.modules.cycle.2" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/io.lionweb.mps.converter.lang.runtime">
@@ -6287,15 +6351,12 @@
     <delete dir="${lionweb-mps.home}/solutions/io.lionweb.mps.converter.test.support/source_gen" />
     <delete dir="${lionweb-mps.home}/solutions/io.lionweb.mps.json/source_gen" />
     <delete dir="${lionweb-mps.home}/solutions/io.lionweb.mps.json.test.support/source_gen" />
-    <delete dir="${lionweb-mps.home}/languages/io.lionweb.mps.m3/source_gen" />
-    <delete dir="${lionweb-mps.home}/solutions/io.lionweb.mps.m3.runtime/source_gen" />
+    <delete dir="${lionweb-mps.home}/solutions/io.lionweb.mps.lang.test/test_gen" />
     <delete dir="${lionweb-mps.home}/solutions/io.lionweb.mps.server.plugin/source_gen" />
-    <delete dir="${lionweb-mps.home}/languages/io.lionweb.mps.specific/source_gen" />
     <delete dir="${lionweb-mps.home}/solutions/io.lionweb.mps.converter.test/test_gen" />
     <delete dir="${lionweb-mps.home}/solutions/io.lionweb.mps.json.test/test_gen" />
     <delete dir="${lionweb-mps.home}/solutions/io.lionweb.mps.lang.test/test_gen" />
     <delete dir="${lionweb-mps.home}/solutions/io.lionweb.mps.converter.test/test_gen" />
     <delete dir="${lionweb-mps.home}/solutions/io.lionweb.mps.json.test/test_gen" />
-    <delete dir="${lionweb-mps.home}/solutions/io.lionweb.mps.lang.test/test_gen" />
   </target>
 </project>
\ No newline at end of file
diff --git a/changelog.md b/changelog.md
index 45c7043e..d5edc072 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,10 @@
 # Changelog for LionWeb-MPS
 
+## 0.2.10-2023.1
+
+* Added optional `version` to LionWeb Language root in structure aspect.
+  This value, if set, takes precendence over the language's version.
+
 ## 0.2.9-2023.1
 
 * Fixed using enumeration literal's key in all cases.
diff --git a/languages/MultiRefLang/models/MultiRefLang.structure.mps b/languages/MultiRefLang/models/MultiRefLang.structure.mps
index ef79da35..1d9f3d64 100644
--- a/languages/MultiRefLang/models/MultiRefLang.structure.mps
+++ b/languages/MultiRefLang/models/MultiRefLang.structure.mps
@@ -41,7 +41,7 @@
       </concept>
     </language>
     <language id="411e5b27-8a76-482e-8af8-1704262b4468" name="io.lionweb.mps.structure.attribute">
-      <concept id="7205279169712116346" name="io.lionweb.mps.structure.attribute.structure.LionWebLanguageKey" flags="ng" index="2DM1_0" />
+      <concept id="7205279169712116346" name="io.lionweb.mps.structure.attribute.structure.LionWebLanguage" flags="ng" index="2DM1_0" />
       <concept id="7205279169712116353" name="io.lionweb.mps.structure.attribute.structure.ILionWebKey" flags="ng" index="2DM1AV">
         <property id="7205279169712116354" name="key" index="2DM1AS" />
       </concept>
diff --git a/languages/io.lionweb.mps.converter.TestLang3/models/io.lionweb.mps.converter.TestLang3.structure.mps b/languages/io.lionweb.mps.converter.TestLang3/models/io.lionweb.mps.converter.TestLang3.structure.mps
index 5aea83c3..de8defa4 100644
--- a/languages/io.lionweb.mps.converter.TestLang3/models/io.lionweb.mps.converter.TestLang3.structure.mps
+++ b/languages/io.lionweb.mps.converter.TestLang3/models/io.lionweb.mps.converter.TestLang3.structure.mps
@@ -63,7 +63,9 @@
       </concept>
     </language>
     <language id="411e5b27-8a76-482e-8af8-1704262b4468" name="io.lionweb.mps.structure.attribute">
-      <concept id="7205279169712116346" name="io.lionweb.mps.structure.attribute.structure.LionWebLanguageKey" flags="ng" index="2DM1_0" />
+      <concept id="7205279169712116346" name="io.lionweb.mps.structure.attribute.structure.LionWebLanguage" flags="ng" index="2DM1_0">
+        <property id="7263087982341810717" name="version" index="2NbWok" />
+      </concept>
       <concept id="7205279169712116353" name="io.lionweb.mps.structure.attribute.structure.ILionWebKey" flags="ng" index="2DM1AV">
         <property id="7205279169712116354" name="key" index="2DM1AS" />
       </concept>
@@ -321,6 +323,7 @@
   </node>
   <node concept="2DM1_0" id="5AGBwuDAKCg">
     <property role="2DM1AS" value="My-TestLang3" />
+    <property role="2NbWok" value="00 my! VERSION 😀" />
   </node>
   <node concept="1TIwiD" id="6jI_U5eOwrW">
     <property role="EcuMT" value="7272917167317845756" />
diff --git a/languages/io.lionweb.mps.converter.lang/models/io.lionweb.mps.converter.lang.intentions.mps b/languages/io.lionweb.mps.converter.lang/models/io.lionweb.mps.converter.lang.intentions.mps
index 88ed3b8f..a2546d61 100644
--- a/languages/io.lionweb.mps.converter.lang/models/io.lionweb.mps.converter.lang.intentions.mps
+++ b/languages/io.lionweb.mps.converter.lang/models/io.lionweb.mps.converter.lang.intentions.mps
@@ -43,6 +43,12 @@
       <concept id="8118189177080264853" name="jetbrains.mps.baseLanguage.structure.AlternativeType" flags="ig" index="nSUau">
         <child id="8118189177080264854" name="alternative" index="nSUat" />
       </concept>
+      <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="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
         <reference id="2820489544401957798" name="classifier" index="HV5vE" />
       </concept>
@@ -67,6 +73,9 @@
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
       <concept id="4952749571008284462" name="jetbrains.mps.baseLanguage.structure.CatchVariable" flags="ng" index="XOnhg" />
+      <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>
@@ -84,6 +93,12 @@
       <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="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" />
@@ -105,6 +120,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>
@@ -113,6 +129,10 @@
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </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">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
+        <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>
@@ -125,6 +145,9 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
       <concept id="5351203823916832286" name="jetbrains.mps.baseLanguage.structure.ResourceVariable" flags="ng" index="3J1hQo" />
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
         <child id="8276990574886367510" name="catchClause" index="1zxBo5" />
@@ -136,6 +159,11 @@
         <child id="1163668922816" name="ifTrue" index="3K4E3e" />
         <child id="1163668934364" name="ifFalse" index="3K4GZi" />
       </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
+      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
+        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+      </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">
@@ -1850,13 +1878,38 @@
                   <ref role="3uigEE" to="6peh:4R9posp5N7h" resolve="JsonToM1" />
                 </node>
                 <node concept="2ShNRf" id="18UigYOS37i" role="33vP2m">
-                  <node concept="1pGfFk" id="18UigYOS37j" role="2ShVmc">
-                    <ref role="37wK5l" to="6peh:4R9posp5Osb" resolve="JsonToM1" />
-                    <node concept="37vLTw" id="18UigYOS37k" role="37wK5m">
-                      <ref role="3cqZAo" node="5M3rB6BZyeP" resolve="repository" />
-                    </node>
-                    <node concept="37vLTw" id="18UigYOS37l" role="37wK5m">
-                      <ref role="3cqZAo" node="7W6jYlyR0iK" resolve="jsonNodes" />
+                  <node concept="YeOm9" id="6jbF0BoEZqE" role="2ShVmc">
+                    <node concept="1Y3b0j" id="6jbF0BoEZqH" role="YeSDq">
+                      <property role="2bfB8j" value="true" />
+                      <ref role="37wK5l" to="6peh:4R9posp5Osb" resolve="JsonToM1" />
+                      <ref role="1Y3XeK" to="6peh:4R9posp5N7h" resolve="JsonToM1" />
+                      <node concept="3Tm1VV" id="6jbF0BoEZqI" role="1B3o_S" />
+                      <node concept="37vLTw" id="18UigYOS37k" role="37wK5m">
+                        <ref role="3cqZAo" node="5M3rB6BZyeP" resolve="repository" />
+                      </node>
+                      <node concept="37vLTw" id="18UigYOS37l" role="37wK5m">
+                        <ref role="3cqZAo" node="7W6jYlyR0iK" resolve="jsonNodes" />
+                      </node>
+                      <node concept="3clFb_" id="6jbF0BoEZvp" role="jymVt">
+                        <property role="TrG5h" value="logWarning" />
+                        <node concept="3cqZAl" id="6jbF0BoEZvq" role="3clF45" />
+                        <node concept="3Tmbuc" id="6jbF0BoEZvr" role="1B3o_S" />
+                        <node concept="37vLTG" id="6jbF0BoEZvs" role="3clF46">
+                          <property role="TrG5h" value="message" />
+                          <node concept="17QB3L" id="6jbF0BoEZvt" role="1tU5fm" />
+                        </node>
+                        <node concept="3clFbS" id="6jbF0BoEZvA" role="3clF47">
+                          <node concept="2xdQw9" id="6jbF0BoF0s8" role="3cqZAp">
+                            <property role="2xdLsb" value="gZ5fksE/warn" />
+                            <node concept="37vLTw" id="6jbF0BoF0AO" role="9lYJi">
+                              <ref role="3cqZAo" node="6jbF0BoEZvs" resolve="message" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="2AHcQZ" id="6jbF0BoEZvB" role="2AJF6D">
+                          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
diff --git a/languages/io.lionweb.mps.m3/models/io.lionweb.mps.m3.builtin.mps b/languages/io.lionweb.mps.m3/models/io.lionweb.mps.m3.builtin.mps
index ba4184dc..313ee422 100644
--- a/languages/io.lionweb.mps.m3/models/io.lionweb.mps.m3.builtin.mps
+++ b/languages/io.lionweb.mps.m3/models/io.lionweb.mps.m3.builtin.mps
@@ -35,7 +35,7 @@
   </registry>
   <node concept="2RzRRF" id="2ju2syjnJjW">
     <property role="TrG5h" value="Built-in DataTypes" />
-    <property role="3HH78N" value="1" />
+    <property role="3HH78N" value="2023.1" />
     <property role="2RzON1" value="LionCore-builtins" />
     <node concept="2RzSJf" id="2ju2syjnJjX" role="2RzR6B">
       <property role="2RzON1" value="LionCore-builtins-String" />
diff --git a/languages/io.lionweb.mps.m3/models/io.lionweb.mps.m3.structure.mps b/languages/io.lionweb.mps.m3/models/io.lionweb.mps.m3.structure.mps
index 3a40307b..ce2d5ffe 100644
--- a/languages/io.lionweb.mps.m3/models/io.lionweb.mps.m3.structure.mps
+++ b/languages/io.lionweb.mps.m3/models/io.lionweb.mps.m3.structure.mps
@@ -62,7 +62,9 @@
       </concept>
     </language>
     <language id="411e5b27-8a76-482e-8af8-1704262b4468" name="io.lionweb.mps.structure.attribute">
-      <concept id="7205279169712116346" name="io.lionweb.mps.structure.attribute.structure.LionWebLanguageKey" flags="ng" index="2DM1_0" />
+      <concept id="7205279169712116346" name="io.lionweb.mps.structure.attribute.structure.LionWebLanguage" flags="ng" index="2DM1_0">
+        <property id="7263087982341810717" name="version" index="2NbWok" />
+      </concept>
       <concept id="7205279169712116353" name="io.lionweb.mps.structure.attribute.structure.ILionWebKey" flags="ng" index="2DM1AV">
         <property id="7205279169712116354" name="key" index="2DM1AS" />
       </concept>
@@ -443,6 +445,7 @@
   </node>
   <node concept="2DM1_0" id="5AGBwuDAKCg">
     <property role="2DM1AS" value="LionCore-M3" />
+    <property role="2NbWok" value="2023.1" />
   </node>
   <node concept="1TIwiD" id="18UigYQyrxa">
     <property role="EcuMT" value="1313442573167736906" />
diff --git a/languages/io.lionweb.mps.structure.attribute/io.lionweb.mps.structure.attribute.mpl b/languages/io.lionweb.mps.structure.attribute/io.lionweb.mps.structure.attribute.mpl
index 445c87b8..0d2031bb 100644
--- a/languages/io.lionweb.mps.structure.attribute/io.lionweb.mps.structure.attribute.mpl
+++ b/languages/io.lionweb.mps.structure.attribute/io.lionweb.mps.structure.attribute.mpl
@@ -15,6 +15,7 @@
   <dependencies>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
+    <dependency reexport="false">7350a1d7-537e-4f0d-9965-e91c82522d7d(io.lionweb.mps.m3.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
@@ -59,6 +60,7 @@
     <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="7350a1d7-537e-4f0d-9965-e91c82522d7d(io.lionweb.mps.m3.runtime)" version="0" />
     <module reference="411e5b27-8a76-482e-8af8-1704262b4468(io.lionweb.mps.structure.attribute)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
diff --git a/languages/io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.behavior.mps b/languages/io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.behavior.mps
index 124a77c7..fc399a91 100644
--- a/languages/io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.behavior.mps
+++ b/languages/io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.behavior.mps
@@ -59,7 +59,7 @@
     </language>
   </registry>
   <node concept="13h7C7" id="3M8YG$9uJLd">
-    <ref role="13h7C2" to="234s:6fYiNFad_9U" resolve="LionWebLanguageKey" />
+    <ref role="13h7C2" to="234s:6fYiNFad_9U" resolve="LionWebLanguage" />
     <node concept="13hLZK" id="3M8YG$9uJLe" role="13h7CW">
       <node concept="3clFbS" id="3M8YG$9uJLf" role="2VODD2" />
     </node>
diff --git a/languages/io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.editor.mps b/languages/io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.editor.mps
index 92ef9d8f..bb560b55 100644
--- a/languages/io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.editor.mps
+++ b/languages/io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.editor.mps
@@ -39,6 +39,7 @@
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
+        <property id="1140114345053" name="allowEmptyText" index="1O74Pk" />
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
       <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
@@ -101,7 +102,7 @@
     </language>
   </registry>
   <node concept="24kQdi" id="6fYiNFad_f3">
-    <ref role="1XX52x" to="234s:6fYiNFad_9U" resolve="LionWebLanguageKey" />
+    <ref role="1XX52x" to="234s:6fYiNFad_9U" resolve="LionWebLanguage" />
     <node concept="3EZMnI" id="3M8YG$9urTp" role="2wV5jI">
       <node concept="3EZMnI" id="3M8YG$9urTH" role="3EZMnx">
         <ref role="1k5W1q" to="tpch:24YP6ZDyde4" resolve="Keyword" />
@@ -116,10 +117,39 @@
           </node>
         </node>
       </node>
-      <node concept="3F0A7n" id="3M8YG$9urTr" role="3EZMnx">
-        <ref role="1NtTu8" to="234s:6fYiNFad_a2" resolve="key" />
+      <node concept="3EZMnI" id="6jbF0BnTw3u" role="3EZMnx">
+        <node concept="VPM3Z" id="6jbF0BnTw3w" role="3F10Kt" />
+        <node concept="3XFhqQ" id="6jbF0BnTw3I" role="3EZMnx" />
+        <node concept="3EZMnI" id="6jbF0BnTw3O" role="3EZMnx">
+          <node concept="VPM3Z" id="6jbF0BnTw3Q" role="3F10Kt" />
+          <node concept="3EZMnI" id="6jbF0BnTw3Z" role="3EZMnx">
+            <node concept="VPM3Z" id="6jbF0BnTw41" role="3F10Kt" />
+            <node concept="3F0ifn" id="6jbF0BnTw49" role="3EZMnx">
+              <property role="3F0ifm" value="key" />
+            </node>
+            <node concept="3XFhqQ" id="6jbF0BnTw4f" role="3EZMnx" />
+            <node concept="3F0A7n" id="6jbF0BnTw4s" role="3EZMnx">
+              <ref role="1NtTu8" to="234s:6fYiNFad_a2" resolve="key" />
+            </node>
+            <node concept="2iRfu4" id="6jbF0BnTw44" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="6jbF0BnTw4x" role="3EZMnx">
+            <node concept="VPM3Z" id="6jbF0BnTw4y" role="3F10Kt" />
+            <node concept="3F0ifn" id="6jbF0BnTw4z" role="3EZMnx">
+              <property role="3F0ifm" value="version" />
+            </node>
+            <node concept="3XFhqQ" id="6jbF0BnTw4$" role="3EZMnx" />
+            <node concept="3F0A7n" id="6jbF0BnTw4_" role="3EZMnx">
+              <property role="1O74Pk" value="true" />
+              <ref role="1NtTu8" to="234s:6jbF0BnT6Ct" resolve="version" />
+            </node>
+            <node concept="2iRfu4" id="6jbF0BnTw4A" role="2iSdaV" />
+          </node>
+          <node concept="2iRkQZ" id="6jbF0BnTw3T" role="2iSdaV" />
+        </node>
+        <node concept="2iRfu4" id="6jbF0BnTw3z" role="2iSdaV" />
       </node>
-      <node concept="2iRfu4" id="3M8YG$9urTs" role="2iSdaV" />
+      <node concept="2iRkQZ" id="6jbF0BnTw3k" role="2iSdaV" />
     </node>
   </node>
   <node concept="PKFIW" id="6fYiNFatshQ">
diff --git a/languages/io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.intentions.mps b/languages/io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.intentions.mps
index 7b8c43f0..f55388a1 100644
--- a/languages/io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.intentions.mps
+++ b/languages/io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.intentions.mps
@@ -6,16 +6,23 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
+    <import index="y7p" ref="r:3303ef0b-a58e-4f50-b3cb-bd3d7aaf3653(io.lionweb.mps.m3.runtime)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
     <import index="234s" ref="r:c798b861-d641-45c1-bec6-e39cbda50960(io.lionweb.mps.structure.attribute.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" 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="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="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" />
@@ -26,9 +33,14 @@
       <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="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="1225271369338" name="jetbrains.mps.baseLanguage.structure.IsEmptyOperation" flags="nn" index="17RlXB" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -44,6 +56,10 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
+      <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,11 +74,13 @@
     <language id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions">
       <concept id="1192794744107" name="jetbrains.mps.lang.intentions.structure.IntentionDeclaration" flags="ig" index="2S6QgY" />
       <concept id="1192794782375" name="jetbrains.mps.lang.intentions.structure.DescriptionBlock" flags="in" index="2S6ZIM" />
+      <concept id="1192795771125" name="jetbrains.mps.lang.intentions.structure.IsApplicableBlock" flags="in" index="2SaL7w" />
       <concept id="1192795911897" name="jetbrains.mps.lang.intentions.structure.ExecuteBlock" flags="in" index="2Sbjvc" />
       <concept id="1192796902958" name="jetbrains.mps.lang.intentions.structure.ConceptFunctionParameter_node" flags="nn" index="2Sf5sV" />
       <concept id="2522969319638091381" name="jetbrains.mps.lang.intentions.structure.BaseIntentionDeclaration" flags="ig" index="2ZfUlf">
         <reference id="2522969319638198290" name="forConcept" index="2ZfgGC" />
         <child id="2522969319638198291" name="executeFunction" index="2ZfgGD" />
+        <child id="2522969319638093995" name="isApplicableFunction" index="2ZfVeh" />
         <child id="2522969319638093993" name="descriptionFunction" index="2ZfVej" />
       </concept>
     </language>
@@ -96,6 +114,9 @@
       <concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC" />
       <concept id="1173122760281" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorsOperation" flags="nn" index="z$bX8" />
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
+      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
+        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
+      </concept>
       <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
         <child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
       </concept>
@@ -387,7 +408,7 @@
   </node>
   <node concept="2S6QgY" id="4Yo3buYlC$q">
     <property role="TrG5h" value="addNamesAsKeys" />
-    <ref role="2ZfgGC" to="234s:6fYiNFad_9U" resolve="LionWebLanguageKey" />
+    <ref role="2ZfgGC" to="234s:6fYiNFad_9U" resolve="LionWebLanguage" />
     <node concept="2S6ZIM" id="4Yo3buYlC$r" role="2ZfVej">
       <node concept="3clFbS" id="4Yo3buYlC$s" role="2VODD2">
         <node concept="3clFbF" id="4Yo3buYlCDq" role="3cqZAp">
@@ -527,7 +548,7 @@
   </node>
   <node concept="2S6QgY" id="4Yo3buYmccd">
     <property role="TrG5h" value="replaceNamesAsKeys" />
-    <ref role="2ZfgGC" to="234s:6fYiNFad_9U" resolve="LionWebLanguageKey" />
+    <ref role="2ZfgGC" to="234s:6fYiNFad_9U" resolve="LionWebLanguage" />
     <node concept="2S6ZIM" id="4Yo3buYmcce" role="2ZfVej">
       <node concept="3clFbS" id="4Yo3buYmccf" role="2VODD2">
         <node concept="3clFbF" id="4Yo3buYmce6" role="3cqZAp">
@@ -638,5 +659,71 @@
       </node>
     </node>
   </node>
+  <node concept="2S6QgY" id="6jbF0BnTwAj">
+    <property role="TrG5h" value="copyLanguageVersion" />
+    <ref role="2ZfgGC" to="234s:6fYiNFad_9U" resolve="LionWebLanguage" />
+    <node concept="2S6ZIM" id="6jbF0BnTwAk" role="2ZfVej">
+      <node concept="3clFbS" id="6jbF0BnTwAl" role="2VODD2">
+        <node concept="3clFbF" id="6jbF0BnTwFj" role="3cqZAp">
+          <node concept="Xl_RD" id="6jbF0BnTwFi" role="3clFbG">
+            <property role="Xl_RC" value="Copy Language Version" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2Sbjvc" id="6jbF0BnTwAm" role="2ZfgGD">
+      <node concept="3clFbS" id="6jbF0BnTwAn" role="2VODD2">
+        <node concept="3clFbF" id="6jbF0BnTxTq" role="3cqZAp">
+          <node concept="37vLTI" id="6jbF0BnTxVF" role="3clFbG">
+            <node concept="2YIFZM" id="6jbF0BnTyEr" role="37vLTx">
+              <ref role="37wK5l" to="y7p:34Q84zMXVAC" resolve="getLanguageVersionString" />
+              <ref role="1Pybhc" to="y7p:6jTTMHD72IS" resolve="MpsLanguageUtil" />
+              <node concept="2OqwBi" id="6jbF0BnT$7V" role="37wK5m">
+                <node concept="2YIFZM" id="6jbF0BnT$1z" role="2Oq$k0">
+                  <ref role="37wK5l" to="y7p:39$JcGGnzni" resolve="getInstance" />
+                  <ref role="1Pybhc" to="y7p:39$JcGGnjRO" resolve="MpsLanguageConverter" />
+                </node>
+                <node concept="liA8E" id="6jbF0BnT$j4" role="2OqNvi">
+                  <ref role="37wK5l" to="y7p:39$JcGGnA1k" resolve="toSLanguage" />
+                  <node concept="2OqwBi" id="6jbF0BnTzr8" role="37wK5m">
+                    <node concept="2JrnkZ" id="6jbF0BnTzks" role="2Oq$k0">
+                      <node concept="2OqwBi" id="6jbF0BnTyP6" role="2JrQYb">
+                        <node concept="2Sf5sV" id="6jbF0BnTyF5" role="2Oq$k0" />
+                        <node concept="I4A8Y" id="6jbF0BnTz4C" role="2OqNvi" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="6jbF0BnTzBB" role="2OqNvi">
+                      <ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="6jbF0BnTxTC" role="37vLTJ">
+              <node concept="2Sf5sV" id="6jbF0BnTxTp" role="2Oq$k0" />
+              <node concept="3TrcHB" id="6jbF0BnTxUz" role="2OqNvi">
+                <ref role="3TsBF5" to="234s:6jbF0BnT6Ct" resolve="version" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2SaL7w" id="6jbF0BnTwM0" role="2ZfVeh">
+      <node concept="3clFbS" id="6jbF0BnTwM1" role="2VODD2">
+        <node concept="3clFbF" id="6jbF0BnTwQ0" role="3cqZAp">
+          <node concept="2OqwBi" id="6jbF0BnTx_x" role="3clFbG">
+            <node concept="2OqwBi" id="6jbF0BnTx3q" role="2Oq$k0">
+              <node concept="2Sf5sV" id="6jbF0BnTwPZ" role="2Oq$k0" />
+              <node concept="3TrcHB" id="6jbF0BnTxcw" role="2OqNvi">
+                <ref role="3TsBF5" to="234s:6jbF0BnT6Ct" resolve="version" />
+              </node>
+            </node>
+            <node concept="17RlXB" id="6jbF0BnTxP5" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/languages/io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.structure.mps b/languages/io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.structure.mps
index 18ae7b62..137dd068 100644
--- a/languages/io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.structure.mps
+++ b/languages/io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.structure.mps
@@ -67,11 +67,16 @@
   </registry>
   <node concept="1TIwiD" id="6fYiNFad_9U">
     <property role="EcuMT" value="7205279169712116346" />
-    <property role="TrG5h" value="LionWebLanguageKey" />
+    <property role="TrG5h" value="LionWebLanguage" />
     <property role="R4oN_" value="Key of Language imported from LionWeb" />
     <property role="19KtqR" value="true" />
-    <property role="34LRSv" value="LionWeb Language Key" />
+    <property role="34LRSv" value="LionWeb Language" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyi" id="6jbF0BnT6Ct" role="1TKVEl">
+      <property role="IQ2nx" value="7263087982341810717" />
+      <property role="TrG5h" value="version" />
+      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
+    </node>
     <node concept="PrWs8" id="6fYiNFad_a4" role="PzmwI">
       <ref role="PrY4T" node="6fYiNFad_a1" resolve="ILionWebKey" />
     </node>
diff --git a/solutions/io.lionweb.mps.build/models/io.lionweb.mps.build.mps b/solutions/io.lionweb.mps.build/models/io.lionweb.mps.build.mps
index bd096212..d3f31569 100644
--- a/solutions/io.lionweb.mps.build/models/io.lionweb.mps.build.mps
+++ b/solutions/io.lionweb.mps.build/models/io.lionweb.mps.build.mps
@@ -636,6 +636,11 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
           </node>
         </node>
+        <node concept="1SiIV0" id="6jbF0BozSm_" role="3bR37C">
+          <node concept="3bR9La" id="6jbF0BozSmA" role="1SiIV1">
+            <ref role="3bR37D" node="6jI_U5e9kIC" resolve="io.lionweb.mps.m3.runtime" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="RuBGkv2iXR" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/solutions/io.lionweb.mps.cmdline/models/io.lionweb.mps.cmdline.cmd.mps b/solutions/io.lionweb.mps.cmdline/models/io.lionweb.mps.cmdline.cmd.mps
index bcbfa8a6..f7e84096 100644
--- a/solutions/io.lionweb.mps.cmdline/models/io.lionweb.mps.cmdline.cmd.mps
+++ b/solutions/io.lionweb.mps.cmdline/models/io.lionweb.mps.cmdline.cmd.mps
@@ -967,67 +967,158 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="6jbF0BoE1e9" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoE1ea" role="3cpWs9">
+            <property role="TrG5h" value="metaAdapterByDeclarationHelper" />
+            <node concept="3uibUv" id="6jbF0BoE0Ux" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BoE1eb" role="33vP2m">
+              <node concept="HV5vD" id="6jbF0BoE1ec" role="2ShVmc">
+                <ref role="HV5vE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6jbF0BoE4Dw" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoE4Dx" role="3cpWs9">
+            <property role="TrG5h" value="attributeFinder" />
+            <node concept="3uibUv" id="6jbF0BoE4mc" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:pPZz6cPvUw" resolve="LionWebAttributeFinder" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BoE4Dy" role="33vP2m">
+              <node concept="1pGfFk" id="6jbF0BoE4Dz" role="2ShVmc">
+                <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
+                <node concept="37vLTw" id="6jbF0BoE4D$" role="37wK5m">
+                  <ref role="3cqZAo" node="12kZjFJeNvA" resolve="repository" />
+                </node>
+                <node concept="37vLTw" id="6jbF0BoE4D_" role="37wK5m">
+                  <ref role="3cqZAo" node="12kZjFJeNv3" resolve="constants" />
+                </node>
+                <node concept="37vLTw" id="6jbF0BoE4DA" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BoE1ea" resolve="metaAdapterByDeclarationHelper" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6jbF0BoE9e1" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoE9e2" role="3cpWs9">
+            <property role="TrG5h" value="directMetaPointerPostprocessor" />
+            <node concept="3uibUv" id="6jbF0BoE8UL" role="1tU5fm">
+              <ref role="3uigEE" to="pe0e:6lVb1tfT0pq" resolve="DirectMetaPointerPostprocessor" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BoE9e3" role="33vP2m">
+              <node concept="HV5vD" id="6jbF0BoE9e4" role="2ShVmc">
+                <ref role="HV5vE" to="pe0e:6lVb1tfT0pq" resolve="DirectMetaPointerPostprocessor" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6jbF0BoEbHj" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoEbHk" role="3cpWs9">
+            <property role="TrG5h" value="sLanguageIdDeriver" />
+            <node concept="3uibUv" id="6jbF0BoEbqN" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:6VkSF6aHm0Q" resolve="SLanguageIdDeriver" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BoEbHl" role="33vP2m">
+              <node concept="1pGfFk" id="6jbF0BoEbHm" role="2ShVmc">
+                <ref role="37wK5l" to="y7p:6VkSF6aIt83" resolve="SLanguageIdDeriver" />
+                <node concept="37vLTw" id="6jbF0BoEbHn" role="37wK5m">
+                  <ref role="3cqZAo" node="12kZjFJeNv3" resolve="constants" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6jbF0BoEet2" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoEet3" role="3cpWs9">
+            <property role="TrG5h" value="sLanguageIdExtractor" />
+            <node concept="3uibUv" id="6jbF0BoEech" role="1tU5fm">
+              <ref role="3uigEE" to="faaz:6VkSF6aHm0Q" resolve="SLanguageIdExtractor" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BoEet4" role="33vP2m">
+              <node concept="1pGfFk" id="6jbF0BoEet5" role="2ShVmc">
+                <ref role="37wK5l" to="faaz:6VkSF6aIt83" resolve="SLanguageIdExtractor" />
+                <node concept="37vLTw" id="6jbF0BoEet6" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BoEbHk" resolve="sLanguageIdDeriver" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6jbF0BoEfMN" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoEfMO" role="3cpWs9">
+            <property role="TrG5h" value="metaAdapterFactoryHelper" />
+            <node concept="3uibUv" id="6jbF0BoEfwt" role="1tU5fm">
+              <ref role="3uigEE" to="apzt:59Df55lb06j" resolve="MetaAdapterFactoryHelper" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BoEfMP" role="33vP2m">
+              <node concept="HV5vD" id="6jbF0BoEfMQ" role="2ShVmc">
+                <ref role="HV5vE" to="apzt:59Df55lb06j" resolve="MetaAdapterFactoryHelper" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6jbF0BoEizZ" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoEi$0" role="3cpWs9">
+            <property role="TrG5h" value="metaPointerConverter" />
+            <node concept="3uibUv" id="6jbF0BoEihr" role="1tU5fm">
+              <ref role="3uigEE" to="pe0e:6lVb1tfUY2A" resolve="MetaPointerConverter" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BoEi$1" role="33vP2m">
+              <node concept="1pGfFk" id="6jbF0BoEi$2" role="2ShVmc">
+                <ref role="37wK5l" to="pe0e:6lVb1tfVtvX" resolve="MetaPointerConverter" />
+                <node concept="37vLTw" id="6jbF0BoEi$3" role="37wK5m">
+                  <ref role="3cqZAo" node="12kZjFJeNv9" resolve="jsonKeyMapper" />
+                </node>
+                <node concept="37vLTw" id="6jbF0BoEi$4" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BoEfMO" resolve="metaAdapterFactoryHelper" />
+                </node>
+                <node concept="37vLTw" id="6jbF0BoEi$5" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BoE9e2" resolve="directMetaPointerPostprocessor" />
+                </node>
+                <node concept="37vLTw" id="6jbF0BoEi$6" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BoEet3" resolve="sLanguageIdExtractor" />
+                </node>
+                <node concept="37vLTw" id="6jbF0BoEi$7" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BoE4Dx" resolve="attributeFinder" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6jbF0BoEljt" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoElju" role="3cpWs9">
+            <property role="TrG5h" value="metaPointerLookup" />
+            <node concept="3uibUv" id="6jbF0BoEl0r" role="1tU5fm">
+              <ref role="3uigEE" to="pe0e:9wS6VcuOAi" resolve="MetaPointerLookup" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BoEljv" role="33vP2m">
+              <node concept="1pGfFk" id="6jbF0BoEljw" role="2ShVmc">
+                <ref role="37wK5l" to="pe0e:9wS6VcuPbR" resolve="MetaPointerLookup" />
+                <node concept="37vLTw" id="6jbF0BoEljx" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BoE4Dx" resolve="attributeFinder" />
+                </node>
+                <node concept="37vLTw" id="6jbF0BoEljy" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BoEi$0" resolve="metaPointerConverter" />
+                </node>
+                <node concept="37vLTw" id="6jbF0BoEljz" role="37wK5m">
+                  <ref role="3cqZAo" node="12kZjFJeNv9" resolve="jsonKeyMapper" />
+                </node>
+                <node concept="37vLTw" id="6jbF0BoElj$" role="37wK5m">
+                  <ref role="3cqZAo" node="12kZjFJeNv3" resolve="constants" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs6" id="12kZjFJeNve" role="3cqZAp">
           <node concept="2ShNRf" id="12kZjFJeNvf" role="3cqZAk">
             <node concept="1pGfFk" id="12kZjFJeNvg" role="2ShVmc">
               <ref role="37wK5l" to="pe0e:A9P4gGNs$J" resolve="CancellingMetaPointerLookup" />
-              <node concept="2ShNRf" id="12kZjFJeNvh" role="37wK5m">
-                <node concept="1pGfFk" id="12kZjFJeNvi" role="2ShVmc">
-                  <ref role="37wK5l" to="pe0e:9wS6VcuPbR" resolve="MetaPointerLookup" />
-                  <node concept="2ShNRf" id="12kZjFJeNvj" role="37wK5m">
-                    <node concept="1pGfFk" id="12kZjFJeNvk" role="2ShVmc">
-                      <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
-                      <node concept="37vLTw" id="12kZjFJeNvl" role="37wK5m">
-                        <ref role="3cqZAo" node="12kZjFJeNvA" resolve="repository" />
-                      </node>
-                      <node concept="37vLTw" id="12kZjFJeNvm" role="37wK5m">
-                        <ref role="3cqZAo" node="12kZjFJeNv3" resolve="constants" />
-                      </node>
-                      <node concept="2ShNRf" id="12kZjFJeNvn" role="37wK5m">
-                        <node concept="HV5vD" id="12kZjFJeNvo" role="2ShVmc">
-                          <ref role="HV5vE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2ShNRf" id="12kZjFJeNvp" role="37wK5m">
-                    <node concept="1pGfFk" id="12kZjFJeNvq" role="2ShVmc">
-                      <ref role="37wK5l" to="pe0e:6lVb1tfVtvX" resolve="MetaPointerConverter" />
-                      <node concept="37vLTw" id="12kZjFJeNvr" role="37wK5m">
-                        <ref role="3cqZAo" node="12kZjFJeNv9" resolve="jsonKeyMapper" />
-                      </node>
-                      <node concept="2ShNRf" id="12kZjFJeNvs" role="37wK5m">
-                        <node concept="HV5vD" id="12kZjFJeNvt" role="2ShVmc">
-                          <ref role="HV5vE" to="apzt:59Df55lb06j" resolve="MetaAdapterFactoryHelper" />
-                        </node>
-                      </node>
-                      <node concept="2ShNRf" id="12kZjFJeNvu" role="37wK5m">
-                        <node concept="HV5vD" id="12kZjFJeNvv" role="2ShVmc">
-                          <ref role="HV5vE" to="pe0e:6lVb1tfT0pq" resolve="DirectMetaPointerPostprocessor" />
-                        </node>
-                      </node>
-                      <node concept="2ShNRf" id="12kZjFJeNvw" role="37wK5m">
-                        <node concept="1pGfFk" id="12kZjFJeNvx" role="2ShVmc">
-                          <ref role="37wK5l" to="faaz:6VkSF6aIt83" resolve="SLanguageIdExtractor" />
-                          <node concept="2ShNRf" id="4r3Tp$q9g2z" role="37wK5m">
-                            <node concept="1pGfFk" id="4r3Tp$q9hM8" role="2ShVmc">
-                              <ref role="37wK5l" to="y7p:6VkSF6aIt83" resolve="SLanguageIdDeriver" />
-                              <node concept="37vLTw" id="4r3Tp$q9iqy" role="37wK5m">
-                                <ref role="3cqZAo" node="12kZjFJeNv3" resolve="constants" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="37vLTw" id="12kZjFJeNvz" role="37wK5m">
-                    <ref role="3cqZAo" node="12kZjFJeNv9" resolve="jsonKeyMapper" />
-                  </node>
-                  <node concept="37vLTw" id="12kZjFJeNv$" role="37wK5m">
-                    <ref role="3cqZAo" node="12kZjFJeNv3" resolve="constants" />
-                  </node>
-                </node>
+              <node concept="37vLTw" id="6jbF0BoElj_" role="37wK5m">
+                <ref role="3cqZAo" node="6jbF0BoElju" resolve="metaPointerLookup" />
               </node>
             </node>
           </node>
diff --git a/solutions/io.lionweb.mps.cmdline/models/io.lionweb.mps.cmdline.mps b/solutions/io.lionweb.mps.cmdline/models/io.lionweb.mps.cmdline.mps
index 05257d4d..a25df51d 100644
--- a/solutions/io.lionweb.mps.cmdline/models/io.lionweb.mps.cmdline.mps
+++ b/solutions/io.lionweb.mps.cmdline/models/io.lionweb.mps.cmdline.mps
@@ -5,6 +5,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="18" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
@@ -20,6 +21,8 @@
     <import index="c9jv" ref="9d6d7230-3178-4b3f-a837-7c0180c86207/java:com.google.gson.stream(io.lionweb.lionweb.java/)" />
     <import index="wy2b" ref="9d6d7230-3178-4b3f-a837-7c0180c86207/java:com.google.gson(io.lionweb.lionweb.java/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
diff --git a/solutions/io.lionweb.mps.converter.lang.runtime/models/io.lionweb.mps.converter.lang.runtime.mps b/solutions/io.lionweb.mps.converter.lang.runtime/models/io.lionweb.mps.converter.lang.runtime.mps
index 68b20480..70bc0492 100644
--- a/solutions/io.lionweb.mps.converter.lang.runtime/models/io.lionweb.mps.converter.lang.runtime.mps
+++ b/solutions/io.lionweb.mps.converter.lang.runtime/models/io.lionweb.mps.converter.lang.runtime.mps
@@ -1440,8 +1440,8 @@
                 <node concept="37vLTw" id="4R9pospSlUF" role="37wK5m">
                   <ref role="3cqZAo" node="4R9pospSlUC" resolve="languageLookup" />
                 </node>
-                <node concept="37vLTw" id="4WflrVb01fV" role="37wK5m">
-                  <ref role="3cqZAo" node="4WflrVaT4Mg" resolve="metaAdapterByDeclarationHelper" />
+                <node concept="37vLTw" id="6jbF0Bo_2Sp" role="37wK5m">
+                  <ref role="3cqZAo" node="4R9pospS5TE" resolve="attributeFinder" />
                 </node>
               </node>
             </node>
diff --git a/solutions/io.lionweb.mps.converter.test.support/models/io.lionweb.mps.converter.test.support.mps b/solutions/io.lionweb.mps.converter.test.support/models/io.lionweb.mps.converter.test.support.mps
index ea87b75f..c1dd0952 100644
--- a/solutions/io.lionweb.mps.converter.test.support/models/io.lionweb.mps.converter.test.support.mps
+++ b/solutions/io.lionweb.mps.converter.test.support/models/io.lionweb.mps.converter.test.support.mps
@@ -263,6 +263,31 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="3clFb_" id="6jbF0BogdcI" role="jymVt">
+      <property role="TrG5h" value="mapLanguageVersion" />
+      <node concept="3Tm1VV" id="6jbF0BogdcK" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0BogdcL" role="3clF45" />
+      <node concept="37vLTG" id="6jbF0BogdcM" role="3clF46">
+        <property role="TrG5h" value="language" />
+        <node concept="17QB3L" id="6jbF0BogdcQ" role="1tU5fm" />
+        <node concept="2AHcQZ" id="6jbF0BogdcO" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BogdcP" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="3clFbS" id="6jbF0BogdcR" role="3clF47">
+        <node concept="3clFbF" id="6jbF0BogeHR" role="3cqZAp">
+          <node concept="37vLTw" id="6jbF0BogeHO" role="3clFbG">
+            <ref role="3cqZAo" node="6jbF0BogdcM" resolve="language" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BogdcS" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
     <node concept="3clFb_" id="4oHUzWXSZo6" role="jymVt">
       <property role="TrG5h" value="mapClassifier" />
       <node concept="3Tm1VV" id="4oHUzWXSZo7" role="1B3o_S" />
@@ -1369,6 +1394,29 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="3clFb_" id="6jbF0BogfIo" role="jymVt">
+      <property role="TrG5h" value="mapLanguageVersion" />
+      <node concept="3Tm1VV" id="6jbF0BogfIq" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0BogfIr" role="3clF45" />
+      <node concept="37vLTG" id="6jbF0BogfIs" role="3clF46">
+        <property role="TrG5h" value="language" />
+        <node concept="17QB3L" id="6jbF0BogfIw" role="1tU5fm" />
+        <node concept="2AHcQZ" id="6jbF0BogfIu" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BogfIv" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="3clFbS" id="6jbF0BogfIx" role="3clF47">
+        <node concept="3clFbF" id="6jbF0Boghcv" role="3cqZAp">
+          <node concept="10Nm6u" id="6jbF0Boghcs" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BogfIy" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
     <node concept="3clFb_" id="4oHUzWXSlT0" role="jymVt">
       <property role="TrG5h" value="mapClassifier" />
       <node concept="3Tm1VV" id="4oHUzWXSlT2" role="1B3o_S" />
diff --git a/solutions/io.lionweb.mps.converter.test/models/io.lionweb.mps.converter.test.attributefinder@tests.mps b/solutions/io.lionweb.mps.converter.test/models/io.lionweb.mps.converter.test.attributefinder@tests.mps
index 142afbf5..c93feb44 100644
--- a/solutions/io.lionweb.mps.converter.test/models/io.lionweb.mps.converter.test.attributefinder@tests.mps
+++ b/solutions/io.lionweb.mps.converter.test/models/io.lionweb.mps.converter.test.attributefinder@tests.mps
@@ -5089,5 +5089,519 @@
       </node>
     </node>
   </node>
+  <node concept="1lH9Xt" id="6jbF0BnZ5ws">
+    <property role="TrG5h" value="findVersionFromLanguage_model" />
+    <node concept="2XrIbr" id="6jbF0BnZ5wt" role="1qtyYc">
+      <property role="TrG5h" value="create" />
+      <node concept="3uibUv" id="6jbF0BnZ5wu" role="3clF45">
+        <ref role="3uigEE" to="y7p:pPZz6cPvUw" resolve="LionWebAttributeFinder" />
+      </node>
+      <node concept="3clFbS" id="6jbF0BnZ5wv" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BnZ5ww" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BnZ5wx" role="3cpWs9">
+            <property role="TrG5h" value="repository" />
+            <node concept="3uibUv" id="6jbF0BnZ5wy" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="2OqwBi" id="6jbF0BnZ5wz" role="33vP2m">
+              <node concept="1jGwE1" id="6jbF0BnZ5w$" role="2Oq$k0" />
+              <node concept="liA8E" id="6jbF0BnZ5w_" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6jbF0BnZ5wA" role="3cqZAp">
+          <node concept="2ShNRf" id="6jbF0BnZ5wB" role="3clFbG">
+            <node concept="1pGfFk" id="6jbF0BnZ5wC" role="2ShVmc">
+              <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
+              <node concept="37vLTw" id="6jbF0BnZ5wD" role="37wK5m">
+                <ref role="3cqZAo" node="6jbF0BnZ5wx" resolve="repository" />
+              </node>
+              <node concept="2ShNRf" id="6jbF0BnZ5wE" role="37wK5m">
+                <node concept="1pGfFk" id="6jbF0BnZ5wF" role="2ShVmc">
+                  <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
+                  <node concept="37vLTw" id="6jbF0BnZ5wG" role="37wK5m">
+                    <ref role="3cqZAo" node="6jbF0BnZ5wx" resolve="repository" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2ShNRf" id="6jbF0BnZ5wH" role="37wK5m">
+                <node concept="HV5vD" id="6jbF0BnZ5wI" role="2ShVmc">
+                  <ref role="HV5vE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="6jbF0BnZ5wJ" role="1B3o_S" />
+    </node>
+    <node concept="1LZb2c" id="6jbF0BnZ5wK" role="1SL9yI">
+      <property role="TrG5h" value="existing" />
+      <node concept="3cqZAl" id="6jbF0BnZ5wL" role="3clF45" />
+      <node concept="3clFbS" id="6jbF0BnZ5wM" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BnZ5wN" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BnZ5wO" role="3cpWs9">
+            <property role="TrG5h" value="version" />
+            <node concept="17QB3L" id="6jbF0BnZ5wP" role="1tU5fm" />
+            <node concept="2OqwBi" id="6jbF0BnZ5wQ" role="33vP2m">
+              <node concept="2OqwBi" id="6jbF0BnZ5wR" role="2Oq$k0">
+                <node concept="2WthIp" id="6jbF0BnZ5wS" role="2Oq$k0" />
+                <node concept="2XshWL" id="6jbF0BnZ5wT" role="2OqNvi">
+                  <ref role="2WH_rO" node="6jbF0BnZ5wt" resolve="create" />
+                </node>
+              </node>
+              <node concept="liA8E" id="6jbF0BnZ5wU" role="2OqNvi">
+                <ref role="37wK5l" to="y7p:6jbF0BnTYkP" resolve="findVersionFromLanguage" />
+                <node concept="2OqwBi" id="6jbF0BnZ5wV" role="37wK5m">
+                  <node concept="1Xw6AR" id="6jbF0BnZ5wW" role="2Oq$k0">
+                    <node concept="1dCxOl" id="6jbF0BnZc0F" role="1XwpL7">
+                      <property role="1XweGQ" value="r:2e1d95ed-4ed0-4ecd-bc84-f6c7c405fa7f" />
+                      <node concept="1j_P7g" id="6jbF0BnZc0G" role="1j$8Uc">
+                        <property role="1j_P7h" value="io.lionweb.mps.converter.TestLang3.structure" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2yCiCJ" id="6jbF0BnZ5wZ" role="2OqNvi">
+                    <node concept="2OqwBi" id="6jbF0BnZ5x0" role="Vysub">
+                      <node concept="1jGwE1" id="6jbF0BnZ5x1" role="2Oq$k0" />
+                      <node concept="liA8E" id="6jbF0BnZ5x2" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3vlDli" id="6jbF0BnZ5x3" role="3cqZAp">
+          <node concept="37vLTw" id="6jbF0BnZ5x4" role="3tpDZA">
+            <ref role="3cqZAo" node="6jbF0BnZ5wO" resolve="version" />
+          </node>
+          <node concept="Xl_RD" id="6jbF0BnZ5x5" role="3tpDZB">
+            <property role="Xl_RC" value="00 my! VERSION 😀" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="6jbF0BnZ5x6" role="1SL9yI">
+      <property role="TrG5h" value="M3" />
+      <node concept="3cqZAl" id="6jbF0BnZ5x7" role="3clF45" />
+      <node concept="3clFbS" id="6jbF0BnZ5x8" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BnZ5x9" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BnZ5xa" role="3cpWs9">
+            <property role="TrG5h" value="version" />
+            <node concept="17QB3L" id="6jbF0BnZ5xb" role="1tU5fm" />
+            <node concept="2OqwBi" id="6jbF0BnZ5xc" role="33vP2m">
+              <node concept="2OqwBi" id="6jbF0BnZ5xd" role="2Oq$k0">
+                <node concept="2WthIp" id="6jbF0BnZ5xe" role="2Oq$k0" />
+                <node concept="2XshWL" id="6jbF0BnZ5xf" role="2OqNvi">
+                  <ref role="2WH_rO" node="6jbF0BnZ5wt" resolve="create" />
+                </node>
+              </node>
+              <node concept="liA8E" id="6jbF0BnZ5xg" role="2OqNvi">
+                <ref role="37wK5l" to="y7p:6jbF0BnTYkP" resolve="findVersionFromLanguage" />
+                <node concept="2OqwBi" id="6jbF0BnZ5xh" role="37wK5m">
+                  <node concept="1Xw6AR" id="6jbF0BnZ5xi" role="2Oq$k0">
+                    <node concept="1dCxOl" id="6jbF0BnZ5xj" role="1XwpL7">
+                      <property role="1XweGQ" value="r:11596e6a-4231-47c9-b3df-0dcce1111a54" />
+                      <node concept="1j_P7g" id="6jbF0BnZ5xk" role="1j$8Uc">
+                        <property role="1j_P7h" value="io.lionweb.mps.m3.structure" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2yCiCJ" id="6jbF0BnZ5xl" role="2OqNvi">
+                    <node concept="2OqwBi" id="6jbF0BnZ5xm" role="Vysub">
+                      <node concept="1jGwE1" id="6jbF0BnZ5xn" role="2Oq$k0" />
+                      <node concept="liA8E" id="6jbF0BnZ5xo" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3vlDli" id="6jbF0BnZ5xp" role="3cqZAp">
+          <node concept="37vLTw" id="6jbF0BnZ5xq" role="3tpDZA">
+            <ref role="3cqZAo" node="6jbF0BnZ5xa" resolve="version" />
+          </node>
+          <node concept="Xl_RD" id="6jbF0BnZ5xr" role="3tpDZB">
+            <property role="Xl_RC" value="2023.1" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="6jbF0BnZ5xs" role="1SL9yI">
+      <property role="TrG5h" value="builtins" />
+      <node concept="3cqZAl" id="6jbF0BnZ5xt" role="3clF45" />
+      <node concept="3clFbS" id="6jbF0BnZ5xu" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BnZ5xv" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BnZ5xw" role="3cpWs9">
+            <property role="TrG5h" value="version" />
+            <node concept="17QB3L" id="6jbF0BnZ5xx" role="1tU5fm" />
+            <node concept="2OqwBi" id="6jbF0BnZ5xy" role="33vP2m">
+              <node concept="2OqwBi" id="6jbF0BnZ5xz" role="2Oq$k0">
+                <node concept="2WthIp" id="6jbF0BnZ5x$" role="2Oq$k0" />
+                <node concept="2XshWL" id="6jbF0BnZ5x_" role="2OqNvi">
+                  <ref role="2WH_rO" node="6jbF0BnZ5wt" resolve="create" />
+                </node>
+              </node>
+              <node concept="liA8E" id="6jbF0BnZ5xA" role="2OqNvi">
+                <ref role="37wK5l" to="y7p:6jbF0BnTYkP" resolve="findVersionFromLanguage" />
+                <node concept="2OqwBi" id="6jbF0BnZ5xB" role="37wK5m">
+                  <node concept="1Xw6AR" id="6jbF0BnZ5xC" role="2Oq$k0">
+                    <node concept="1dCxOl" id="6jbF0BnZ5xD" role="1XwpL7">
+                      <property role="1XweGQ" value="r:00000000-0000-4000-0000-011c89590288" />
+                      <node concept="1j_P7g" id="6jbF0BnZ5xE" role="1j$8Uc">
+                        <property role="1j_P7h" value="jetbrains.mps.lang.core.structure" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2yCiCJ" id="6jbF0BnZ5xF" role="2OqNvi">
+                    <node concept="2OqwBi" id="6jbF0BnZ5xG" role="Vysub">
+                      <node concept="1jGwE1" id="6jbF0BnZ5xH" role="2Oq$k0" />
+                      <node concept="liA8E" id="6jbF0BnZ5xI" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="6jbF0BnZ5xJ" role="3cqZAp">
+          <node concept="1PaTwC" id="6jbF0BnZ5xK" role="1aUNEU">
+            <node concept="3oM_SD" id="6jbF0BnZ5xL" role="1PaTwD">
+              <property role="3oM_SC" value="AttributeFinder" />
+            </node>
+            <node concept="3oM_SD" id="6jbF0BnZ5xM" role="1PaTwD">
+              <property role="3oM_SC" value="should" />
+            </node>
+            <node concept="3oM_SD" id="6jbF0BnZ5xN" role="1PaTwD">
+              <property role="3oM_SC" value="not" />
+            </node>
+            <node concept="3oM_SD" id="6jbF0BnZ5xO" role="1PaTwD">
+              <property role="3oM_SC" value="translate" />
+            </node>
+            <node concept="3oM_SD" id="6jbF0BnZ5xP" role="1PaTwD">
+              <property role="3oM_SC" value="versions" />
+            </node>
+          </node>
+        </node>
+        <node concept="3ykFI1" id="6jbF0BnZ5xQ" role="3cqZAp">
+          <node concept="37vLTw" id="6jbF0BnZ5xR" role="3ykU8v">
+            <ref role="3cqZAo" node="6jbF0BnZ5xw" resolve="version" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="6jbF0BnZ5xS" role="1SL9yI">
+      <property role="TrG5h" value="unknown" />
+      <node concept="3cqZAl" id="6jbF0BnZ5xT" role="3clF45" />
+      <node concept="3clFbS" id="6jbF0BnZ5xU" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BnZ5xV" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BnZ5xW" role="3cpWs9">
+            <property role="TrG5h" value="version" />
+            <node concept="17QB3L" id="6jbF0BnZ5xX" role="1tU5fm" />
+            <node concept="2OqwBi" id="6jbF0BnZ5xY" role="33vP2m">
+              <node concept="2OqwBi" id="6jbF0BnZ5xZ" role="2Oq$k0">
+                <node concept="2WthIp" id="6jbF0BnZ5y0" role="2Oq$k0" />
+                <node concept="2XshWL" id="6jbF0BnZ5y1" role="2OqNvi">
+                  <ref role="2WH_rO" node="6jbF0BnZ5wt" resolve="create" />
+                </node>
+              </node>
+              <node concept="liA8E" id="6jbF0BnZ5y2" role="2OqNvi">
+                <ref role="37wK5l" to="y7p:6jbF0BnTYkP" resolve="findVersionFromLanguage" />
+                <node concept="2OqwBi" id="6jbF0BnZ5y3" role="37wK5m">
+                  <node concept="1Xw6AR" id="6jbF0BnZ5y4" role="2Oq$k0">
+                    <node concept="1dCxOl" id="6jbF0BnZ5y5" role="1XwpL7">
+                      <property role="1XweGQ" value="r:c9b5090c-7263-4642-b8f4-1265e3a15687" />
+                      <node concept="1j_P7g" id="6jbF0BnZ5y6" role="1j$8Uc">
+                        <property role="1j_P7h" value="library.structure" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2yCiCJ" id="6jbF0BnZ5y7" role="2OqNvi">
+                    <node concept="2OqwBi" id="6jbF0BnZ5y8" role="Vysub">
+                      <node concept="1jGwE1" id="6jbF0BnZ5y9" role="2Oq$k0" />
+                      <node concept="liA8E" id="6jbF0BnZ5ya" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3ykFI1" id="6jbF0BnZ5yb" role="3cqZAp">
+          <node concept="37vLTw" id="6jbF0BnZ5yc" role="3ykU8v">
+            <ref role="3cqZAo" node="6jbF0BnZ5xW" resolve="version" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="6jbF0BnZ5yd" role="1SL9yI">
+      <property role="TrG5h" value="noStructure" />
+      <node concept="3cqZAl" id="6jbF0BnZ5ye" role="3clF45" />
+      <node concept="3clFbS" id="6jbF0BnZ5yf" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BnZ5yg" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BnZ5yh" role="3cpWs9">
+            <property role="TrG5h" value="version" />
+            <node concept="17QB3L" id="6jbF0BnZ5yi" role="1tU5fm" />
+            <node concept="2OqwBi" id="6jbF0BnZ5yj" role="33vP2m">
+              <node concept="2OqwBi" id="6jbF0BnZ5yk" role="2Oq$k0">
+                <node concept="2WthIp" id="6jbF0BnZ5yl" role="2Oq$k0" />
+                <node concept="2XshWL" id="6jbF0BnZ5ym" role="2OqNvi">
+                  <ref role="2WH_rO" node="6jbF0BnZ5wt" resolve="create" />
+                </node>
+              </node>
+              <node concept="liA8E" id="6jbF0BnZ5yn" role="2OqNvi">
+                <ref role="37wK5l" to="y7p:6jbF0BnTYkP" resolve="findVersionFromLanguage" />
+                <node concept="2OqwBi" id="6jbF0BnZ5yo" role="37wK5m">
+                  <node concept="1Xw6AR" id="6jbF0BnZ5yp" role="2Oq$k0">
+                    <node concept="1dCxOl" id="6jbF0BnZ5yq" role="1XwpL7">
+                      <property role="1XweGQ" value="r:ca50f3ca-935e-45db-989c-015c3471057b" />
+                      <node concept="1j_P7g" id="6jbF0BnZ5yr" role="1j$8Uc">
+                        <property role="1j_P7h" value="MultiRefLang.behavior" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2yCiCJ" id="6jbF0BnZ5ys" role="2OqNvi">
+                    <node concept="2OqwBi" id="6jbF0BnZ5yt" role="Vysub">
+                      <node concept="1jGwE1" id="6jbF0BnZ5yu" role="2Oq$k0" />
+                      <node concept="liA8E" id="6jbF0BnZ5yv" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3ykFI1" id="6jbF0BnZ5yw" role="3cqZAp">
+          <node concept="37vLTw" id="6jbF0BnZ5yx" role="3ykU8v">
+            <ref role="3cqZAo" node="6jbF0BnZ5yh" resolve="version" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="1lH9Xt" id="6jbF0BnZ5yy">
+    <property role="TrG5h" value="findVersionFromLanguage_mps" />
+    <node concept="2XrIbr" id="6jbF0BnZ5yz" role="1qtyYc">
+      <property role="TrG5h" value="create" />
+      <node concept="3uibUv" id="6jbF0BnZ5y$" role="3clF45">
+        <ref role="3uigEE" to="y7p:pPZz6cPvUw" resolve="LionWebAttributeFinder" />
+      </node>
+      <node concept="3clFbS" id="6jbF0BnZ5y_" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BnZ5yA" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BnZ5yB" role="3cpWs9">
+            <property role="TrG5h" value="repository" />
+            <node concept="3uibUv" id="6jbF0BnZ5yC" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="2OqwBi" id="6jbF0BnZ5yD" role="33vP2m">
+              <node concept="1jGwE1" id="6jbF0BnZ5yE" role="2Oq$k0" />
+              <node concept="liA8E" id="6jbF0BnZ5yF" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6jbF0BnZ5yG" role="3cqZAp">
+          <node concept="2ShNRf" id="6jbF0BnZ5yH" role="3clFbG">
+            <node concept="1pGfFk" id="6jbF0BnZ5yI" role="2ShVmc">
+              <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
+              <node concept="37vLTw" id="6jbF0BnZ5yJ" role="37wK5m">
+                <ref role="3cqZAo" node="6jbF0BnZ5yB" resolve="repository" />
+              </node>
+              <node concept="2ShNRf" id="6jbF0BnZ5yK" role="37wK5m">
+                <node concept="1pGfFk" id="6jbF0BnZ5yL" role="2ShVmc">
+                  <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
+                  <node concept="37vLTw" id="6jbF0BnZ5yM" role="37wK5m">
+                    <ref role="3cqZAo" node="6jbF0BnZ5yB" resolve="repository" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2ShNRf" id="6jbF0BnZ5yN" role="37wK5m">
+                <node concept="HV5vD" id="6jbF0BnZ5yO" role="2ShVmc">
+                  <ref role="HV5vE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="6jbF0BnZ5yP" role="1B3o_S" />
+    </node>
+    <node concept="1LZb2c" id="6jbF0BnZ5yQ" role="1SL9yI">
+      <property role="TrG5h" value="existing" />
+      <node concept="3cqZAl" id="6jbF0BnZ5yR" role="3clF45" />
+      <node concept="3clFbS" id="6jbF0BnZ5yS" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BnZ5yT" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BnZ5yU" role="3cpWs9">
+            <property role="TrG5h" value="version" />
+            <node concept="17QB3L" id="6jbF0BnZ5yV" role="1tU5fm" />
+            <node concept="2OqwBi" id="6jbF0BnZ5yW" role="33vP2m">
+              <node concept="2OqwBi" id="6jbF0BnZ5yX" role="2Oq$k0">
+                <node concept="2WthIp" id="6jbF0BnZ5yY" role="2Oq$k0" />
+                <node concept="2XshWL" id="6jbF0BnZ5yZ" role="2OqNvi">
+                  <ref role="2WH_rO" node="6jbF0BnZ5yz" resolve="create" />
+                </node>
+              </node>
+              <node concept="liA8E" id="6jbF0BnZ5z0" role="2OqNvi">
+                <ref role="37wK5l" to="y7p:6jbF0BnTYl$" resolve="findVersionFromLanguage" />
+                <node concept="pHN19" id="6jbF0BnZ5z1" role="37wK5m">
+                  <node concept="2V$Bhx" id="6jbF0BnZ6PB" role="2V$M_3">
+                    <property role="2V$B1T" value="099490a3-1e39-4ed1-bebc-8027665cecf9" />
+                    <property role="2V$B1Q" value="io.lionweb.mps.converter.TestLang3" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3vlDli" id="6jbF0BnZ5z3" role="3cqZAp">
+          <node concept="37vLTw" id="6jbF0BnZ5z4" role="3tpDZA">
+            <ref role="3cqZAo" node="6jbF0BnZ5yU" resolve="version" />
+          </node>
+          <node concept="Xl_RD" id="6jbF0BnZ5z5" role="3tpDZB">
+            <property role="Xl_RC" value="00 my! VERSION 😀" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="6jbF0BnZ5z6" role="1SL9yI">
+      <property role="TrG5h" value="M3" />
+      <node concept="3cqZAl" id="6jbF0BnZ5z7" role="3clF45" />
+      <node concept="3clFbS" id="6jbF0BnZ5z8" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BnZ5z9" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BnZ5za" role="3cpWs9">
+            <property role="TrG5h" value="version" />
+            <node concept="17QB3L" id="6jbF0BnZ5zb" role="1tU5fm" />
+            <node concept="2OqwBi" id="6jbF0BnZ5zc" role="33vP2m">
+              <node concept="2OqwBi" id="6jbF0BnZ5zd" role="2Oq$k0">
+                <node concept="2WthIp" id="6jbF0BnZ5ze" role="2Oq$k0" />
+                <node concept="2XshWL" id="6jbF0BnZ5zf" role="2OqNvi">
+                  <ref role="2WH_rO" node="6jbF0BnZ5yz" resolve="create" />
+                </node>
+              </node>
+              <node concept="liA8E" id="6jbF0BnZ5zg" role="2OqNvi">
+                <ref role="37wK5l" to="y7p:6jbF0BnTYl$" resolve="findVersionFromLanguage" />
+                <node concept="pHN19" id="6jbF0BnZ5zh" role="37wK5m">
+                  <node concept="2V$Bhx" id="6jbF0BnZ5zi" role="2V$M_3">
+                    <property role="2V$B1T" value="01cf0d82-8d29-4fc4-be96-28abaf4ad33d" />
+                    <property role="2V$B1Q" value="io.lionweb.mps.m3" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3vlDli" id="6jbF0BnZ5zj" role="3cqZAp">
+          <node concept="37vLTw" id="6jbF0BnZ5zk" role="3tpDZA">
+            <ref role="3cqZAo" node="6jbF0BnZ5za" resolve="version" />
+          </node>
+          <node concept="Xl_RD" id="6jbF0BnZ5zl" role="3tpDZB">
+            <property role="Xl_RC" value="2023.1" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="6jbF0BnZ5zm" role="1SL9yI">
+      <property role="TrG5h" value="builtins" />
+      <node concept="3cqZAl" id="6jbF0BnZ5zn" role="3clF45" />
+      <node concept="3clFbS" id="6jbF0BnZ5zo" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BnZ5zp" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BnZ5zq" role="3cpWs9">
+            <property role="TrG5h" value="version" />
+            <node concept="17QB3L" id="6jbF0BnZ5zr" role="1tU5fm" />
+            <node concept="2OqwBi" id="6jbF0BnZ5zs" role="33vP2m">
+              <node concept="2OqwBi" id="6jbF0BnZ5zt" role="2Oq$k0">
+                <node concept="2WthIp" id="6jbF0BnZ5zu" role="2Oq$k0" />
+                <node concept="2XshWL" id="6jbF0BnZ5zv" role="2OqNvi">
+                  <ref role="2WH_rO" node="6jbF0BnZ5yz" resolve="create" />
+                </node>
+              </node>
+              <node concept="liA8E" id="6jbF0BnZ5zw" role="2OqNvi">
+                <ref role="37wK5l" to="y7p:6jbF0BnTYl$" resolve="findVersionFromLanguage" />
+                <node concept="pHN19" id="6jbF0BnZ5zx" role="37wK5m">
+                  <node concept="2V$Bhx" id="6jbF0BnZ5zy" role="2V$M_3">
+                    <property role="2V$B1T" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c" />
+                    <property role="2V$B1Q" value="jetbrains.mps.lang.core" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="6jbF0BnZ5zz" role="3cqZAp">
+          <node concept="1PaTwC" id="6jbF0BnZ5z$" role="1aUNEU">
+            <node concept="3oM_SD" id="6jbF0BnZ5z_" role="1PaTwD">
+              <property role="3oM_SC" value="AttributeFinder" />
+            </node>
+            <node concept="3oM_SD" id="6jbF0BnZ5zA" role="1PaTwD">
+              <property role="3oM_SC" value="should" />
+            </node>
+            <node concept="3oM_SD" id="6jbF0BnZ5zB" role="1PaTwD">
+              <property role="3oM_SC" value="not" />
+            </node>
+            <node concept="3oM_SD" id="6jbF0BnZ5zC" role="1PaTwD">
+              <property role="3oM_SC" value="translate" />
+            </node>
+            <node concept="3oM_SD" id="6jbF0BnZ5zD" role="1PaTwD">
+              <property role="3oM_SC" value="versions" />
+            </node>
+          </node>
+        </node>
+        <node concept="3ykFI1" id="6jbF0BnZ5zE" role="3cqZAp">
+          <node concept="37vLTw" id="6jbF0BnZ5zF" role="3ykU8v">
+            <ref role="3cqZAo" node="6jbF0BnZ5zq" resolve="version" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="6jbF0BnZ5zG" role="1SL9yI">
+      <property role="TrG5h" value="unknown" />
+      <node concept="3cqZAl" id="6jbF0BnZ5zH" role="3clF45" />
+      <node concept="3clFbS" id="6jbF0BnZ5zI" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BnZ5zJ" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BnZ5zK" role="3cpWs9">
+            <property role="TrG5h" value="version" />
+            <node concept="17QB3L" id="6jbF0BnZ5zL" role="1tU5fm" />
+            <node concept="2OqwBi" id="6jbF0BnZ5zM" role="33vP2m">
+              <node concept="2OqwBi" id="6jbF0BnZ5zN" role="2Oq$k0">
+                <node concept="2WthIp" id="6jbF0BnZ5zO" role="2Oq$k0" />
+                <node concept="2XshWL" id="6jbF0BnZ5zP" role="2OqNvi">
+                  <ref role="2WH_rO" node="6jbF0BnZ5yz" resolve="create" />
+                </node>
+              </node>
+              <node concept="liA8E" id="6jbF0BnZ5zQ" role="2OqNvi">
+                <ref role="37wK5l" to="y7p:6jbF0BnTYl$" resolve="findVersionFromLanguage" />
+                <node concept="pHN19" id="6jbF0BnZ5zR" role="37wK5m">
+                  <node concept="2V$Bhx" id="6jbF0BnZ5zS" role="2V$M_3">
+                    <property role="2V$B1T" value="537f9cb0-0f25-3c76-8b86-308f45010100" />
+                    <property role="2V$B1Q" value="library" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3ykFI1" id="6jbF0BnZ5zT" role="3cqZAp">
+          <node concept="37vLTw" id="6jbF0BnZ5zU" role="3ykU8v">
+            <ref role="3cqZAo" node="6jbF0BnZ5zK" resolve="version" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/solutions/io.lionweb.mps.converter.test/models/io.lionweb.mps.converter.test.converter@tests.mps b/solutions/io.lionweb.mps.converter.test/models/io.lionweb.mps.converter.test.converter@tests.mps
index ec435521..4c7148f1 100644
--- a/solutions/io.lionweb.mps.converter.test/models/io.lionweb.mps.converter.test.converter@tests.mps
+++ b/solutions/io.lionweb.mps.converter.test/models/io.lionweb.mps.converter.test.converter@tests.mps
@@ -344,7 +344,7 @@
     <node concept="1qefOq" id="48csSBOZRSQ" role="1SKRRt">
       <node concept="2RzRRF" id="2fx6VTTnYmk" role="1qenE9">
         <property role="TrG5h" value="io.lionweb.mps.m3" />
-        <property role="3HH78N" value="0" />
+        <property role="3HH78N" value="2023.1" />
         <property role="2RzON1" value="LionCore-M3" />
         <node concept="2RzPaY" id="7Cdxs9DYA_l" role="2RzR6B">
           <property role="2RzON1" value="IKeyed" />
diff --git a/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.idmapper.declarationnode.mps b/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.idmapper.declarationnode.mps
index 5acd97ac..fd75aff6 100644
--- a/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.idmapper.declarationnode.mps
+++ b/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.idmapper.declarationnode.mps
@@ -13,6 +13,7 @@
     <import index="e8bb" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.adapter.ids(MPS.Core/)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="y7p" ref="r:3303ef0b-a58e-4f50-b3cb-bd3d7aaf3653(io.lionweb.mps.m3.runtime)" />
+    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -376,6 +377,40 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5M3rB6_USHF" role="jymVt" />
+    <node concept="3clFb_" id="6jbF0Bofg62" role="jymVt">
+      <property role="TrG5h" value="mapLanguageVersion" />
+      <node concept="3Tm1VV" id="6jbF0Bofg64" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0Bofg65" role="3clF45" />
+      <node concept="37vLTG" id="6jbF0Bofg66" role="3clF46">
+        <property role="TrG5h" value="language" />
+        <node concept="H_c77" id="6jbF0Bofg6o" role="1tU5fm" />
+        <node concept="2AHcQZ" id="6jbF0Bofg68" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0Bofg69" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="3clFbS" id="6jbF0Bofg6p" role="3clF47">
+        <node concept="3clFbF" id="6jbF0BofiDu" role="3cqZAp">
+          <node concept="2OqwBi" id="6jbF0BofiDv" role="3clFbG">
+            <node concept="37vLTw" id="6jbF0BofiDw" role="2Oq$k0">
+              <ref role="3cqZAo" node="5M3rB6_ViGX" resolve="attributeFinder" />
+            </node>
+            <node concept="liA8E" id="6jbF0BofiDx" role="2OqNvi">
+              <ref role="37wK5l" to="y7p:6jbF0BnTYkP" resolve="findVersionFromLanguage" />
+              <node concept="37vLTw" id="6jbF0BofiDy" role="37wK5m">
+                <ref role="3cqZAo" node="6jbF0Bofg66" resolve="language" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0Bofg6q" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6jbF0BofjBw" role="jymVt" />
     <node concept="3clFb_" id="5M3rB6_USHG" role="jymVt">
       <property role="TrG5h" value="mapClassifier" />
       <node concept="3Tm1VV" id="5M3rB6_USHH" role="1B3o_S" />
@@ -883,6 +918,56 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="6jbF0BofCAd" role="jymVt" />
+    <node concept="3clFb_" id="6jbF0BofAAC" role="jymVt">
+      <property role="TrG5h" value="mapLanguageVersion" />
+      <node concept="3Tm1VV" id="6jbF0BofAAE" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0BofAAF" role="3clF45" />
+      <node concept="37vLTG" id="6jbF0BofAAG" role="3clF46">
+        <property role="TrG5h" value="language" />
+        <node concept="H_c77" id="6jbF0BofAAY" role="1tU5fm" />
+        <node concept="2AHcQZ" id="6jbF0BofAAI" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BofAAJ" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="3clFbS" id="6jbF0BofAAZ" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BofEq5" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BofEq6" role="3cpWs9">
+            <property role="TrG5h" value="slang" />
+            <node concept="3uibUv" id="6jbF0BofEq7" role="1tU5fm">
+              <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
+            </node>
+            <node concept="2OqwBi" id="6jbF0BofEq8" role="33vP2m">
+              <node concept="2YIFZM" id="6jbF0BofEq9" role="2Oq$k0">
+                <ref role="37wK5l" to="y7p:39$JcGGnzni" resolve="getInstance" />
+                <ref role="1Pybhc" to="y7p:39$JcGGnjRO" resolve="MpsLanguageConverter" />
+              </node>
+              <node concept="liA8E" id="6jbF0BofEqa" role="2OqNvi">
+                <ref role="37wK5l" to="y7p:39$JcGGnAUM" resolve="toSLanguage" />
+                <node concept="37vLTw" id="6jbF0BofEqb" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BofAAG" resolve="language" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6jbF0BofEqc" role="3cqZAp">
+          <node concept="2YIFZM" id="6jbF0BofEqd" role="3clFbG">
+            <ref role="37wK5l" to="y7p:34Q84zMXVAC" resolve="getLanguageVersionString" />
+            <ref role="1Pybhc" to="y7p:6jTTMHD72IS" resolve="MpsLanguageUtil" />
+            <node concept="37vLTw" id="6jbF0BofEqe" role="37wK5m">
+              <ref role="3cqZAo" node="6jbF0BofEq6" resolve="slang" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BofAB0" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="5M3rB6AkE4g" role="jymVt" />
     <node concept="3clFb_" id="5M3rB6AkE4h" role="jymVt">
       <property role="TrG5h" value="mapClassifier" />
@@ -1351,6 +1436,56 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5M3rB6AmV$y" role="jymVt" />
+    <node concept="3clFb_" id="6jbF0BofoWt" role="jymVt">
+      <property role="TrG5h" value="mapLanguageVersion" />
+      <node concept="3Tm1VV" id="6jbF0BofoWv" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0BofoWw" role="3clF45" />
+      <node concept="37vLTG" id="6jbF0BofoWx" role="3clF46">
+        <property role="TrG5h" value="language" />
+        <node concept="H_c77" id="6jbF0BofoWN" role="1tU5fm" />
+        <node concept="2AHcQZ" id="6jbF0BofoWz" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BofoW$" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="3clFbS" id="6jbF0BofoWO" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0Boft96" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0Boft97" role="3cpWs9">
+            <property role="TrG5h" value="slang" />
+            <node concept="3uibUv" id="6jbF0Bofsps" role="1tU5fm">
+              <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
+            </node>
+            <node concept="2OqwBi" id="6jbF0Boft98" role="33vP2m">
+              <node concept="2YIFZM" id="6jbF0Boft99" role="2Oq$k0">
+                <ref role="37wK5l" to="y7p:39$JcGGnzni" resolve="getInstance" />
+                <ref role="1Pybhc" to="y7p:39$JcGGnjRO" resolve="MpsLanguageConverter" />
+              </node>
+              <node concept="liA8E" id="6jbF0Boft9a" role="2OqNvi">
+                <ref role="37wK5l" to="y7p:39$JcGGnAUM" resolve="toSLanguage" />
+                <node concept="37vLTw" id="6jbF0Boft9b" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BofoWx" resolve="language" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6jbF0Bofx$K" role="3cqZAp">
+          <node concept="2YIFZM" id="6jbF0BofypF" role="3clFbG">
+            <ref role="37wK5l" to="y7p:34Q84zMXVAC" resolve="getLanguageVersionString" />
+            <ref role="1Pybhc" to="y7p:6jTTMHD72IS" resolve="MpsLanguageUtil" />
+            <node concept="37vLTw" id="6jbF0Bofzw8" role="37wK5m">
+              <ref role="3cqZAo" node="6jbF0Boft97" resolve="slang" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BofoWP" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6jbF0Bof$pf" role="jymVt" />
     <node concept="3clFb_" id="5M3rB6AmV$z" role="jymVt">
       <property role="TrG5h" value="mapClassifier" />
       <node concept="3Tm1VV" id="5M3rB6AmV$$" role="1B3o_S" />
diff --git a/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.idmapper.lioncore.mps b/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.idmapper.lioncore.mps
index e62ec4eb..a15462c1 100644
--- a/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.idmapper.lioncore.mps
+++ b/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.idmapper.lioncore.mps
@@ -262,6 +262,39 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5M3rB6A0R$j" role="jymVt" />
+    <node concept="3clFb_" id="6jbF0Bof7MC" role="jymVt">
+      <property role="TrG5h" value="mapLanguageVersion" />
+      <node concept="3Tm1VV" id="6jbF0Bof7ME" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0Bof7MF" role="3clF45" />
+      <node concept="37vLTG" id="6jbF0Bof7MG" role="3clF46">
+        <property role="TrG5h" value="language" />
+        <node concept="3Tqbb2" id="6jbF0Bof7MY" role="1tU5fm">
+          <ref role="ehGHo" to="h3y3:2ju2syjkngz" resolve="Language" />
+        </node>
+        <node concept="2AHcQZ" id="6jbF0Bof7MI" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0Bof7MJ" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="3clFbS" id="6jbF0Bof7MZ" role="3clF47">
+        <node concept="3clFbF" id="6jbF0Bof9QC" role="3cqZAp">
+          <node concept="2OqwBi" id="6jbF0BofaHH" role="3clFbG">
+            <node concept="37vLTw" id="6jbF0Bof9Q_" role="2Oq$k0">
+              <ref role="3cqZAo" node="6jbF0Bof7MG" resolve="language" />
+            </node>
+            <node concept="3TrcHB" id="6jbF0Bofb$K" role="2OqNvi">
+              <ref role="3TsBF5" to="h3y3:2chztJeDvZC" resolve="version" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0Bof7N0" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6jbF0BofchW" role="jymVt" />
     <node concept="3clFb_" id="5M3rB6A0R$k" role="jymVt">
       <property role="TrG5h" value="mapClassifier" />
       <node concept="3Tm1VV" id="5M3rB6A0R$l" role="1B3o_S" />
diff --git a/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.idmapper.mps b/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.idmapper.mps
index 5913ec12..d641de27 100644
--- a/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.idmapper.mps
+++ b/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.idmapper.mps
@@ -250,6 +250,24 @@
         <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
       </node>
     </node>
+    <node concept="3clFb_" id="6jbF0BodlwV" role="jymVt">
+      <property role="TrG5h" value="mapLanguageVersion" />
+      <node concept="3clFbS" id="6jbF0BodlwW" role="3clF47" />
+      <node concept="3Tm1VV" id="6jbF0BodlwX" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0BodlwY" role="3clF45" />
+      <node concept="37vLTG" id="6jbF0BodlwZ" role="3clF46">
+        <property role="TrG5h" value="language" />
+        <node concept="16syzq" id="6jbF0Bodlx0" role="1tU5fm">
+          <ref role="16sUi3" node="6VkSF6aHjJY" resolve="LANGUAGE" />
+        </node>
+        <node concept="2AHcQZ" id="6jbF0Bodlx1" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0Bodlx2" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+    </node>
     <node concept="3clFb_" id="6VkSF6aR3TD" role="jymVt">
       <property role="TrG5h" value="mapClassifier" />
       <node concept="3clFbS" id="6VkSF6aR3TG" role="3clF47" />
@@ -799,6 +817,115 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5M3rB6A9PBD" role="jymVt" />
+    <node concept="3clFb_" id="6jbF0BoekY5" role="jymVt">
+      <property role="TrG5h" value="processLanguageVersion" />
+      <node concept="37vLTG" id="6jbF0BoekY6" role="3clF46">
+        <property role="TrG5h" value="language" />
+        <node concept="16syzq" id="6jbF0BoekYg" role="1tU5fm">
+          <ref role="16sUi3" node="5M3rB6_P07w" resolve="LANGUAGE" />
+        </node>
+        <node concept="2AHcQZ" id="6jbF0BoekY8" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="6jbF0BoekY9" role="3clF46">
+        <property role="TrG5h" value="version" />
+        <node concept="17QB3L" id="6jbF0BoekYa" role="1tU5fm" />
+        <node concept="2AHcQZ" id="6jbF0BoekYb" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="3Tmbuc" id="6jbF0BoekYc" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0BoekYd" role="3clF45" />
+      <node concept="2AHcQZ" id="6jbF0BoekYe" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="3clFbS" id="6jbF0BoekYh" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0Boepsk" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0Boepsl" role="3cpWs9">
+            <property role="TrG5h" value="staple" />
+            <node concept="3uibUv" id="6jbF0Boepsm" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:7OJcYqvMQ8$" resolve="LanguageStaple" />
+            </node>
+            <node concept="2OqwBi" id="6jbF0Boepsn" role="33vP2m">
+              <node concept="2OqwBi" id="6jbF0Boepso" role="2Oq$k0">
+                <node concept="37vLTw" id="6jbF0Boepsp" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5M3rB6_S5nf" resolve="constants" />
+                </node>
+                <node concept="liA8E" id="6jbF0Boepsq" role="2OqNvi">
+                  <ref role="37wK5l" to="y7p:7OJcYqwXhGH" resolve="listLcLanguages" />
+                </node>
+              </node>
+              <node concept="1z4cxt" id="6jbF0Boepsr" role="2OqNvi">
+                <node concept="1bVj0M" id="6jbF0Boepss" role="23t8la">
+                  <node concept="3clFbS" id="6jbF0Boepst" role="1bW5cS">
+                    <node concept="3clFbF" id="6jbF0Boepsu" role="3cqZAp">
+                      <node concept="17R0WA" id="6jbF0Boepsv" role="3clFbG">
+                        <node concept="37vLTw" id="6jbF0Boepsw" role="3uHU7w">
+                          <ref role="3cqZAo" node="6jbF0BoekY9" resolve="version" />
+                        </node>
+                        <node concept="2OqwBi" id="6jbF0BopDTm" role="3uHU7B">
+                          <node concept="37vLTw" id="6jbF0BopFO5" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6jbF0Boeps$" resolve="it" />
+                          </node>
+                          <node concept="liA8E" id="6jbF0BopDTp" role="2OqNvi">
+                            <ref role="37wK5l" to="y7p:6jbF0Boi_gF" resolve="getLcLanguageVersion" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="6jbF0Boeps$" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="6jbF0Boeps_" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="6jbF0BoepsA" role="3cqZAp">
+          <node concept="3clFbS" id="6jbF0BoepsB" role="3clFbx">
+            <node concept="3cpWs8" id="6jbF0BoepsC" role="3cqZAp">
+              <node concept="3cpWsn" id="6jbF0BoepsD" role="3cpWs9">
+                <property role="TrG5h" value="result" />
+                <node concept="17QB3L" id="6jbF0BoepsE" role="1tU5fm" />
+                <node concept="2YIFZM" id="6jbF0BoeAfX" role="33vP2m">
+                  <ref role="37wK5l" to="wyt6:~Integer.toString(int)" resolve="toString" />
+                  <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
+                  <node concept="2OqwBi" id="6jbF0BoepsF" role="37wK5m">
+                    <node concept="37vLTw" id="6jbF0BoepsG" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6jbF0Boepsl" resolve="staple" />
+                    </node>
+                    <node concept="liA8E" id="6jbF0BoepsH" role="2OqNvi">
+                      <ref role="37wK5l" to="y7p:7OJcYqwoA7z" resolve="getMpsVersion" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs6" id="6jbF0BoepsI" role="3cqZAp">
+              <node concept="37vLTw" id="6jbF0BoepsJ" role="3cqZAk">
+                <ref role="3cqZAo" node="6jbF0BoepsD" resolve="result" />
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="6jbF0BoepsK" role="3clFbw">
+            <node concept="10Nm6u" id="6jbF0BoepsL" role="3uHU7w" />
+            <node concept="37vLTw" id="6jbF0BoepsM" role="3uHU7B">
+              <ref role="3cqZAo" node="6jbF0Boepsl" resolve="staple" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6jbF0BoepsN" role="3cqZAp">
+          <node concept="10Nm6u" id="6jbF0BoepsO" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BoekYi" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6jbF0BoenzH" role="jymVt" />
     <node concept="3clFb_" id="5M3rB6A9Al2" role="jymVt">
       <property role="TrG5h" value="processClassifier" />
       <node concept="3Tmbuc" id="5M3rB6A9Al3" role="1B3o_S" />
@@ -1815,6 +1942,96 @@
       <node concept="3clFbS" id="5M3rB6A1xLb" role="3clF47" />
     </node>
     <node concept="2tJIrI" id="5M3rB6A1sDQ" role="jymVt" />
+    <node concept="3clFb_" id="6jbF0BodqUV" role="jymVt">
+      <property role="TrG5h" value="mapLanguageVersion" />
+      <node concept="3Tm1VV" id="6jbF0BodqUX" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0BodqUY" role="3clF45" />
+      <node concept="37vLTG" id="6jbF0BodqUZ" role="3clF46">
+        <property role="TrG5h" value="language" />
+        <node concept="16syzq" id="6jbF0BodqV3" role="1tU5fm">
+          <ref role="16sUi3" node="5M3rB6A1byP" resolve="LANGUAGE" />
+        </node>
+        <node concept="2AHcQZ" id="6jbF0BodqV1" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BodqV2" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="3clFbS" id="6jbF0BodqV4" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BodAhF" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BodAhG" role="3cpWs9">
+            <property role="TrG5h" value="version" />
+            <node concept="17QB3L" id="6jbF0BodAhH" role="1tU5fm" />
+            <node concept="2OqwBi" id="6jbF0BodAhI" role="33vP2m">
+              <node concept="37vLTw" id="6jbF0BodAhJ" role="2Oq$k0">
+                <ref role="3cqZAo" node="5M3rB6A1jCA" resolve="delegate" />
+              </node>
+              <node concept="liA8E" id="6jbF0BodAhK" role="2OqNvi">
+                <ref role="37wK5l" node="6jbF0BodlwV" resolve="mapLanguageVersion" />
+                <node concept="37vLTw" id="6jbF0BodAhL" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BodqUZ" resolve="language" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="6jbF0BodAhM" role="3cqZAp">
+          <node concept="3clFbS" id="6jbF0BodAhN" role="3clFbx">
+            <node concept="3cpWs6" id="6jbF0BodAhO" role="3cqZAp">
+              <node concept="1rXfSq" id="6jbF0BodAhP" role="3cqZAk">
+                <ref role="37wK5l" node="6jbF0BodFQ3" resolve="processLanguageVersion" />
+                <node concept="37vLTw" id="6jbF0BodAhQ" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BodqUZ" resolve="language" />
+                </node>
+                <node concept="37vLTw" id="6jbF0BodAhR" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BodAhG" resolve="version" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="6jbF0BodAhS" role="3clFbw">
+            <node concept="10Nm6u" id="6jbF0BodAhT" role="3uHU7w" />
+            <node concept="37vLTw" id="6jbF0BodAhU" role="3uHU7B">
+              <ref role="3cqZAo" node="6jbF0BodAhG" resolve="version" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6jbF0BodAhV" role="3cqZAp">
+          <node concept="10Nm6u" id="6jbF0BodAhW" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BodqV5" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="3clFb_" id="6jbF0BodFQ3" role="jymVt">
+      <property role="TrG5h" value="processLanguageVersion" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="37vLTG" id="6jbF0BodFQ4" role="3clF46">
+        <property role="TrG5h" value="language" />
+        <node concept="16syzq" id="6jbF0BodFQ5" role="1tU5fm">
+          <ref role="16sUi3" node="5M3rB6A1byP" resolve="LANGUAGE" />
+        </node>
+        <node concept="2AHcQZ" id="6jbF0BodFQ6" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="6jbF0BodFQ7" role="3clF46">
+        <property role="TrG5h" value="version" />
+        <node concept="17QB3L" id="6jbF0BodFQ8" role="1tU5fm" />
+        <node concept="2AHcQZ" id="6jbF0BodFQ9" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="3Tmbuc" id="6jbF0BodFQa" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0BodFQb" role="3clF45" />
+      <node concept="2AHcQZ" id="6jbF0BodFQc" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="3clFbS" id="6jbF0BodFQd" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="6jbF0BodOW0" role="jymVt" />
     <node concept="3clFb_" id="5M3rB6A1sDR" role="jymVt">
       <property role="TrG5h" value="mapClassifier" />
       <node concept="3Tm1VV" id="5M3rB6A1sDS" role="1B3o_S" />
@@ -3199,6 +3416,41 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="6jbF0Boe89J" role="jymVt" />
+    <node concept="3clFb_" id="6jbF0Boea2w" role="jymVt">
+      <property role="TrG5h" value="processLanguageVersion" />
+      <node concept="37vLTG" id="6jbF0Boea2x" role="3clF46">
+        <property role="TrG5h" value="language" />
+        <node concept="16syzq" id="6jbF0Boea2F" role="1tU5fm">
+          <ref role="16sUi3" node="5M3rB6Abj00" resolve="LANGUAGE" />
+        </node>
+        <node concept="2AHcQZ" id="6jbF0Boea2z" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="6jbF0Boea2$" role="3clF46">
+        <property role="TrG5h" value="version" />
+        <node concept="17QB3L" id="6jbF0Boea2_" role="1tU5fm" />
+        <node concept="2AHcQZ" id="6jbF0Boea2A" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="3Tmbuc" id="6jbF0Boea2B" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0Boea2C" role="3clF45" />
+      <node concept="2AHcQZ" id="6jbF0Boea2D" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="3clFbS" id="6jbF0Boea2G" role="3clF47">
+        <node concept="3clFbF" id="6jbF0Boea2J" role="3cqZAp">
+          <node concept="37vLTw" id="6jbF0BoegnQ" role="3clFbG">
+            <ref role="3cqZAo" node="6jbF0Boea2$" resolve="version" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0Boea2H" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="5M3rB6Abj0M" role="jymVt" />
     <node concept="3clFb_" id="5M3rB6Abj0N" role="jymVt">
       <property role="TrG5h" value="processClassifier" />
@@ -3851,6 +4103,24 @@
       </node>
       <node concept="3clFbS" id="5M3rB6AdDAR" role="3clF47" />
     </node>
+    <node concept="3clFb_" id="6jbF0BodZve" role="jymVt">
+      <property role="TrG5h" value="mapLanguageVersion" />
+      <node concept="3Tm1VV" id="6jbF0BodZvg" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0BodZvh" role="3clF45" />
+      <node concept="37vLTG" id="6jbF0BodZvi" role="3clF46">
+        <property role="TrG5h" value="language" />
+        <node concept="16syzq" id="6jbF0BodZvm" role="1tU5fm">
+          <ref role="16sUi3" node="5M3rB6AdDx1" resolve="LANGUAGE" />
+        </node>
+        <node concept="2AHcQZ" id="6jbF0BodZvk" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BodZvl" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+      </node>
+      <node concept="3clFbS" id="6jbF0BodZvn" role="3clF47" />
+    </node>
     <node concept="3clFb_" id="5M3rB6AdDAS" role="jymVt">
       <property role="TrG5h" value="mapClassifier" />
       <property role="1EzhhJ" value="true" />
@@ -4378,6 +4648,109 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5M3rB6Aeu3A" role="jymVt" />
+    <node concept="3clFb_" id="6jbF0BoeFMx" role="jymVt">
+      <property role="TrG5h" value="mapLanguageVersion" />
+      <node concept="3Tm1VV" id="6jbF0BoeFMz" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0BoeFM$" role="3clF45" />
+      <node concept="37vLTG" id="6jbF0BoeFM_" role="3clF46">
+        <property role="TrG5h" value="language" />
+        <node concept="16syzq" id="6jbF0BoeFN4" role="1tU5fm">
+          <ref role="16sUi3" node="5M3rB6Ae38o" resolve="LANGUAGE" />
+        </node>
+        <node concept="2AHcQZ" id="6jbF0BoeFMB" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BoeFMC" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="3clFbS" id="6jbF0BoeFN5" role="3clF47">
+        <node concept="3clFbF" id="6jbF0BoeMjL" role="3cqZAp">
+          <node concept="2YIFZM" id="6jbF0BoeMjM" role="3clFbG">
+            <ref role="37wK5l" to="33ny:~Objects.requireNonNull(java.lang.Object,java.lang.String)" resolve="requireNonNull" />
+            <ref role="1Pybhc" to="33ny:~Objects" resolve="Objects" />
+            <node concept="2OqwBi" id="6jbF0BoeMjN" role="37wK5m">
+              <node concept="2OqwBi" id="6jbF0BoeMjO" role="2Oq$k0">
+                <node concept="2OqwBi" id="6jbF0BoeMjP" role="2Oq$k0">
+                  <node concept="37vLTw" id="6jbF0BoeMjQ" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5M3rB6AefuF" resolve="delegates" />
+                  </node>
+                  <node concept="3$u5V9" id="6jbF0BoeMjR" role="2OqNvi">
+                    <node concept="1bVj0M" id="6jbF0BoeMjS" role="23t8la">
+                      <node concept="3clFbS" id="6jbF0BoeMjT" role="1bW5cS">
+                        <node concept="3J1_TO" id="6jbF0BoeMjU" role="3cqZAp">
+                          <node concept="3clFbS" id="6jbF0BoeMjV" role="1zxBo7">
+                            <node concept="3cpWs6" id="6jbF0BoeMjW" role="3cqZAp">
+                              <node concept="2OqwBi" id="6jbF0BoeMjX" role="3cqZAk">
+                                <node concept="37vLTw" id="6jbF0BoeMjY" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="6jbF0BoeMkd" resolve="it" />
+                                </node>
+                                <node concept="liA8E" id="6jbF0BoeMjZ" role="2OqNvi">
+                                  <ref role="37wK5l" node="6jbF0BodlwV" resolve="mapLanguageVersion" />
+                                  <node concept="37vLTw" id="6jbF0BoeMk0" role="37wK5m">
+                                    <ref role="3cqZAo" node="6jbF0BoeFM_" resolve="language" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3uVAMA" id="6jbF0BoeMk1" role="1zxBo5">
+                            <node concept="XOnhg" id="6jbF0BoeMk2" role="1zc67B">
+                              <property role="TrG5h" value="e" />
+                              <node concept="nSUau" id="6jbF0BoeMk3" role="1tU5fm">
+                                <node concept="3uibUv" id="6jbF0BoeMk4" role="nSUat">
+                                  <ref role="3uigEE" to="apzt:3zvxfLhsQ3L" resolve="IdDeserializationException" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbS" id="6jbF0BoeMk5" role="1zc67A">
+                              <node concept="3SKdUt" id="6jbF0BoeMk6" role="3cqZAp">
+                                <node concept="1PaTwC" id="6jbF0BoeMk7" role="1aUNEU">
+                                  <node concept="3oM_SD" id="6jbF0BoeMk8" role="1PaTwD">
+                                    <property role="3oM_SC" value="fall-through," />
+                                  </node>
+                                  <node concept="3oM_SD" id="6jbF0BoeMk9" role="1PaTwD">
+                                    <property role="3oM_SC" value="try" />
+                                  </node>
+                                  <node concept="3oM_SD" id="6jbF0BoeMka" role="1PaTwD">
+                                    <property role="3oM_SC" value="next" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3cpWs6" id="6jbF0BoeMkb" role="3cqZAp">
+                                <node concept="10Nm6u" id="6jbF0BoeMkc" role="3cqZAk" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="6jbF0BoeMkd" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="6jbF0BoeMke" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1KnU$U" id="6jbF0BoeMkf" role="2OqNvi" />
+              </node>
+              <node concept="1uHKPH" id="6jbF0BoeMkg" role="2OqNvi" />
+            </node>
+            <node concept="3cpWs3" id="6jbF0BoeMkh" role="37wK5m">
+              <node concept="37vLTw" id="6jbF0BoeMki" role="3uHU7w">
+                <ref role="3cqZAo" node="6jbF0BoeFM_" resolve="language" />
+              </node>
+              <node concept="Xl_RD" id="6jbF0BoeMkj" role="3uHU7B">
+                <property role="Xl_RC" value="Cannot get version for language " />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BoeFN6" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6jbF0BoePmL" role="jymVt" />
     <node concept="3clFb_" id="5M3rB6Ae5mL" role="jymVt">
       <property role="TrG5h" value="mapClassifier" />
       <node concept="3Tm1VV" id="5M3rB6Ae5mN" role="1B3o_S" />
diff --git a/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.idmapper.slanguage.mps b/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.idmapper.slanguage.mps
index 755cc9ac..9cd2597b 100644
--- a/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.idmapper.slanguage.mps
+++ b/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.idmapper.slanguage.mps
@@ -1548,6 +1548,41 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="3clFb_" id="6jbF0BofHkz" role="jymVt">
+      <property role="TrG5h" value="mapLanguageVersion" />
+      <node concept="3Tm1VV" id="6jbF0BofHk_" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0BofHkA" role="3clF45" />
+      <node concept="37vLTG" id="6jbF0BofHkB" role="3clF46">
+        <property role="TrG5h" value="language" />
+        <node concept="3uibUv" id="6jbF0BofHkT" role="1tU5fm">
+          <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
+        </node>
+        <node concept="2AHcQZ" id="6jbF0BofHkD" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BofHkE" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="3clFbS" id="6jbF0BofHkU" role="3clF47">
+        <node concept="3clFbF" id="6jbF0BofIWd" role="3cqZAp">
+          <node concept="2OqwBi" id="6jbF0BofIWe" role="3clFbG">
+            <node concept="37vLTw" id="6jbF0BofIWf" role="2Oq$k0">
+              <ref role="3cqZAo" node="5M3rB6_Y03D" resolve="attributeFinder" />
+            </node>
+            <node concept="liA8E" id="6jbF0BofIWg" role="2OqNvi">
+              <ref role="37wK5l" to="y7p:6jbF0BnTYl$" resolve="findVersionFromLanguage" />
+              <node concept="37vLTw" id="6jbF0BofIWh" role="37wK5m">
+                <ref role="3cqZAo" node="6jbF0BofHkB" resolve="language" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BofHkV" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
     <node concept="3clFb_" id="5M3rB6_YMjd" role="jymVt">
       <property role="TrG5h" value="mapClassifier" />
       <node concept="3Tm1VV" id="5M3rB6_YMjf" role="1B3o_S" />
@@ -2085,6 +2120,38 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5M3rB6A$kwG" role="jymVt" />
+    <node concept="3clFb_" id="6jbF0BofMpJ" role="jymVt">
+      <property role="TrG5h" value="mapLanguageVersion" />
+      <node concept="3Tm1VV" id="6jbF0BofMpL" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0BofMpM" role="3clF45" />
+      <node concept="37vLTG" id="6jbF0BofMpN" role="3clF46">
+        <property role="TrG5h" value="language" />
+        <node concept="3uibUv" id="6jbF0BofMq5" role="1tU5fm">
+          <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
+        </node>
+        <node concept="2AHcQZ" id="6jbF0BofMpP" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BofMpQ" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="3clFbS" id="6jbF0BofMq6" role="3clF47">
+        <node concept="3clFbF" id="6jbF0BofEqc" role="3cqZAp">
+          <node concept="2YIFZM" id="6jbF0BofEqd" role="3clFbG">
+            <ref role="1Pybhc" to="y7p:6jTTMHD72IS" resolve="MpsLanguageUtil" />
+            <ref role="37wK5l" to="y7p:34Q84zMXVAC" resolve="getLanguageVersionString" />
+            <node concept="37vLTw" id="6jbF0BofEqe" role="37wK5m">
+              <ref role="3cqZAo" node="6jbF0BofMpN" resolve="language" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BofMq7" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6jbF0BofOMr" role="jymVt" />
     <node concept="3clFb_" id="5M3rB6AzA$p" role="jymVt">
       <property role="TrG5h" value="mapClassifier" />
       <node concept="3Tm1VV" id="5M3rB6AzA$r" role="1B3o_S" />
@@ -2661,6 +2728,38 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5M3rB6A_o99" role="jymVt" />
+    <node concept="3clFb_" id="6jbF0Bog63r" role="jymVt">
+      <property role="TrG5h" value="mapLanguageVersion" />
+      <node concept="3Tm1VV" id="6jbF0Bog63t" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0Bog63u" role="3clF45" />
+      <node concept="37vLTG" id="6jbF0Bog63v" role="3clF46">
+        <property role="TrG5h" value="language" />
+        <node concept="3uibUv" id="6jbF0Bog63L" role="1tU5fm">
+          <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
+        </node>
+        <node concept="2AHcQZ" id="6jbF0Bog63x" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0Bog63y" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="3clFbS" id="6jbF0Bog63M" role="3clF47">
+        <node concept="3clFbF" id="6jbF0Bogbdr" role="3cqZAp">
+          <node concept="2YIFZM" id="6jbF0Bogbds" role="3clFbG">
+            <ref role="37wK5l" to="y7p:34Q84zMXVAC" resolve="getLanguageVersionString" />
+            <ref role="1Pybhc" to="y7p:6jTTMHD72IS" resolve="MpsLanguageUtil" />
+            <node concept="37vLTw" id="6jbF0Bogbdt" role="37wK5m">
+              <ref role="3cqZAo" node="6jbF0Bog63v" resolve="language" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0Bog63N" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6jbF0Bog8Mv" role="jymVt" />
     <node concept="3clFb_" id="5M3rB6A_o9a" role="jymVt">
       <property role="TrG5h" value="mapClassifier" />
       <node concept="3Tm1VV" id="5M3rB6A_o9b" role="1B3o_S" />
diff --git a/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.language2lioncore.mps b/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.language2lioncore.mps
index c223da8d..fcf2d3e3 100644
--- a/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.language2lioncore.mps
+++ b/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.language2lioncore.mps
@@ -1571,13 +1571,16 @@
               </node>
               <node concept="2pJxcG" id="2chztJeE$93" role="2pJxcM">
                 <ref role="2pJxcJ" to="h3y3:2chztJeDvZC" resolve="version" />
-                <node concept="WxPPo" id="6jTTMHD7tY7" role="28ntcv">
-                  <node concept="2YIFZM" id="34Q84zMXYsl" role="WxPPp">
-                    <ref role="37wK5l" to="y7p:34Q84zMXVAC" resolve="getLanguageVersionString" />
+                <node concept="WxPPo" id="6jbF0BnWL_4" role="28ntcv">
+                  <node concept="2YIFZM" id="6jbF0Bo9502" role="WxPPp">
                     <ref role="1Pybhc" to="y7p:6jTTMHD72IS" resolve="MpsLanguageUtil" />
-                    <node concept="37vLTw" id="34Q84zMXYsm" role="37wK5m">
+                    <ref role="37wK5l" to="y7p:6jbF0Bo0uK5" resolve="getLanguageVersionString" />
+                    <node concept="37vLTw" id="6jbF0Bo9503" role="37wK5m">
                       <ref role="3cqZAo" node="48csSBNReDf" resolve="mps" />
                     </node>
+                    <node concept="37vLTw" id="6jbF0Bo9fFQ" role="37wK5m">
+                      <ref role="3cqZAo" node="5AGBwuDD_bQ" resolve="attributeFinder" />
+                    </node>
                   </node>
                 </node>
               </node>
diff --git a/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.lioncore2mps.mps b/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.lioncore2mps.mps
index 08108553..fc17dcde 100644
--- a/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.lioncore2mps.mps
+++ b/solutions/io.lionweb.mps.converter/models/io.lionweb.mps.converter.m2.lioncore2mps.mps
@@ -4599,7 +4599,7 @@
               <ref role="37wK5l" to="mhbf:~SModel.addRootNode(org.jetbrains.mps.openapi.model.SNode)" resolve="addRootNode" />
               <node concept="2pJPEk" id="6fYiNFaeCQm" role="37wK5m">
                 <node concept="2pJPED" id="6fYiNFaeCQn" role="2pJPEn">
-                  <ref role="2pJxaS" to="234s:6fYiNFad_9U" resolve="LionWebLanguageKey" />
+                  <ref role="2pJxaS" to="234s:6fYiNFad_9U" resolve="LionWebLanguage" />
                   <node concept="2pJxcG" id="6fYiNFaeQ8$" role="2pJxcM">
                     <ref role="2pJxcJ" to="234s:6fYiNFad_a2" resolve="key" />
                     <node concept="WxPPo" id="6fYiNFaeSy5" role="28ntcv">
@@ -4613,6 +4613,19 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="2pJxcG" id="6jbF0BnTgMz" role="2pJxcM">
+                    <ref role="2pJxcJ" to="234s:6jbF0BnT6Ct" resolve="version" />
+                    <node concept="WxPPo" id="6jbF0BnTj7H" role="28ntcv">
+                      <node concept="2OqwBi" id="6jbF0BnTl1h" role="WxPPp">
+                        <node concept="37vLTw" id="6jbF0BnTj7F" role="2Oq$k0">
+                          <ref role="3cqZAo" node="DUXtH0$iPr" resolve="lcLanguage" />
+                        </node>
+                        <node concept="3TrcHB" id="6jbF0BnTp51" role="2OqNvi">
+                          <ref role="3TsBF5" to="h3y3:2chztJeDvZC" resolve="version" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -27616,12 +27629,12 @@
         <ref role="3uigEE" to="apzt:4R9pospH1E7" resolve="ILanguageLookup" />
       </node>
     </node>
-    <node concept="312cEg" id="4WflrVaSVzq" role="jymVt">
-      <property role="TrG5h" value="metaAdapterByDeclarationHelper" />
+    <node concept="312cEg" id="6jbF0Bo$VbY" role="jymVt">
+      <property role="TrG5h" value="attributeFinder" />
       <property role="3TUv4t" value="true" />
-      <node concept="3Tm6S6" id="4WflrVaSVzr" role="1B3o_S" />
-      <node concept="3uibUv" id="4WflrVaSVzt" role="1tU5fm">
-        <ref role="3uigEE" to="y7p:18UigYOOPKz" resolve="IMetaAdapterByDeclarationHelper" />
+      <node concept="3Tm6S6" id="6jbF0Bo$VbZ" role="1B3o_S" />
+      <node concept="3uibUv" id="6jbF0Bo$Vc1" role="1tU5fm">
+        <ref role="3uigEE" to="y7p:pPZz6cPvUw" resolve="LionWebAttributeFinder" />
       </node>
     </node>
     <node concept="2tJIrI" id="3ePT3MiTGk6" role="jymVt" />
@@ -27671,12 +27684,12 @@
           <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
         </node>
       </node>
-      <node concept="37vLTG" id="4WflrVaHS$T" role="3clF46">
-        <property role="TrG5h" value="metaAdapterByDeclarationHelper" />
-        <node concept="3uibUv" id="4WflrVaHUC9" role="1tU5fm">
-          <ref role="3uigEE" to="y7p:18UigYOOPKz" resolve="IMetaAdapterByDeclarationHelper" />
+      <node concept="37vLTG" id="6jbF0Bo$UUR" role="3clF46">
+        <property role="TrG5h" value="attributeFinder" />
+        <node concept="3uibUv" id="6jbF0Bo$UUT" role="1tU5fm">
+          <ref role="3uigEE" to="y7p:pPZz6cPvUw" resolve="LionWebAttributeFinder" />
         </node>
-        <node concept="2AHcQZ" id="4WflrVaLtYD" role="2AJF6D">
+        <node concept="2AHcQZ" id="6jbF0Bo$V6k" role="2AJF6D">
           <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
         </node>
       </node>
@@ -27748,16 +27761,16 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="4WflrVaSVzu" role="3cqZAp">
-          <node concept="37vLTI" id="4WflrVaSVzw" role="3clFbG">
-            <node concept="2OqwBi" id="4WflrVaSW8R" role="37vLTJ">
-              <node concept="Xjq3P" id="4WflrVaSWvE" role="2Oq$k0" />
-              <node concept="2OwXpG" id="4WflrVaSW8U" role="2OqNvi">
-                <ref role="2Oxat5" node="4WflrVaSVzq" resolve="metaAdapterByDeclarationHelper" />
+        <node concept="3clFbF" id="6jbF0Bo$Vc2" role="3cqZAp">
+          <node concept="37vLTI" id="6jbF0Bo$Vc4" role="3clFbG">
+            <node concept="2OqwBi" id="6jbF0Bo$Wby" role="37vLTJ">
+              <node concept="Xjq3P" id="6jbF0Bo$WA3" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6jbF0Bo$Wb_" role="2OqNvi">
+                <ref role="2Oxat5" node="6jbF0Bo$VbY" resolve="attributeFinder" />
               </node>
             </node>
-            <node concept="37vLTw" id="4WflrVaSVz$" role="37vLTx">
-              <ref role="3cqZAo" node="4WflrVaHS$T" resolve="metaAdapterByDeclarationHelper" />
+            <node concept="37vLTw" id="6jbF0Bo$Vc8" role="37vLTx">
+              <ref role="3cqZAo" node="6jbF0Bo$UUR" resolve="attributeFinder" />
             </node>
           </node>
         </node>
@@ -27837,49 +27850,6 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="5M3rB6Biwf4" role="3cqZAp">
-          <node concept="3cpWsn" id="5M3rB6Biwf5" role="3cpWs9">
-            <property role="TrG5h" value="repository" />
-            <node concept="3uibUv" id="5M3rB6BivOy" role="1tU5fm">
-              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-            </node>
-            <node concept="2OqwBi" id="5M3rB6Biwf6" role="33vP2m">
-              <node concept="2JrnkZ" id="5M3rB6Biwf7" role="2Oq$k0">
-                <node concept="2OqwBi" id="5M3rB6Biwf8" role="2JrQYb">
-                  <node concept="37vLTw" id="5M3rB6Biwf9" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3ePT3MiTASV" resolve="lcLanguage" />
-                  </node>
-                  <node concept="I4A8Y" id="5M3rB6Biwfa" role="2OqNvi" />
-                </node>
-              </node>
-              <node concept="liA8E" id="5M3rB6Biwfb" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="5AGBwuETfBC" role="3cqZAp">
-          <node concept="3cpWsn" id="5AGBwuETfBD" role="3cpWs9">
-            <property role="TrG5h" value="attributeFinder" />
-            <node concept="3uibUv" id="5AGBwuETfBE" role="1tU5fm">
-              <ref role="3uigEE" to="y7p:pPZz6cPvUw" resolve="LionWebAttributeFinder" />
-            </node>
-            <node concept="2ShNRf" id="5AGBwuETg$G" role="33vP2m">
-              <node concept="1pGfFk" id="5AGBwuETiw0" role="2ShVmc">
-                <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
-                <node concept="37vLTw" id="5M3rB6Biwfc" role="37wK5m">
-                  <ref role="3cqZAo" node="5M3rB6Biwf5" resolve="repository" />
-                </node>
-                <node concept="37vLTw" id="5M3rB6BiwUg" role="37wK5m">
-                  <ref role="3cqZAo" node="3ePT3MiTG_$" resolve="constants" />
-                </node>
-                <node concept="37vLTw" id="4WflrVaT35w" role="37wK5m">
-                  <ref role="3cqZAo" node="4WflrVaSVzq" resolve="metaAdapterByDeclarationHelper" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbJ" id="3ePT3MiTD4L" role="3cqZAp">
           <node concept="3clFbS" id="3ePT3MiTD4M" role="3clFbx">
             <node concept="3cpWs8" id="59Df55l8f3H" role="3cqZAp">
@@ -27926,7 +27896,7 @@
                       <ref role="3cqZAo" node="6VkSF6bW41k" resolve="mpsIdMapper" />
                     </node>
                     <node concept="37vLTw" id="5M3rB6B$2wq" role="37wK5m">
-                      <ref role="3cqZAo" node="5AGBwuETfBD" resolve="attributeFinder" />
+                      <ref role="3cqZAo" node="6jbF0Bo$VbY" resolve="attributeFinder" />
                     </node>
                   </node>
                 </node>
@@ -28075,7 +28045,7 @@
                         <ref role="3cqZAo" node="6VkSF6bW41k" resolve="mpsIdMapper" />
                       </node>
                       <node concept="37vLTw" id="5M3rB6Bz_qI" role="37wK5m">
-                        <ref role="3cqZAo" node="5AGBwuETfBD" resolve="attributeFinder" />
+                        <ref role="3cqZAo" node="6jbF0Bo$VbY" resolve="attributeFinder" />
                       </node>
                       <node concept="37vLTw" id="5M3rB6Bz_qJ" role="37wK5m">
                         <ref role="3cqZAo" node="3ePT3MiTD5d" resolve="language" />
diff --git a/solutions/io.lionweb.mps.json.test.support/models/io.lionweb.mps.json.test.support.mps b/solutions/io.lionweb.mps.json.test.support/models/io.lionweb.mps.json.test.support.mps
index 397cf847..80c174ba 100644
--- a/solutions/io.lionweb.mps.json.test.support/models/io.lionweb.mps.json.test.support.mps
+++ b/solutions/io.lionweb.mps.json.test.support/models/io.lionweb.mps.json.test.support.mps
@@ -3218,17 +3218,13 @@
               <node concept="Xl_RD" id="3FWZcLW4OeJ" role="37wK5m">
                 <property role="Xl_RC" value="io-lionweb-mps-specific" />
               </node>
-              <node concept="2YIFZM" id="3FWZcLW4O$v" role="37wK5m">
-                <ref role="37wK5l" to="wyt6:~Integer.toString(int)" resolve="toString" />
-                <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
-                <node concept="2YIFZM" id="3FWZcLW4Okb" role="37wK5m">
-                  <ref role="1Pybhc" to="y7p:6jTTMHD72IS" resolve="MpsLanguageUtil" />
-                  <ref role="37wK5l" to="y7p:6jTTMHD72KX" resolve="getLanguageVersion" />
-                  <node concept="pHN19" id="3FWZcLW4Ou2" role="37wK5m">
-                    <node concept="2V$Bhx" id="3FWZcLW4OuU" role="2V$M_3">
-                      <property role="2V$B1T" value="e92f782f-6faf-41c2-bf76-2b1a350c0516" />
-                      <property role="2V$B1Q" value="io.lionweb.mps.specific" />
-                    </node>
+              <node concept="2YIFZM" id="6jbF0Bo26jJ" role="37wK5m">
+                <ref role="37wK5l" to="y7p:34Q84zMXVAC" resolve="getLanguageVersionString" />
+                <ref role="1Pybhc" to="y7p:6jTTMHD72IS" resolve="MpsLanguageUtil" />
+                <node concept="pHN19" id="6jbF0Bo26jK" role="37wK5m">
+                  <node concept="2V$Bhx" id="6jbF0Bo26jL" role="2V$M_3">
+                    <property role="2V$B1T" value="e92f782f-6faf-41c2-bf76-2b1a350c0516" />
+                    <property role="2V$B1Q" value="io.lionweb.mps.specific" />
                   </node>
                 </node>
               </node>
@@ -3270,15 +3266,14 @@
                   </node>
                 </node>
               </node>
-              <node concept="2YIFZM" id="3FWZcLVTYXq" role="37wK5m">
-                <ref role="37wK5l" to="wyt6:~Integer.toString(int)" resolve="toString" />
-                <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
-                <node concept="2YIFZM" id="3FWZcLVTYF1" role="37wK5m">
-                  <ref role="1Pybhc" to="y7p:6jTTMHD72IS" resolve="MpsLanguageUtil" />
-                  <ref role="37wK5l" to="y7p:6jTTMHD72KX" resolve="getLanguageVersion" />
-                  <node concept="37vLTw" id="3FWZcLVUMb7" role="37wK5m">
-                    <ref role="3cqZAo" node="3FWZcLVUM1g" resolve="sLanguage" />
-                  </node>
+              <node concept="2YIFZM" id="6jbF0Bo2alx" role="37wK5m">
+                <ref role="1Pybhc" to="y7p:6jTTMHD72IS" resolve="MpsLanguageUtil" />
+                <ref role="37wK5l" to="y7p:6jbF0Bo0uK5" resolve="getLanguageVersionString" />
+                <node concept="37vLTw" id="6jbF0Bo2aly" role="37wK5m">
+                  <ref role="3cqZAo" node="3FWZcLVUM1g" resolve="sLanguage" />
+                </node>
+                <node concept="37vLTw" id="6jbF0Bo2arj" role="37wK5m">
+                  <ref role="3cqZAo" node="5AGBwuFaS4W" resolve="attributeFinder" />
                 </node>
               </node>
             </node>
@@ -3295,6 +3290,15 @@
           <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
         </node>
       </node>
+      <node concept="37vLTG" id="5AGBwuFaS4W" role="3clF46">
+        <property role="TrG5h" value="attributeFinder" />
+        <node concept="3uibUv" id="5AGBwuFaSMf" role="1tU5fm">
+          <ref role="3uigEE" to="y7p:pPZz6cPvUw" resolve="LionWebAttributeFinder" />
+        </node>
+        <node concept="2AHcQZ" id="1f4Qr8Vhi5l" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
     </node>
     <node concept="3Tm1VV" id="3FWZcLVULYx" role="1B3o_S" />
   </node>
diff --git a/solutions/io.lionweb.mps.json.test/models/io.lionweb.mps.json.test.json2lioncore@tests.mps b/solutions/io.lionweb.mps.json.test/models/io.lionweb.mps.json.test.json2lioncore@tests.mps
index 6b847e78..f3d36a77 100644
--- a/solutions/io.lionweb.mps.json.test/models/io.lionweb.mps.json.test.json2lioncore@tests.mps
+++ b/solutions/io.lionweb.mps.json.test/models/io.lionweb.mps.json.test.json2lioncore@tests.mps
@@ -1486,7 +1486,7 @@
     <node concept="1qefOq" id="5sACIIs_h1$" role="1SKRRt">
       <node concept="2RzRRF" id="5sACIIs$PgG" role="1qenE9">
         <property role="TrG5h" value="LionCore_M3" />
-        <property role="3HH78N" value="1" />
+        <property role="3HH78N" value="2023.1" />
         <property role="2RzON1" value="LionCore-M3" />
         <node concept="3xLA65" id="5sACIIs_is2" role="lGtFl">
           <property role="TrG5h" value="lionCore" />
@@ -1748,7 +1748,7 @@
       <node concept="2RzRRF" id="4R9posqf3NK" role="1qenE9">
         <property role="2RzON1" value="My-TestLang3" />
         <property role="TrG5h" value="io.lionweb.mps.converter.TestLang3" />
-        <property role="3HH78N" value="0" />
+        <property role="3HH78N" value="00 my! VERSION 😀" />
         <node concept="3xLA65" id="4R9posqf3YV" role="lGtFl">
           <property role="TrG5h" value="TestLang3" />
         </node>
diff --git a/solutions/io.lionweb.mps.json.test/models/io.lionweb.mps.json.test.json2lionweb@tests.mps b/solutions/io.lionweb.mps.json.test/models/io.lionweb.mps.json.test.json2lionweb@tests.mps
index 416d2087..49af0db2 100644
--- a/solutions/io.lionweb.mps.json.test/models/io.lionweb.mps.json.test.json2lionweb@tests.mps
+++ b/solutions/io.lionweb.mps.json.test/models/io.lionweb.mps.json.test.json2lionweb@tests.mps
@@ -43,6 +43,7 @@
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
     <import index="qa91" ref="r:38742da4-ca90-4db1-b16c-4863d9d39613(io.lionweb.mps.converter.TestLang.structure)" />
     <import index="43ba" ref="r:45d4cca0-b85a-4b49-8b0a-a764324dd84b(io.lionweb.mps.converter.TestEnum.structure)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="q6xk" ref="r:2e1d95ed-4ed0-4ecd-bc84-f6c7c405fa7f(io.lionweb.mps.converter.TestLang3.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" implicit="true" />
@@ -102,6 +103,9 @@
     <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="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
+        <reference id="2820489544401957798" name="classifier" index="HV5vE" />
+      </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
         <child id="1154032183016" name="body" index="2LFqv$" />
       </concept>
@@ -1341,7 +1345,7 @@
                         <property role="Xl_RC" value="My-TestLang3" />
                       </node>
                       <node concept="Xl_RD" id="3FWZcLVWa_m" role="37wK5m">
-                        <property role="Xl_RC" value="0" />
+                        <property role="Xl_RC" value="00 my! VERSION 😀" />
                       </node>
                     </node>
                   </node>
@@ -1886,7 +1890,7 @@
                         <property role="Xl_RC" value="My-TestLang3" />
                       </node>
                       <node concept="Xl_RD" id="3FWZcLVWI51" role="37wK5m">
-                        <property role="Xl_RC" value="0" />
+                        <property role="Xl_RC" value="00 my! VERSION 😀" />
                       </node>
                     </node>
                   </node>
@@ -2110,7 +2114,7 @@
                         <property role="Xl_RC" value="My-TestLang3" />
                       </node>
                       <node concept="Xl_RD" id="3FWZcLVWIrW" role="37wK5m">
-                        <property role="Xl_RC" value="0" />
+                        <property role="Xl_RC" value="00 my! VERSION 😀" />
                       </node>
                     </node>
                   </node>
@@ -2504,6 +2508,20 @@
           </node>
         </node>
         <node concept="3clFbH" id="4R9pospmzGN" role="3cqZAp" />
+        <node concept="3cpWs8" id="6jbF0BobBqw" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BobBqx" role="3cpWs9">
+            <property role="TrG5h" value="repository" />
+            <node concept="3uibUv" id="6jbF0BoaM7p" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="2OqwBi" id="6jbF0BobBqy" role="33vP2m">
+              <node concept="1jGwE1" id="6jbF0BobBqz" role="2Oq$k0" />
+              <node concept="liA8E" id="6jbF0BobBq$" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="4R9pospmzGO" role="3cqZAp">
           <node concept="3cpWsn" id="4R9pospmzGP" role="3cpWs9">
             <property role="TrG5h" value="converter" />
@@ -2513,11 +2531,8 @@
             <node concept="2ShNRf" id="4R9pospmzGR" role="33vP2m">
               <node concept="1pGfFk" id="4R9pospmzGS" role="2ShVmc">
                 <ref role="37wK5l" to="6peh:5lijfVJTSc9" resolve="M1ToJson" />
-                <node concept="2OqwBi" id="4R9pospmzGT" role="37wK5m">
-                  <node concept="1jGwE1" id="4R9pospmzGU" role="2Oq$k0" />
-                  <node concept="liA8E" id="4R9pospmzGV" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
-                  </node>
+                <node concept="37vLTw" id="6jbF0BobBq_" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BobBqx" resolve="repository" />
                 </node>
                 <node concept="2ShNRf" id="4R9pospmzGW" role="37wK5m">
                   <node concept="2HTt$P" id="4R9pospmzGX" role="2ShVmc">
@@ -2682,11 +2697,38 @@
           </node>
         </node>
         <node concept="3clFbH" id="4R9pospmzHD" role="3cqZAp" />
+        <node concept="3cpWs8" id="6jbF0BobB4R" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BobB4S" role="3cpWs9">
+            <property role="TrG5h" value="attributeFinder" />
+            <node concept="3uibUv" id="6jbF0BobB4T" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:pPZz6cPvUw" resolve="LionWebAttributeFinder" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BobB4U" role="33vP2m">
+              <node concept="1pGfFk" id="6jbF0BobB4V" role="2ShVmc">
+                <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
+                <node concept="37vLTw" id="6jbF0BobB4W" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BobBqx" resolve="repository" />
+                </node>
+                <node concept="2ShNRf" id="6jbF0BobB4X" role="37wK5m">
+                  <node concept="1pGfFk" id="6jbF0BobB4Y" role="2ShVmc">
+                    <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
+                    <node concept="37vLTw" id="6jbF0BobB4Z" role="37wK5m">
+                      <ref role="3cqZAo" node="6jbF0BobBqx" resolve="repository" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="6jbF0BobB50" role="37wK5m">
+                  <node concept="HV5vD" id="6jbF0BobB51" role="2ShVmc">
+                    <ref role="HV5vE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6jbF0BobB52" role="3cqZAp" />
         <node concept="3clFbF" id="3FWZcLVXMF6" role="3cqZAp">
           <node concept="2OqwBi" id="3FWZcLVXMF7" role="3clFbG">
-            <node concept="37vLTw" id="3FWZcLVXMF8" role="2Oq$k0">
-              <ref role="3cqZAo" node="4R9pospmzHi" resolve="comparer" />
-            </node>
             <node concept="liA8E" id="3FWZcLVXMF9" role="2OqNvi">
               <ref role="37wK5l" to="kte7:5TNjoy25t5T" resolve="assertSortedEquals" />
               <node concept="37vLTw" id="3FWZcLVXMFa" role="37wK5m">
@@ -2704,7 +2746,7 @@
                         <property role="Xl_RC" value="My-TestLang3" />
                       </node>
                       <node concept="Xl_RD" id="3FWZcLVXMFh" role="37wK5m">
-                        <property role="Xl_RC" value="0" />
+                        <property role="Xl_RC" value="00 my! VERSION 😀" />
                       </node>
                     </node>
                   </node>
@@ -2717,10 +2759,16 @@
                         <property role="2V$B1Q" value="io.lionweb.mps.converter.TestLang2" />
                       </node>
                     </node>
+                    <node concept="37vLTw" id="6jbF0BobC3V" role="37wK5m">
+                      <ref role="3cqZAo" node="6jbF0BobB4S" resolve="attributeFinder" />
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
+            <node concept="37vLTw" id="3FWZcLVXMF8" role="2Oq$k0">
+              <ref role="3cqZAo" node="4R9pospmzHi" resolve="comparer" />
+            </node>
           </node>
         </node>
       </node>
@@ -2738,6 +2786,20 @@
           </node>
         </node>
         <node concept="3clFbH" id="4R9pospmzHQ" role="3cqZAp" />
+        <node concept="3cpWs8" id="6jbF0BobErE" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BobErF" role="3cpWs9">
+            <property role="TrG5h" value="repository" />
+            <node concept="3uibUv" id="6jbF0BobC_R" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="2OqwBi" id="6jbF0BobErG" role="33vP2m">
+              <node concept="1jGwE1" id="6jbF0BobErH" role="2Oq$k0" />
+              <node concept="liA8E" id="6jbF0BobErI" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="4R9pospmzHR" role="3cqZAp">
           <node concept="3cpWsn" id="4R9pospmzHS" role="3cpWs9">
             <property role="TrG5h" value="converter" />
@@ -2747,11 +2809,8 @@
             <node concept="2ShNRf" id="4R9pospmzHU" role="33vP2m">
               <node concept="1pGfFk" id="4R9pospmzHV" role="2ShVmc">
                 <ref role="37wK5l" to="6peh:5lijfVJTSc9" resolve="M1ToJson" />
-                <node concept="2OqwBi" id="4R9pospmzHW" role="37wK5m">
-                  <node concept="1jGwE1" id="4R9pospmzHX" role="2Oq$k0" />
-                  <node concept="liA8E" id="4R9pospmzHY" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
-                  </node>
+                <node concept="37vLTw" id="6jbF0BobErJ" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BobErF" resolve="repository" />
                 </node>
                 <node concept="2ShNRf" id="4R9pospmzHZ" role="37wK5m">
                   <node concept="2HTt$P" id="4R9pospmzI0" role="2ShVmc">
@@ -2916,6 +2975,36 @@
           </node>
         </node>
         <node concept="3clFbH" id="4R9pospmzIG" role="3cqZAp" />
+        <node concept="3cpWs8" id="6jbF0BobE5W" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BobE5X" role="3cpWs9">
+            <property role="TrG5h" value="attributeFinder" />
+            <node concept="3uibUv" id="6jbF0BobE5Y" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:pPZz6cPvUw" resolve="LionWebAttributeFinder" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BobE5Z" role="33vP2m">
+              <node concept="1pGfFk" id="6jbF0BobE60" role="2ShVmc">
+                <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
+                <node concept="37vLTw" id="6jbF0BobE61" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BobErF" resolve="repository" />
+                </node>
+                <node concept="2ShNRf" id="6jbF0BobE62" role="37wK5m">
+                  <node concept="1pGfFk" id="6jbF0BobE63" role="2ShVmc">
+                    <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
+                    <node concept="37vLTw" id="6jbF0BobE64" role="37wK5m">
+                      <ref role="3cqZAo" node="6jbF0BobErF" resolve="repository" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="6jbF0BobE65" role="37wK5m">
+                  <node concept="HV5vD" id="6jbF0BobE66" role="2ShVmc">
+                    <ref role="HV5vE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6jbF0BobE67" role="3cqZAp" />
         <node concept="3clFbF" id="4R9pospmzIH" role="3cqZAp">
           <node concept="2OqwBi" id="4R9pospmzII" role="3clFbG">
             <node concept="37vLTw" id="4R9pospmzIJ" role="2Oq$k0">
@@ -2938,7 +3027,7 @@
                         <property role="Xl_RC" value="My-TestLang3" />
                       </node>
                       <node concept="Xl_RD" id="3FWZcLVYi9W" role="37wK5m">
-                        <property role="Xl_RC" value="0" />
+                        <property role="Xl_RC" value="00 my! VERSION 😀" />
                       </node>
                     </node>
                   </node>
@@ -2951,6 +3040,9 @@
                         <property role="2V$B1Q" value="io.lionweb.mps.converter.TestLang2" />
                       </node>
                     </node>
+                    <node concept="37vLTw" id="6jbF0BobGfr" role="37wK5m">
+                      <ref role="3cqZAo" node="6jbF0BobE5X" resolve="attributeFinder" />
+                    </node>
                   </node>
                 </node>
               </node>
@@ -3271,6 +3363,20 @@
           </node>
         </node>
         <node concept="3clFbH" id="4R9posq5S4U" role="3cqZAp" />
+        <node concept="3cpWs8" id="6jbF0Bob_pa" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0Bob_pb" role="3cpWs9">
+            <property role="TrG5h" value="repository" />
+            <node concept="3uibUv" id="6jbF0Bob_3r" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="2OqwBi" id="6jbF0Bob_pc" role="33vP2m">
+              <node concept="1jGwE1" id="6jbF0Bob_pd" role="2Oq$k0" />
+              <node concept="liA8E" id="6jbF0Bob_pe" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="4R9posq5S4V" role="3cqZAp">
           <node concept="3cpWsn" id="4R9posq5S4W" role="3cpWs9">
             <property role="TrG5h" value="converter" />
@@ -3280,11 +3386,8 @@
             <node concept="2ShNRf" id="4R9posq5S4Y" role="33vP2m">
               <node concept="1pGfFk" id="4R9posq5S4Z" role="2ShVmc">
                 <ref role="37wK5l" to="6peh:5lijfVJTSc9" resolve="M1ToJson" />
-                <node concept="2OqwBi" id="4R9posq5S50" role="37wK5m">
-                  <node concept="1jGwE1" id="4R9posq5S51" role="2Oq$k0" />
-                  <node concept="liA8E" id="4R9posq5S52" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
-                  </node>
+                <node concept="37vLTw" id="6jbF0Bob_pf" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0Bob_pb" resolve="repository" />
                 </node>
                 <node concept="2ShNRf" id="4R9posq5S53" role="37wK5m">
                   <node concept="2HTt$P" id="4R9posq5S54" role="2ShVmc">
@@ -3367,6 +3470,36 @@
           </node>
         </node>
         <node concept="3clFbH" id="4R9posq5S5K" role="3cqZAp" />
+        <node concept="3cpWs8" id="6jbF0Bob_9c" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0Bob_9d" role="3cpWs9">
+            <property role="TrG5h" value="attributeFinder" />
+            <node concept="3uibUv" id="6jbF0Bob_9e" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:pPZz6cPvUw" resolve="LionWebAttributeFinder" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0Bob_9f" role="33vP2m">
+              <node concept="1pGfFk" id="6jbF0Bob_9g" role="2ShVmc">
+                <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
+                <node concept="37vLTw" id="6jbF0Bob_9h" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0Bob_pb" resolve="repository" />
+                </node>
+                <node concept="2ShNRf" id="6jbF0Bob_9i" role="37wK5m">
+                  <node concept="1pGfFk" id="6jbF0Bob_9j" role="2ShVmc">
+                    <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
+                    <node concept="37vLTw" id="6jbF0Bob_9k" role="37wK5m">
+                      <ref role="3cqZAo" node="6jbF0Bob_pb" resolve="repository" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="6jbF0Bob_9l" role="37wK5m">
+                  <node concept="HV5vD" id="6jbF0Bob_9m" role="2ShVmc">
+                    <ref role="HV5vE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6jbF0Bob_9n" role="3cqZAp" />
         <node concept="3clFbF" id="4R9posq5S5L" role="3cqZAp">
           <node concept="2OqwBi" id="4R9posq5S5M" role="3clFbG">
             <node concept="37vLTw" id="4R9posq5S5N" role="2Oq$k0">
@@ -3391,6 +3524,9 @@
                         <property role="2V$B1Q" value="io.lionweb.mps.converter.TestCustomDatatype" />
                       </node>
                     </node>
+                    <node concept="37vLTw" id="6jbF0Bob_Ax" role="37wK5m">
+                      <ref role="3cqZAo" node="6jbF0Bob_9d" resolve="attributeFinder" />
+                    </node>
                   </node>
                 </node>
               </node>
@@ -4115,6 +4251,20 @@
           </node>
         </node>
         <node concept="3clFbH" id="1xqd6ptaZvL" role="3cqZAp" />
+        <node concept="3cpWs8" id="6jbF0BobrLr" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BobrLs" role="3cpWs9">
+            <property role="TrG5h" value="repository" />
+            <node concept="3uibUv" id="6jbF0BoblFa" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="2OqwBi" id="6jbF0BobrLt" role="33vP2m">
+              <node concept="1jGwE1" id="6jbF0BobrLu" role="2Oq$k0" />
+              <node concept="liA8E" id="6jbF0BobrLv" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="1xqd6ptaZvM" role="3cqZAp">
           <node concept="3cpWsn" id="1xqd6ptaZvN" role="3cpWs9">
             <property role="TrG5h" value="converter" />
@@ -4124,11 +4274,8 @@
             <node concept="2ShNRf" id="1xqd6ptaZvP" role="33vP2m">
               <node concept="1pGfFk" id="1xqd6ptaZvQ" role="2ShVmc">
                 <ref role="37wK5l" to="6peh:5lijfVJTSc9" resolve="M1ToJson" />
-                <node concept="2OqwBi" id="1xqd6ptaZvR" role="37wK5m">
-                  <node concept="1jGwE1" id="1xqd6ptaZvS" role="2Oq$k0" />
-                  <node concept="liA8E" id="1xqd6ptaZvT" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
-                  </node>
+                <node concept="37vLTw" id="6jbF0BobrLw" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BobrLs" resolve="repository" />
                 </node>
                 <node concept="2ShNRf" id="1xqd6ptaZvU" role="37wK5m">
                   <node concept="2HTt$P" id="1xqd6ptaZvV" role="2ShVmc">
@@ -4483,6 +4630,36 @@
           </node>
         </node>
         <node concept="3clFbH" id="1xqd6ptaZxs" role="3cqZAp" />
+        <node concept="3cpWs8" id="6jbF0BobvNA" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BobvNB" role="3cpWs9">
+            <property role="TrG5h" value="attributeFinder" />
+            <node concept="3uibUv" id="6jbF0BobvA9" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:pPZz6cPvUw" resolve="LionWebAttributeFinder" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BobvNC" role="33vP2m">
+              <node concept="1pGfFk" id="6jbF0BobvND" role="2ShVmc">
+                <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
+                <node concept="37vLTw" id="6jbF0BobvNE" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BobrLs" resolve="repository" />
+                </node>
+                <node concept="2ShNRf" id="6jbF0BobvNF" role="37wK5m">
+                  <node concept="1pGfFk" id="6jbF0BobvNG" role="2ShVmc">
+                    <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
+                    <node concept="37vLTw" id="6jbF0BobvNH" role="37wK5m">
+                      <ref role="3cqZAo" node="6jbF0BobrLs" resolve="repository" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="6jbF0BobvNI" role="37wK5m">
+                  <node concept="HV5vD" id="6jbF0BobvNJ" role="2ShVmc">
+                    <ref role="HV5vE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6jbF0Bobm7N" role="3cqZAp" />
         <node concept="3clFbF" id="1xqd6ptaZxt" role="3cqZAp">
           <node concept="2OqwBi" id="1xqd6ptaZxu" role="3clFbG">
             <node concept="37vLTw" id="1xqd6ptaZxv" role="2Oq$k0">
@@ -4522,6 +4699,9 @@
                         <property role="2V$B1Q" value="library" />
                       </node>
                     </node>
+                    <node concept="37vLTw" id="6jbF0Bobxby" role="37wK5m">
+                      <ref role="3cqZAo" node="6jbF0BobvNB" resolve="attributeFinder" />
+                    </node>
                   </node>
                   <node concept="2YIFZM" id="3FWZcLVUZgN" role="HW$Y0">
                     <ref role="37wK5l" to="kte7:3FWZcLVUM0z" resolve="toUsedLanguage" />
@@ -4532,6 +4712,9 @@
                         <property role="2V$B1Q" value="io.lionweb.mps.converter.TestAnnotation" />
                       </node>
                     </node>
+                    <node concept="37vLTw" id="6jbF0BobxTd" role="37wK5m">
+                      <ref role="3cqZAo" node="6jbF0BobvNB" resolve="attributeFinder" />
+                    </node>
                   </node>
                 </node>
               </node>
@@ -4759,6 +4942,20 @@
           </node>
         </node>
         <node concept="3clFbH" id="5TNjoy234z4" role="3cqZAp" />
+        <node concept="3cpWs8" id="6jbF0BobHM7" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BobHM8" role="3cpWs9">
+            <property role="TrG5h" value="repository" />
+            <node concept="3uibUv" id="6jbF0BobHje" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="2OqwBi" id="6jbF0BobHM9" role="33vP2m">
+              <node concept="1jGwE1" id="6jbF0BobHMa" role="2Oq$k0" />
+              <node concept="liA8E" id="6jbF0BobHMb" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="5TNjoy1ZBCL" role="3cqZAp">
           <node concept="3cpWsn" id="5TNjoy1ZBCM" role="3cpWs9">
             <property role="TrG5h" value="converter" />
@@ -4768,11 +4965,8 @@
             <node concept="2ShNRf" id="5TNjoy1ZBCO" role="33vP2m">
               <node concept="1pGfFk" id="5TNjoy1ZBCP" role="2ShVmc">
                 <ref role="37wK5l" to="6peh:5lijfVJTSc9" resolve="M1ToJson" />
-                <node concept="2OqwBi" id="5TNjoy1ZBCQ" role="37wK5m">
-                  <node concept="1jGwE1" id="5TNjoy1ZBCR" role="2Oq$k0" />
-                  <node concept="liA8E" id="5TNjoy1ZBCS" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
-                  </node>
+                <node concept="37vLTw" id="6jbF0BobHMc" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BobHM8" resolve="repository" />
                 </node>
                 <node concept="2ShNRf" id="5TNjoy1ZW$T" role="37wK5m">
                   <node concept="Tc6Ow" id="5TNjoy1ZX0s" role="2ShVmc">
@@ -4942,6 +5136,36 @@
           </node>
         </node>
         <node concept="3clFbH" id="5TNjoy1ZBFh" role="3cqZAp" />
+        <node concept="3cpWs8" id="6jbF0BobHzi" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BobHzj" role="3cpWs9">
+            <property role="TrG5h" value="attributeFinder" />
+            <node concept="3uibUv" id="6jbF0BobHzk" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:pPZz6cPvUw" resolve="LionWebAttributeFinder" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BobHzl" role="33vP2m">
+              <node concept="1pGfFk" id="6jbF0BobHzm" role="2ShVmc">
+                <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
+                <node concept="37vLTw" id="6jbF0BobHzn" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BobHM8" resolve="repository" />
+                </node>
+                <node concept="2ShNRf" id="6jbF0BobHzo" role="37wK5m">
+                  <node concept="1pGfFk" id="6jbF0BobHzp" role="2ShVmc">
+                    <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
+                    <node concept="37vLTw" id="6jbF0BobHzq" role="37wK5m">
+                      <ref role="3cqZAo" node="6jbF0BobHM8" resolve="repository" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="6jbF0BobHzr" role="37wK5m">
+                  <node concept="HV5vD" id="6jbF0BobHzs" role="2ShVmc">
+                    <ref role="HV5vE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6jbF0BobHzt" role="3cqZAp" />
         <node concept="3clFbF" id="5TNjoy1ZBFi" role="3cqZAp">
           <node concept="2OqwBi" id="5TNjoy1ZBFj" role="3clFbG">
             <node concept="37vLTw" id="5TNjoy1ZBFk" role="2Oq$k0">
@@ -4970,6 +5194,9 @@
                         <property role="2V$B1Q" value="io.lionweb.mps.converter.TestRefs" />
                       </node>
                     </node>
+                    <node concept="37vLTw" id="6jbF0BobIiD" role="37wK5m">
+                      <ref role="3cqZAo" node="6jbF0BobHzj" resolve="attributeFinder" />
+                    </node>
                   </node>
                 </node>
               </node>
@@ -7136,6 +7363,20 @@
           </node>
         </node>
         <node concept="3clFbH" id="5JNiskiVWJL" role="3cqZAp" />
+        <node concept="3cpWs8" id="6jbF0Bob$6c" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0Bob$6d" role="3cpWs9">
+            <property role="TrG5h" value="repository" />
+            <node concept="3uibUv" id="6jbF0BobzQ3" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="2OqwBi" id="6jbF0Bob$6e" role="33vP2m">
+              <node concept="1jGwE1" id="6jbF0Bob$6f" role="2Oq$k0" />
+              <node concept="liA8E" id="6jbF0Bob$6g" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="5JNiskiVWJM" role="3cqZAp">
           <node concept="3cpWsn" id="5JNiskiVWJN" role="3cpWs9">
             <property role="TrG5h" value="converter" />
@@ -7145,11 +7386,8 @@
             <node concept="2ShNRf" id="5JNiskiVWJP" role="33vP2m">
               <node concept="1pGfFk" id="5JNiskiVWJQ" role="2ShVmc">
                 <ref role="37wK5l" to="6peh:5lijfVJTSc9" resolve="M1ToJson" />
-                <node concept="2OqwBi" id="5JNiskiVWJR" role="37wK5m">
-                  <node concept="1jGwE1" id="5JNiskiVWJS" role="2Oq$k0" />
-                  <node concept="liA8E" id="5JNiskiVWJT" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
-                  </node>
+                <node concept="37vLTw" id="6jbF0Bob$6h" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0Bob$6d" resolve="repository" />
                 </node>
                 <node concept="2ShNRf" id="5JNiskiVWJU" role="37wK5m">
                   <node concept="2HTt$P" id="5JNiskiVWJV" role="2ShVmc">
@@ -7248,6 +7486,37 @@
           </node>
         </node>
         <node concept="3clFbH" id="5JNiskiVWM0" role="3cqZAp" />
+        <node concept="3cpWs8" id="6jbF0BobzWy" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BobzWz" role="3cpWs9">
+            <property role="TrG5h" value="attributeFinder" />
+            <node concept="3uibUv" id="6jbF0BobzW$" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:pPZz6cPvUw" resolve="LionWebAttributeFinder" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BobzW_" role="33vP2m">
+              <node concept="1pGfFk" id="6jbF0BobzWA" role="2ShVmc">
+                <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
+                <node concept="37vLTw" id="6jbF0BobzWB" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0Bob$6d" resolve="repository" />
+                </node>
+                <node concept="2ShNRf" id="6jbF0BobzWC" role="37wK5m">
+                  <node concept="1pGfFk" id="6jbF0BobzWD" role="2ShVmc">
+                    <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
+                    <node concept="37vLTw" id="6jbF0BobzWE" role="37wK5m">
+                      <ref role="3cqZAo" node="6jbF0Bob$6d" resolve="repository" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="6jbF0BobzWF" role="37wK5m">
+                  <node concept="HV5vD" id="6jbF0BobzWG" role="2ShVmc">
+                    <ref role="HV5vE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6jbF0BobzWH" role="3cqZAp" />
+        <node concept="3clFbH" id="6jbF0BobzVv" role="3cqZAp" />
         <node concept="3clFbF" id="5JNiskiVWM1" role="3cqZAp">
           <node concept="2OqwBi" id="5JNiskiVWM2" role="3clFbG">
             <node concept="37vLTw" id="5JNiskiVWM3" role="2Oq$k0">
@@ -7276,6 +7545,9 @@
                         <property role="2V$B1Q" value="library" />
                       </node>
                     </node>
+                    <node concept="37vLTw" id="6jbF0Bob$NC" role="37wK5m">
+                      <ref role="3cqZAo" node="6jbF0BobzWz" resolve="attributeFinder" />
+                    </node>
                   </node>
                   <node concept="2YIFZM" id="3FWZcLW4Vx7" role="HW$Y0">
                     <ref role="37wK5l" to="kte7:3FWZcLW4NDt" resolve="specific" />
@@ -7402,6 +7674,20 @@
           </node>
         </node>
         <node concept="3clFbH" id="3FWZcLW7bnb" role="3cqZAp" />
+        <node concept="3cpWs8" id="6jbF0BobLU8" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BobLU9" role="3cpWs9">
+            <property role="TrG5h" value="repository" />
+            <node concept="3uibUv" id="6jbF0BobKBJ" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="2OqwBi" id="6jbF0BobLUa" role="33vP2m">
+              <node concept="1jGwE1" id="6jbF0BobLUb" role="2Oq$k0" />
+              <node concept="liA8E" id="6jbF0BobLUc" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="3FWZcLW7bnc" role="3cqZAp">
           <node concept="3cpWsn" id="3FWZcLW7bnd" role="3cpWs9">
             <property role="TrG5h" value="converter" />
@@ -7411,11 +7697,8 @@
             <node concept="2ShNRf" id="3FWZcLW7bnf" role="33vP2m">
               <node concept="1pGfFk" id="3FWZcLW7bng" role="2ShVmc">
                 <ref role="37wK5l" to="6peh:5lijfVJTSc9" resolve="M1ToJson" />
-                <node concept="2OqwBi" id="3FWZcLW7bnh" role="37wK5m">
-                  <node concept="1jGwE1" id="3FWZcLW7bni" role="2Oq$k0" />
-                  <node concept="liA8E" id="3FWZcLW7bnj" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
-                  </node>
+                <node concept="37vLTw" id="6jbF0BobLUd" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BobLU9" resolve="repository" />
                 </node>
                 <node concept="2ShNRf" id="3FWZcLW7bnk" role="37wK5m">
                   <node concept="2HTt$P" id="3FWZcLW7bnl" role="2ShVmc">
@@ -7989,6 +8272,36 @@
           </node>
         </node>
         <node concept="3clFbH" id="6LPkCA_EbVI" role="3cqZAp" />
+        <node concept="3cpWs8" id="6jbF0BobLj2" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BobLj3" role="3cpWs9">
+            <property role="TrG5h" value="attributeFinder" />
+            <node concept="3uibUv" id="6jbF0BobLj4" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:pPZz6cPvUw" resolve="LionWebAttributeFinder" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BobLj5" role="33vP2m">
+              <node concept="1pGfFk" id="6jbF0BobLj6" role="2ShVmc">
+                <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
+                <node concept="37vLTw" id="6jbF0BobLj7" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BobLU9" resolve="repository" />
+                </node>
+                <node concept="2ShNRf" id="6jbF0BobLj8" role="37wK5m">
+                  <node concept="1pGfFk" id="6jbF0BobLj9" role="2ShVmc">
+                    <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
+                    <node concept="37vLTw" id="6jbF0BobLja" role="37wK5m">
+                      <ref role="3cqZAo" node="6jbF0BobLU9" resolve="repository" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="6jbF0BobLjb" role="37wK5m">
+                  <node concept="HV5vD" id="6jbF0BobLjc" role="2ShVmc">
+                    <ref role="HV5vE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6jbF0BobLjd" role="3cqZAp" />
         <node concept="3clFbF" id="3FWZcLW7boR" role="3cqZAp">
           <node concept="2OqwBi" id="3FWZcLW7boS" role="3clFbG">
             <node concept="37vLTw" id="3FWZcLW7boT" role="2Oq$k0">
@@ -8013,6 +8326,9 @@
                         <property role="2V$B1Q" value="io.lionweb.mps.converter.TestLang" />
                       </node>
                     </node>
+                    <node concept="37vLTw" id="6jbF0BobO5s" role="37wK5m">
+                      <ref role="3cqZAo" node="6jbF0BobLj3" resolve="attributeFinder" />
+                    </node>
                   </node>
                 </node>
               </node>
diff --git a/solutions/io.lionweb.mps.json.test/models/io.lionweb.mps.json.test.metapointer@tests.mps b/solutions/io.lionweb.mps.json.test/models/io.lionweb.mps.json.test.metapointer@tests.mps
index d2ff59f7..a477b589 100644
--- a/solutions/io.lionweb.mps.json.test/models/io.lionweb.mps.json.test.metapointer@tests.mps
+++ b/solutions/io.lionweb.mps.json.test/models/io.lionweb.mps.json.test.metapointer@tests.mps
@@ -575,6 +575,36 @@
         <ref role="3uigEE" to="pe0e:3Lj28wlz81B" resolve="IMetaPointerConverter" />
       </node>
       <node concept="3clFbS" id="KVKr66i7DD" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BoEwH2" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoEwH3" role="3cpWs9">
+            <property role="TrG5h" value="repository" />
+            <node concept="3uibUv" id="6jbF0BoEwES" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="2OqwBi" id="6jbF0BoEwH4" role="33vP2m">
+              <node concept="1jGwE1" id="6jbF0BoEwH5" role="2Oq$k0" />
+              <node concept="liA8E" id="6jbF0BoEwH6" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6jbF0BoEwO6" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoEwO7" role="3cpWs9">
+            <property role="TrG5h" value="constants" />
+            <node concept="3uibUv" id="6jbF0BoEwMt" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:DUXtGZOlwJ" resolve="LionCoreConstants" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BoEwO8" role="33vP2m">
+              <node concept="1pGfFk" id="6jbF0BoEwO9" role="2ShVmc">
+                <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
+                <node concept="37vLTw" id="6jbF0BoEwOa" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BoEwH3" resolve="repository" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="KVKr66i7EI" role="3cqZAp">
           <node concept="2ShNRf" id="KVKr66i7EG" role="3clFbG">
             <node concept="1pGfFk" id="KVKr66i7Qn" role="2ShVmc">
@@ -600,21 +630,29 @@
                   <node concept="2ShNRf" id="4r3Tp$pVmzN" role="37wK5m">
                     <node concept="1pGfFk" id="4r3Tp$pVmYi" role="2ShVmc">
                       <ref role="37wK5l" to="y7p:6VkSF6aIt83" resolve="SLanguageIdDeriver" />
-                      <node concept="2ShNRf" id="4r3Tp$pVamu" role="37wK5m">
-                        <node concept="1pGfFk" id="4r3Tp$pVamv" role="2ShVmc">
-                          <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
-                          <node concept="2OqwBi" id="4r3Tp$pVamw" role="37wK5m">
-                            <node concept="1jGwE1" id="4r3Tp$pVamx" role="2Oq$k0" />
-                            <node concept="liA8E" id="4r3Tp$pVamy" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
-                            </node>
-                          </node>
-                        </node>
+                      <node concept="37vLTw" id="6jbF0BoEwOb" role="37wK5m">
+                        <ref role="3cqZAo" node="6jbF0BoEwO7" resolve="constants" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="2ShNRf" id="6jbF0BoExkq" role="37wK5m">
+                <node concept="1pGfFk" id="6jbF0BoExkr" role="2ShVmc">
+                  <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
+                  <node concept="37vLTw" id="6jbF0BoExks" role="37wK5m">
+                    <ref role="3cqZAo" node="6jbF0BoEwH3" resolve="repository" />
+                  </node>
+                  <node concept="37vLTw" id="6jbF0BoExkt" role="37wK5m">
+                    <ref role="3cqZAo" node="6jbF0BoEwO7" resolve="constants" />
+                  </node>
+                  <node concept="2ShNRf" id="6jbF0BoExku" role="37wK5m">
+                    <node concept="HV5vD" id="6jbF0BoExkv" role="2ShVmc">
+                      <ref role="HV5vE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
+                    </node>
+                  </node>
+                </node>
+              </node>
             </node>
           </node>
         </node>
@@ -1286,6 +1324,36 @@
         <ref role="3uigEE" to="pe0e:3Lj28wlz81B" resolve="IMetaPointerConverter" />
       </node>
       <node concept="3clFbS" id="KVKr66sZ$X" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BoExAN" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoExAO" role="3cpWs9">
+            <property role="TrG5h" value="repository" />
+            <node concept="3uibUv" id="6jbF0BoExyf" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="2OqwBi" id="6jbF0BoExAP" role="33vP2m">
+              <node concept="1jGwE1" id="6jbF0BoExAQ" role="2Oq$k0" />
+              <node concept="liA8E" id="6jbF0BoExAR" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6jbF0BoExI7" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoExI8" role="3cpWs9">
+            <property role="TrG5h" value="constants" />
+            <node concept="3uibUv" id="6jbF0BoExGu" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:DUXtGZOlwJ" resolve="LionCoreConstants" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BoExI9" role="33vP2m">
+              <node concept="1pGfFk" id="6jbF0BoExIa" role="2ShVmc">
+                <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
+                <node concept="37vLTw" id="6jbF0BoExIb" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BoExAO" resolve="repository" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="KVKr66sZ$Y" role="3cqZAp">
           <node concept="2ShNRf" id="KVKr66sZ$Z" role="3clFbG">
             <node concept="1pGfFk" id="KVKr66sZ_0" role="2ShVmc">
@@ -1311,21 +1379,29 @@
                   <node concept="2ShNRf" id="4r3Tp$pVnpy" role="37wK5m">
                     <node concept="1pGfFk" id="4r3Tp$pVnpz" role="2ShVmc">
                       <ref role="37wK5l" to="y7p:6VkSF6aIt83" resolve="SLanguageIdDeriver" />
-                      <node concept="2ShNRf" id="4r3Tp$pVnp$" role="37wK5m">
-                        <node concept="1pGfFk" id="4r3Tp$pVnp_" role="2ShVmc">
-                          <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
-                          <node concept="2OqwBi" id="4r3Tp$pVnpA" role="37wK5m">
-                            <node concept="1jGwE1" id="4r3Tp$pVnpB" role="2Oq$k0" />
-                            <node concept="liA8E" id="4r3Tp$pVnpC" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
-                            </node>
-                          </node>
-                        </node>
+                      <node concept="37vLTw" id="6jbF0BoExIc" role="37wK5m">
+                        <ref role="3cqZAo" node="6jbF0BoExI8" resolve="constants" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="2ShNRf" id="6jbF0BoExVx" role="37wK5m">
+                <node concept="1pGfFk" id="6jbF0BoExVy" role="2ShVmc">
+                  <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
+                  <node concept="37vLTw" id="6jbF0BoExVz" role="37wK5m">
+                    <ref role="3cqZAo" node="6jbF0BoExAO" resolve="repository" />
+                  </node>
+                  <node concept="37vLTw" id="6jbF0BoExV$" role="37wK5m">
+                    <ref role="3cqZAo" node="6jbF0BoExI8" resolve="constants" />
+                  </node>
+                  <node concept="2ShNRf" id="6jbF0BoExV_" role="37wK5m">
+                    <node concept="HV5vD" id="6jbF0BoExVA" role="2ShVmc">
+                      <ref role="HV5vE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
+                    </node>
+                  </node>
+                </node>
+              </node>
             </node>
           </node>
         </node>
@@ -1549,7 +1625,7 @@
                     <property role="Xl_RC" value="My-TestLang3" />
                   </node>
                   <node concept="Xl_RD" id="68Be_yIKE0" role="37wK5m">
-                    <property role="Xl_RC" value="1" />
+                    <property role="Xl_RC" value="00 my! VERSION 😀" />
                   </node>
                   <node concept="10Nm6u" id="68Be_yIKFO" role="37wK5m" />
                 </node>
@@ -1583,7 +1659,7 @@
                     <property role="Xl_RC" value="My-TestLang3" />
                   </node>
                   <node concept="Xl_RD" id="68Be_yJBzE" role="37wK5m">
-                    <property role="Xl_RC" value="1" />
+                    <property role="Xl_RC" value="00 my! VERSION 😀" />
                   </node>
                   <node concept="Xl_RD" id="68Be_yJCY_" role="37wK5m">
                     <property role="Xl_RC" value="My-Test3ConceptBase" />
@@ -1953,6 +2029,36 @@
         <ref role="3uigEE" to="pe0e:5wsogBcpo49" resolve="IMetaPointerLookup" />
       </node>
       <node concept="3clFbS" id="68Be_yUR44" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BoEv$R" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoEv$S" role="3cpWs9">
+            <property role="TrG5h" value="repository" />
+            <node concept="3uibUv" id="6jbF0BoEvyU" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="2OqwBi" id="6jbF0BoEv$T" role="33vP2m">
+              <node concept="1jGwE1" id="6jbF0BoEv$U" role="2Oq$k0" />
+              <node concept="liA8E" id="6jbF0BoEv$V" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6jbF0BoEvG5" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoEvG6" role="3cpWs9">
+            <property role="TrG5h" value="constants" />
+            <node concept="3uibUv" id="6jbF0BoEvEW" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:DUXtGZOlwJ" resolve="LionCoreConstants" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BoEvG7" role="33vP2m">
+              <node concept="1pGfFk" id="6jbF0BoEvG8" role="2ShVmc">
+                <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
+                <node concept="37vLTw" id="6jbF0BoEvG9" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BoEv$S" resolve="repository" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="68Be_yURyl" role="3cqZAp">
           <node concept="2ShNRf" id="68Be_yURyh" role="3clFbG">
             <node concept="1pGfFk" id="68Be_yURQm" role="2ShVmc">
@@ -1981,21 +2087,29 @@
                       <node concept="2ShNRf" id="4r3Tp$pVpEC" role="37wK5m">
                         <node concept="1pGfFk" id="4r3Tp$pVpED" role="2ShVmc">
                           <ref role="37wK5l" to="y7p:6VkSF6aIt83" resolve="SLanguageIdDeriver" />
-                          <node concept="2ShNRf" id="4r3Tp$pVpEE" role="37wK5m">
-                            <node concept="1pGfFk" id="4r3Tp$pVpEF" role="2ShVmc">
-                              <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
-                              <node concept="2OqwBi" id="4r3Tp$pVpEG" role="37wK5m">
-                                <node concept="1jGwE1" id="4r3Tp$pVpEH" role="2Oq$k0" />
-                                <node concept="liA8E" id="4r3Tp$pVpEI" role="2OqNvi">
-                                  <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
-                                </node>
-                              </node>
-                            </node>
+                          <node concept="37vLTw" id="6jbF0BoEvGa" role="37wK5m">
+                            <ref role="3cqZAo" node="6jbF0BoEvG6" resolve="constants" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="2ShNRf" id="6jbF0BoEvVk" role="37wK5m">
+                    <node concept="1pGfFk" id="6jbF0BoEvVl" role="2ShVmc">
+                      <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
+                      <node concept="37vLTw" id="6jbF0BoEvVm" role="37wK5m">
+                        <ref role="3cqZAo" node="6jbF0BoEv$S" resolve="repository" />
+                      </node>
+                      <node concept="37vLTw" id="6jbF0BoEvVn" role="37wK5m">
+                        <ref role="3cqZAo" node="6jbF0BoEvG6" resolve="constants" />
+                      </node>
+                      <node concept="2ShNRf" id="6jbF0BoEvVo" role="37wK5m">
+                        <node concept="HV5vD" id="6jbF0BoEvVp" role="2ShVmc">
+                          <ref role="HV5vE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -2173,6 +2287,36 @@
         <ref role="3uigEE" to="pe0e:5wsogBcpo49" resolve="IMetaPointerLookup" />
       </node>
       <node concept="3clFbS" id="68Be_yV0R7" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BoEwde" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoEwdf" role="3cpWs9">
+            <property role="TrG5h" value="repository" />
+            <node concept="3uibUv" id="6jbF0BoEw9K" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="2OqwBi" id="6jbF0BoEwdg" role="33vP2m">
+              <node concept="1jGwE1" id="6jbF0BoEwdh" role="2Oq$k0" />
+              <node concept="liA8E" id="6jbF0BoEwdi" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6jbF0BoEwkG" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoEwkH" role="3cpWs9">
+            <property role="TrG5h" value="constants" />
+            <node concept="3uibUv" id="6jbF0BoEwiV" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:DUXtGZOlwJ" resolve="LionCoreConstants" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BoEwkI" role="33vP2m">
+              <node concept="1pGfFk" id="6jbF0BoEwkJ" role="2ShVmc">
+                <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
+                <node concept="37vLTw" id="6jbF0BoEwkK" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BoEwdf" resolve="repository" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="68Be_yV0R8" role="3cqZAp">
           <node concept="2ShNRf" id="68Be_yV0R9" role="3clFbG">
             <node concept="1pGfFk" id="68Be_yV0Ra" role="2ShVmc">
@@ -2201,21 +2345,29 @@
                       <node concept="2ShNRf" id="4r3Tp$pVp6A" role="37wK5m">
                         <node concept="1pGfFk" id="4r3Tp$pVp6B" role="2ShVmc">
                           <ref role="37wK5l" to="y7p:6VkSF6aIt83" resolve="SLanguageIdDeriver" />
-                          <node concept="2ShNRf" id="4r3Tp$pV9lf" role="37wK5m">
-                            <node concept="1pGfFk" id="4r3Tp$pV9lg" role="2ShVmc">
-                              <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
-                              <node concept="2OqwBi" id="4r3Tp$pV9lh" role="37wK5m">
-                                <node concept="1jGwE1" id="4r3Tp$pV9li" role="2Oq$k0" />
-                                <node concept="liA8E" id="4r3Tp$pV9lj" role="2OqNvi">
-                                  <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
-                                </node>
-                              </node>
-                            </node>
+                          <node concept="37vLTw" id="6jbF0BoEwkL" role="37wK5m">
+                            <ref role="3cqZAo" node="6jbF0BoEwkH" resolve="constants" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="2ShNRf" id="6jbF0BoEwrY" role="37wK5m">
+                    <node concept="1pGfFk" id="6jbF0BoEwrZ" role="2ShVmc">
+                      <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
+                      <node concept="37vLTw" id="6jbF0BoEws0" role="37wK5m">
+                        <ref role="3cqZAo" node="6jbF0BoEwdf" resolve="repository" />
+                      </node>
+                      <node concept="37vLTw" id="6jbF0BoEws1" role="37wK5m">
+                        <ref role="3cqZAo" node="6jbF0BoEwkH" resolve="constants" />
+                      </node>
+                      <node concept="2ShNRf" id="6jbF0BoEws2" role="37wK5m">
+                        <node concept="HV5vD" id="6jbF0BoEws3" role="2ShVmc">
+                          <ref role="HV5vE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -2463,6 +2615,36 @@
         <ref role="3uigEE" to="pe0e:5wsogBcpo49" resolve="IMetaPointerLookup" />
       </node>
       <node concept="3clFbS" id="68Be_yV3W$" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BoEpYj" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoEpYk" role="3cpWs9">
+            <property role="TrG5h" value="repository" />
+            <node concept="3uibUv" id="6jbF0BoEpX5" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="2OqwBi" id="6jbF0BoEpYl" role="33vP2m">
+              <node concept="1jGwE1" id="6jbF0BoEpYm" role="2Oq$k0" />
+              <node concept="liA8E" id="6jbF0BoEpYn" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6jbF0BoEqj7" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoEqj8" role="3cpWs9">
+            <property role="TrG5h" value="constants" />
+            <node concept="3uibUv" id="6jbF0BoEqhh" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:DUXtGZOlwJ" resolve="LionCoreConstants" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BoEqj9" role="33vP2m">
+              <node concept="1pGfFk" id="6jbF0BoEqja" role="2ShVmc">
+                <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
+                <node concept="37vLTw" id="6jbF0BoEqjb" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BoEpYk" resolve="repository" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="68Be_yV3W_" role="3cqZAp">
           <node concept="2ShNRf" id="68Be_yV3WA" role="3clFbG">
             <node concept="1pGfFk" id="68Be_yV3WB" role="2ShVmc">
@@ -2491,21 +2673,29 @@
                       <node concept="2ShNRf" id="4r3Tp$pVqd$" role="37wK5m">
                         <node concept="1pGfFk" id="4r3Tp$pVqd_" role="2ShVmc">
                           <ref role="37wK5l" to="y7p:6VkSF6aIt83" resolve="SLanguageIdDeriver" />
-                          <node concept="2ShNRf" id="4r3Tp$pVqdA" role="37wK5m">
-                            <node concept="1pGfFk" id="4r3Tp$pVqdB" role="2ShVmc">
-                              <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
-                              <node concept="2OqwBi" id="4r3Tp$pVqdC" role="37wK5m">
-                                <node concept="1jGwE1" id="4r3Tp$pVqdD" role="2Oq$k0" />
-                                <node concept="liA8E" id="4r3Tp$pVqdE" role="2OqNvi">
-                                  <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
-                                </node>
-                              </node>
-                            </node>
+                          <node concept="37vLTw" id="6jbF0BoEqjc" role="37wK5m">
+                            <ref role="3cqZAo" node="6jbF0BoEqj8" resolve="constants" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="2ShNRf" id="6jbF0BoEpr6" role="37wK5m">
+                    <node concept="1pGfFk" id="6jbF0BoEpRM" role="2ShVmc">
+                      <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
+                      <node concept="37vLTw" id="6jbF0BoEq5F" role="37wK5m">
+                        <ref role="3cqZAo" node="6jbF0BoEpYk" resolve="repository" />
+                      </node>
+                      <node concept="37vLTw" id="6jbF0BoEqv5" role="37wK5m">
+                        <ref role="3cqZAo" node="6jbF0BoEqj8" resolve="constants" />
+                      </node>
+                      <node concept="2ShNRf" id="6jbF0BoEqIy" role="37wK5m">
+                        <node concept="HV5vD" id="6jbF0BoEr6k" role="2ShVmc">
+                          <ref role="HV5vE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -2683,6 +2873,36 @@
         <ref role="3uigEE" to="pe0e:5wsogBcpo49" resolve="IMetaPointerLookup" />
       </node>
       <node concept="3clFbS" id="68Be_yV53f" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BoEtf0" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoEtf1" role="3cpWs9">
+            <property role="TrG5h" value="repository" />
+            <node concept="3uibUv" id="6jbF0BoEtcy" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="2OqwBi" id="6jbF0BoEtf2" role="33vP2m">
+              <node concept="1jGwE1" id="6jbF0BoEtf3" role="2Oq$k0" />
+              <node concept="liA8E" id="6jbF0BoEtf4" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6jbF0BoEtnB" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoEtnC" role="3cpWs9">
+            <property role="TrG5h" value="constants" />
+            <node concept="3uibUv" id="6jbF0BoEtmE" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:DUXtGZOlwJ" resolve="LionCoreConstants" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0BoEtnD" role="33vP2m">
+              <node concept="1pGfFk" id="6jbF0BoEtnE" role="2ShVmc">
+                <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
+                <node concept="37vLTw" id="6jbF0BoEtnF" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BoEtf1" resolve="repository" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="68Be_yV53g" role="3cqZAp">
           <node concept="2ShNRf" id="68Be_yV53h" role="3clFbG">
             <node concept="1pGfFk" id="68Be_yV53i" role="2ShVmc">
@@ -2711,21 +2931,29 @@
                       <node concept="2ShNRf" id="4r3Tp$pVpYR" role="37wK5m">
                         <node concept="1pGfFk" id="4r3Tp$pVpYS" role="2ShVmc">
                           <ref role="37wK5l" to="y7p:6VkSF6aIt83" resolve="SLanguageIdDeriver" />
-                          <node concept="2ShNRf" id="4r3Tp$pVpYT" role="37wK5m">
-                            <node concept="1pGfFk" id="4r3Tp$pVpYU" role="2ShVmc">
-                              <ref role="37wK5l" to="y7p:DUXtGZOlxP" resolve="LionCoreConstants" />
-                              <node concept="2OqwBi" id="4r3Tp$pVpYV" role="37wK5m">
-                                <node concept="1jGwE1" id="4r3Tp$pVpYW" role="2Oq$k0" />
-                                <node concept="liA8E" id="4r3Tp$pVpYX" role="2OqNvi">
-                                  <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
-                                </node>
-                              </node>
-                            </node>
+                          <node concept="37vLTw" id="6jbF0BoEtnG" role="37wK5m">
+                            <ref role="3cqZAo" node="6jbF0BoEtnC" resolve="constants" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="2ShNRf" id="6jbF0BoEtAS" role="37wK5m">
+                    <node concept="1pGfFk" id="6jbF0BoEtSj" role="2ShVmc">
+                      <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
+                      <node concept="37vLTw" id="6jbF0BoEtZW" role="37wK5m">
+                        <ref role="3cqZAo" node="6jbF0BoEtf1" resolve="repository" />
+                      </node>
+                      <node concept="37vLTw" id="6jbF0BoEu6v" role="37wK5m">
+                        <ref role="3cqZAo" node="6jbF0BoEtnC" resolve="constants" />
+                      </node>
+                      <node concept="2ShNRf" id="6jbF0BoEuf5" role="37wK5m">
+                        <node concept="HV5vD" id="6jbF0BoEuDp" role="2ShVmc">
+                          <ref role="HV5vE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -3065,6 +3293,42 @@
         </node>
       </node>
     </node>
+    <node concept="1LZb2c" id="6jbF0Bodbml" role="1SL9yI">
+      <property role="TrG5h" value="Concept_keyed" />
+      <node concept="3cqZAl" id="6jbF0Bodbmm" role="3clF45" />
+      <node concept="3clFbS" id="6jbF0Bodbmn" role="3clF47">
+        <node concept="3vlDli" id="6jbF0Bodbmo" role="3cqZAp">
+          <node concept="2ShNRf" id="6jbF0Bodbmp" role="3tpDZB">
+            <node concept="1pGfFk" id="6jbF0Bodbmq" role="2ShVmc">
+              <ref role="37wK5l" to="xfsv:~MetaPointer.&lt;init&gt;(java.lang.String,java.lang.String,java.lang.String)" resolve="MetaPointer" />
+              <node concept="Xl_RD" id="6jbF0Bodbmr" role="37wK5m">
+                <property role="Xl_RC" value="099490a3-1e39-4ed1-bebc-8027665cecf9" />
+              </node>
+              <node concept="Xl_RD" id="6jbF0Bodbms" role="37wK5m">
+                <property role="Xl_RC" value="0" />
+              </node>
+              <node concept="Xl_RD" id="6jbF0Bodbmt" role="37wK5m">
+                <property role="Xl_RC" value="2585378165973204112" />
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="6jbF0Bodbmu" role="3tpDZA">
+            <node concept="liA8E" id="6jbF0Bodbmv" role="2OqNvi">
+              <ref role="37wK5l" to="lai5:5s4Z0e0f2S8" resolve="createConcept" />
+              <node concept="35c_gC" id="6jbF0Bodbmw" role="37wK5m">
+                <ref role="35c_gD" to="q6xk:2fx6VTSSzMg" resolve="TestConceptPlain" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="6jbF0Bodbmx" role="2Oq$k0">
+              <node concept="2WthIp" id="6jbF0Bodbmy" role="2Oq$k0" />
+              <node concept="2XshWL" id="6jbF0Bodbmz" role="2OqNvi">
+                <ref role="2WH_rO" node="68Be_yWeLM" resolve="create" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="1X3_iC" id="68Be_yWqH4" role="lGtFl">
       <property role="3V$3am" value="testMethods" />
       <property role="3V$3ak" value="8585453e-6bfb-4d80-98de-b16074f1d86c/1216913645126/1217501895093" />
@@ -4158,6 +4422,30 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="6jbF0Bocmc3" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0Bocmc4" role="3cpWs9">
+            <property role="TrG5h" value="attributeFinder" />
+            <node concept="3uibUv" id="6jbF0Bocm62" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:pPZz6cPvUw" resolve="LionWebAttributeFinder" />
+            </node>
+            <node concept="2ShNRf" id="6jbF0Bocmc5" role="33vP2m">
+              <node concept="1pGfFk" id="6jbF0Bocmc6" role="2ShVmc">
+                <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
+                <node concept="37vLTw" id="6jbF0Bocmc7" role="37wK5m">
+                  <ref role="3cqZAo" node="1ryFPTS7O57" resolve="repository" />
+                </node>
+                <node concept="37vLTw" id="6jbF0Bocmc8" role="37wK5m">
+                  <ref role="3cqZAo" node="1ryFPTS7O5d" resolve="constants" />
+                </node>
+                <node concept="2ShNRf" id="6jbF0Bocmc9" role="37wK5m">
+                  <node concept="HV5vD" id="6jbF0Bocmca" role="2ShVmc">
+                    <ref role="HV5vE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="1ryFPTS7O5i" role="3cqZAp">
           <node concept="2ShNRf" id="1ryFPTS7O5j" role="3clFbG">
             <node concept="1pGfFk" id="1ryFPTS7O5k" role="2ShVmc">
@@ -4165,21 +4453,8 @@
               <node concept="2ShNRf" id="1ryFPTS7O5l" role="37wK5m">
                 <node concept="1pGfFk" id="1ryFPTS7PZm" role="2ShVmc">
                   <ref role="37wK5l" to="faaz:6fYiNFaC6ei" resolve="SLanguageBase64GuaranteedMapper" />
-                  <node concept="2ShNRf" id="1ryFPTS7Q6o" role="37wK5m">
-                    <node concept="1pGfFk" id="1ryFPTS7Qtw" role="2ShVmc">
-                      <ref role="37wK5l" to="y7p:5AGBwuFEKL7" resolve="LionWebAttributeFinder" />
-                      <node concept="37vLTw" id="1ryFPTS7Qyy" role="37wK5m">
-                        <ref role="3cqZAo" node="1ryFPTS7O57" resolve="repository" />
-                      </node>
-                      <node concept="37vLTw" id="1ryFPTS7QIp" role="37wK5m">
-                        <ref role="3cqZAo" node="1ryFPTS7O5d" resolve="constants" />
-                      </node>
-                      <node concept="2ShNRf" id="4WflrVaUDca" role="37wK5m">
-                        <node concept="HV5vD" id="4WflrVaUDcb" role="2ShVmc">
-                          <ref role="HV5vE" to="y7p:18UigYOOPLq" resolve="MetaAdapterByDeclarationHelper" />
-                        </node>
-                      </node>
-                    </node>
+                  <node concept="37vLTw" id="6jbF0Bocmcb" role="37wK5m">
+                    <ref role="3cqZAo" node="6jbF0Bocmc4" resolve="attributeFinder" />
                   </node>
                   <node concept="2ShNRf" id="4r3Tp$pVd$h" role="37wK5m">
                     <node concept="1pGfFk" id="4r3Tp$pVdYF" role="2ShVmc">
@@ -4252,6 +4527,46 @@
         </node>
       </node>
     </node>
+    <node concept="1LZb2c" id="6jbF0BohIhw" role="1SL9yI">
+      <property role="TrG5h" value="Concept_keyed" />
+      <node concept="3cqZAl" id="6jbF0BohIhx" role="3clF45" />
+      <node concept="3clFbS" id="6jbF0BohIhy" role="3clF47">
+        <node concept="3vlDli" id="6jbF0BohIhz" role="3cqZAp">
+          <node concept="2ShNRf" id="6jbF0BohIh$" role="3tpDZB">
+            <node concept="1pGfFk" id="6jbF0BohIh_" role="2ShVmc">
+              <ref role="37wK5l" to="xfsv:~MetaPointer.&lt;init&gt;(java.lang.String,java.lang.String,java.lang.String)" resolve="MetaPointer" />
+              <node concept="Xl_RD" id="6jbF0BohKLZ" role="37wK5m">
+                <property role="Xl_RC" value="My-TestLang3" />
+              </node>
+              <node concept="Xl_RD" id="6jbF0BohIhC" role="37wK5m">
+                <property role="Xl_RC" value="00 my! VERSION 😀" />
+              </node>
+              <node concept="2YIFZM" id="6jbF0BohIhD" role="37wK5m">
+                <ref role="37wK5l" to="apzt:2fx6VTSziaY" resolve="toLionWeb" />
+                <ref role="1Pybhc" to="apzt:2fx6VTSzhNf" resolve="IdEncoder" />
+                <node concept="Xl_RD" id="6jbF0BohIhE" role="37wK5m">
+                  <property role="Xl_RC" value="099490a3-1e39-4ed1-bebc-8027665cecf9/2585378165973204112" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="6jbF0BohIhF" role="3tpDZA">
+            <node concept="liA8E" id="6jbF0BohIhG" role="2OqNvi">
+              <ref role="37wK5l" to="lai5:5s4Z0e0f2S8" resolve="createConcept" />
+              <node concept="35c_gC" id="6jbF0BohIhH" role="37wK5m">
+                <ref role="35c_gD" to="q6xk:2fx6VTSSzMg" resolve="TestConceptPlain" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="6jbF0BohIhI" role="2Oq$k0">
+              <node concept="2WthIp" id="6jbF0BohIhJ" role="2Oq$k0" />
+              <node concept="2XshWL" id="6jbF0BohIhK" role="2OqNvi">
+                <ref role="2WH_rO" node="1ryFPTS7O53" resolve="create" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="1X3_iC" id="1ryFPTS7O5D" role="lGtFl">
       <property role="3V$3am" value="testMethods" />
       <property role="3V$3ak" value="8585453e-6bfb-4d80-98de-b16074f1d86c/1216913645126/1217501895093" />
diff --git a/solutions/io.lionweb.mps.json.test/resources/Test3Properties.emptyValue.json b/solutions/io.lionweb.mps.json.test/resources/Test3Properties.emptyValue.json
index 4791ff1d..2760d195 100644
--- a/solutions/io.lionweb.mps.json.test/resources/Test3Properties.emptyValue.json
+++ b/solutions/io.lionweb.mps.json.test/resources/Test3Properties.emptyValue.json
@@ -3,7 +3,7 @@
   "languages": [
     {
       "key": "My-TestLang3",
-      "version": "0"
+      "version": "00 my! VERSION 😀"
     }
   ],
   "nodes": [
@@ -11,14 +11,14 @@
       "id": "{id-Test3Properties}",
       "classifier": {
         "language": "My-TestLang3",
-        "version": "0",
+        "version": "00 my! VERSION 😀",
         "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTY"
       },
       "properties": [
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc1Nw"
           },
           "value": ""
@@ -26,7 +26,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc1OQ"
           },
           "value": ""
@@ -34,7 +34,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc2NA"
           },
           "value": ""
@@ -42,7 +42,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc3MQ"
           },
           "value": ""
@@ -50,7 +50,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc3Mw"
           },
           "value": ""
@@ -58,7 +58,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc3NQ"
           },
           "value": ""
@@ -66,7 +66,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc4Ng"
           },
           "value": "false"
@@ -74,7 +74,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc4OA"
           },
           "value": "false"
@@ -82,7 +82,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc5MA"
           },
           "value": "false"
@@ -90,7 +90,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTgwNg"
           },
           "value": "0"
@@ -98,7 +98,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTgwOA"
           },
           "value": "0"
@@ -106,7 +106,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTgxMA"
           },
           "value": "0"
diff --git a/solutions/io.lionweb.mps.json.test/resources/Test3Properties.someValue.json b/solutions/io.lionweb.mps.json.test/resources/Test3Properties.someValue.json
index dbfe4b56..23ea2816 100644
--- a/solutions/io.lionweb.mps.json.test/resources/Test3Properties.someValue.json
+++ b/solutions/io.lionweb.mps.json.test/resources/Test3Properties.someValue.json
@@ -3,7 +3,7 @@
   "languages": [
     {
       "key": "My-TestLang3",
-      "version": "0"
+      "version": "00 my! VERSION 😀"
     }
   ],
   "nodes": [
@@ -11,14 +11,14 @@
       "id": "{id-Test3Properties}",
       "classifier": {
         "language": "My-TestLang3",
-        "version": "0",
+        "version": "00 my! VERSION 😀",
         "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTY"
       },
       "properties": [
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc1Nw"
           },
           "value": "a"
@@ -26,7 +26,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc1OQ"
           },
           "value": "a"
@@ -34,7 +34,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc2NA"
           },
           "value": "a"
@@ -42,7 +42,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc3MQ"
           },
           "value": "[]"
@@ -50,7 +50,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc3Mw"
           },
           "value": "[]"
@@ -58,7 +58,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc3NQ"
           },
           "value": "[]"
@@ -66,7 +66,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc4Ng"
           },
           "value": "true"
@@ -74,7 +74,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc4OA"
           },
           "value": "true"
@@ -82,7 +82,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc5MA"
           },
           "value": "true"
@@ -90,7 +90,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTgwNg"
           },
           "value": "1"
@@ -98,7 +98,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTgwOA"
           },
           "value": "1"
@@ -106,7 +106,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTgxMA"
           },
           "value": "1"
diff --git a/solutions/io.lionweb.mps.json.test/resources/Test3Properties.unset.json b/solutions/io.lionweb.mps.json.test/resources/Test3Properties.unset.json
index d52ce960..a2ab0728 100644
--- a/solutions/io.lionweb.mps.json.test/resources/Test3Properties.unset.json
+++ b/solutions/io.lionweb.mps.json.test/resources/Test3Properties.unset.json
@@ -3,7 +3,7 @@
   "languages": [
     {
       "key": "My-TestLang3",
-      "version": "0"
+      "version": "00 my! VERSION 😀"
     }
   ],
   "nodes": [
@@ -11,14 +11,14 @@
       "id": "{id-Test3Properties}",
       "classifier": {
         "language": "My-TestLang3",
-        "version": "0",
+        "version": "00 my! VERSION 😀",
         "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTY"
       },
       "properties": [
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc2NA"
           },
           "value": null
@@ -26,7 +26,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc3MQ"
           },
           "value": null
@@ -34,7 +34,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc4Ng"
           },
           "value": "false"
@@ -42,7 +42,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc4OA"
           },
           "value": "false"
@@ -50,7 +50,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTc5MA"
           },
           "value": "false"
@@ -58,7 +58,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzcyNzI5MTcxNjczMTc4NDU3NTYvNzI3MjkxNzE2NzMxNzg0NTgwNg"
           },
           "value": null
diff --git a/solutions/io.lionweb.mps.json.test/resources/TestLang3-metamodel.json b/solutions/io.lionweb.mps.json.test/resources/TestLang3-metamodel.json
index 7d1d18a7..dc7ea4bf 100644
--- a/solutions/io.lionweb.mps.json.test/resources/TestLang3-metamodel.json
+++ b/solutions/io.lionweb.mps.json.test/resources/TestLang3-metamodel.json
@@ -3572,7 +3572,7 @@
             "version": "2023.1",
             "key": "Language-version"
           },
-          "value": "0"
+          "value": "00 my! VERSION 😀"
         },
         {
           "property": {
diff --git a/solutions/io.lionweb.mps.json.test/resources/lioncore.json b/solutions/io.lionweb.mps.json.test/resources/lioncore.json
index 756a2744..a02b8a50 100644
--- a/solutions/io.lionweb.mps.json.test/resources/lioncore.json
+++ b/solutions/io.lionweb.mps.json.test/resources/lioncore.json
@@ -1747,7 +1747,7 @@
             "version": "2023.1",
             "key": "Language-version"
           },
-          "value": "1"
+          "value": "2023.1"
         },
         {
           "property": {
diff --git a/solutions/io.lionweb.mps.json.test/resources/test2-keyed.json b/solutions/io.lionweb.mps.json.test/resources/test2-keyed.json
index 30fc4e6c..022de8d3 100644
--- a/solutions/io.lionweb.mps.json.test/resources/test2-keyed.json
+++ b/solutions/io.lionweb.mps.json.test/resources/test2-keyed.json
@@ -3,7 +3,7 @@
   "languages": [
     {
       "key": "My-TestLang3",
-      "version": "0"
+      "version": "00 my! VERSION 😀"
     },
     {
       "key": "NDhkMGY2ZWItNjE4Ni00Y2VjLTgzZDEtN2NhZWRiMDVhNDk0",
@@ -93,7 +93,7 @@
       "id": "{id-Plain}",
       "classifier": {
         "language": "My-TestLang3",
-        "version": "0",
+        "version": "00 my! VERSION 😀",
         "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzI1ODUzNzgxNjU5NzMyMDQxMTI"
       },
       "properties": [],
@@ -106,7 +106,7 @@
       "id": "{id-NoExtends}",
       "classifier": {
         "language": "My-TestLang3",
-        "version": "0",
+        "version": "00 my! VERSION 😀",
         "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzI1ODUzNzgxNjU5NzMyMDQ5MDM"
       },
       "properties": [],
diff --git a/solutions/io.lionweb.mps.json.test/resources/test2-unkeyed.json b/solutions/io.lionweb.mps.json.test/resources/test2-unkeyed.json
index b5ee3a28..1b8c1ab0 100644
--- a/solutions/io.lionweb.mps.json.test/resources/test2-unkeyed.json
+++ b/solutions/io.lionweb.mps.json.test/resources/test2-unkeyed.json
@@ -3,7 +3,7 @@
   "languages": [
     {
       "key": "My-TestLang3",
-      "version": "0"
+      "version": "00 my! VERSION 😀"
     },
     {
       "key": "NDhkMGY2ZWItNjE4Ni00Y2VjLTgzZDEtN2NhZWRiMDVhNDk0",
@@ -93,7 +93,7 @@
       "id": "{id-Plain}",
       "classifier": {
         "language": "My-TestLang3",
-        "version": "0",
+        "version": "00 my! VERSION 😀",
         "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzI1ODUzNzgxNjU5NzMyMDQxMTI"
       },
       "properties": [],
@@ -106,7 +106,7 @@
       "id": "{id-NoExtends}",
       "classifier": {
         "language": "My-TestLang3",
-        "version": "0",
+        "version": "00 my! VERSION 😀",
         "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzI1ODUzNzgxNjU5NzMyMDQ5MDM"
       },
       "properties": [],
diff --git a/solutions/io.lionweb.mps.json.test/resources/test3-keyed.json b/solutions/io.lionweb.mps.json.test/resources/test3-keyed.json
index 6dd474ba..fda917c8 100644
--- a/solutions/io.lionweb.mps.json.test/resources/test3-keyed.json
+++ b/solutions/io.lionweb.mps.json.test/resources/test3-keyed.json
@@ -3,7 +3,7 @@
   "languages": [
     {
       "key": "My-TestLang3",
-      "version": "0"
+      "version": "00 my! VERSION 😀"
     }
   ],
   "nodes": [
@@ -11,14 +11,14 @@
       "id": "{id-keyed}",
       "classifier": {
         "language": "My-TestLang3",
-        "version": "0",
+        "version": "00 my! VERSION 😀",
         "key": "My-Test3ConceptKeyed"
       },
       "properties": [
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzU2MDUxMjI4NDIxNTg3NDI5MzIvNTYwNTEyMjg0MjE2Mzg1NzA0OA"
           },
           "value": "My-EnumLiteralUnkeyed"
@@ -26,7 +26,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "My-KeyedProp"
           },
           "value": "My-EnumLiteralKeyed"
@@ -36,7 +36,7 @@
         {
           "containment": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzU2MDUxMjI4NDIxNTg3NDI5MzIvNTYwNTEyMjg0MjE1ODc0MjkzMw"
           },
           "children": [
@@ -46,7 +46,7 @@
         {
           "containment": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "My-KeyedChild"
           },
           "children": [
@@ -58,7 +58,7 @@
         {
           "reference": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzU2MDUxMjI4NDIxNTg3NDI5MzIvNTYwNTEyMjg0MjE2Mzg1NzA1NQ"
           },
           "targets": [
@@ -71,7 +71,7 @@
         {
           "reference": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "My-KeyedRef"
           },
           "targets": [
@@ -89,7 +89,7 @@
       "id": "{id-Plain}",
       "classifier": {
         "language": "My-TestLang3",
-        "version": "0",
+        "version": "00 my! VERSION 😀",
         "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzI1ODUzNzgxNjU5NzMyMDQxMTI"
       },
       "properties": [],
@@ -102,7 +102,7 @@
       "id": "{id-NoExtends}",
       "classifier": {
         "language": "My-TestLang3",
-        "version": "0",
+        "version": "00 my! VERSION 😀",
         "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzI1ODUzNzgxNjU5NzMyMDQ5MDM"
       },
       "properties": [],
diff --git a/solutions/io.lionweb.mps.json.test/resources/test3-unkeyed.json b/solutions/io.lionweb.mps.json.test/resources/test3-unkeyed.json
index 55ae67a1..56bcfcf1 100644
--- a/solutions/io.lionweb.mps.json.test/resources/test3-unkeyed.json
+++ b/solutions/io.lionweb.mps.json.test/resources/test3-unkeyed.json
@@ -3,7 +3,7 @@
   "languages": [
     {
       "key": "My-TestLang3",
-      "version": "0"
+      "version": "00 my! VERSION 😀"
     }
   ],
   "nodes": [
@@ -11,14 +11,14 @@
       "id": "{id-unkeyed}",
       "classifier": {
         "language": "My-TestLang3",
-        "version": "0",
+        "version": "00 my! VERSION 😀",
         "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzU2MDUxMjI4NDIxNTg3ODAyODA"
       },
       "properties": [
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzU2MDUxMjI4NDIxNTg3ODAyODAvNTYwNTEyMjg0MjE2Mzg1NzA2OA"
           },
           "value": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzU2MDUxMjI4NDIxNjM4NjMwMTIvNTYwNTEyMjg0MjE2Mzg2MzAxMw"
@@ -26,7 +26,7 @@
         {
           "property": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "My-UnkeyedProp"
           },
           "value": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzU2MDUxMjI4NDIxNjM4NjMwMTkvNTYwNTEyMjg0MjE2Mzg2MzAyMA"
@@ -36,7 +36,7 @@
         {
           "containment": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzU2MDUxMjI4NDIxNTg3ODAyODAvNTYwNTEyMjg0MjE1ODc4MDI4MQ"
           },
           "children": [
@@ -46,7 +46,7 @@
         {
           "containment": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "My-UnkeyedChild"
           },
           "children": [
@@ -58,7 +58,7 @@
         {
           "reference": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzU2MDUxMjI4NDIxNTg3ODAyODAvNTYwNTEyMjg0MjE2Mzg1NzA3NA"
           },
           "targets": [
@@ -71,7 +71,7 @@
         {
           "reference": {
             "language": "My-TestLang3",
-            "version": "0",
+            "version": "00 my! VERSION 😀",
             "key": "My-UnkeyedRef"
           },
           "targets": [
@@ -89,7 +89,7 @@
       "id": "{id-Plain}",
       "classifier": {
         "language": "My-TestLang3",
-        "version": "0",
+        "version": "00 my! VERSION 😀",
         "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzI1ODUzNzgxNjU5NzMyMDQxMTI"
       },
       "properties": [],
@@ -102,7 +102,7 @@
       "id": "{id-NoExtends}",
       "classifier": {
         "language": "My-TestLang3",
-        "version": "0",
+        "version": "00 my! VERSION 😀",
         "key": "MDk5NDkwYTMtMWUzOS00ZWQxLWJlYmMtODAyNzY2NWNlY2Y5LzI1ODUzNzgxNjU5NzMyMDQ5MDM"
       },
       "properties": [],
diff --git a/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.idmapper.mps b/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.idmapper.mps
index c6751ec1..6fd5379b 100644
--- a/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.idmapper.mps
+++ b/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.idmapper.mps
@@ -288,6 +288,39 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5M3rB6A0Hkg" role="jymVt" />
+    <node concept="3clFb_" id="6jbF0BoeZEa" role="jymVt">
+      <property role="TrG5h" value="mapLanguageVersion" />
+      <node concept="3Tm1VV" id="6jbF0BoeZEc" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0BoeZEd" role="3clF45" />
+      <node concept="37vLTG" id="6jbF0BoeZEe" role="3clF46">
+        <property role="TrG5h" value="language" />
+        <node concept="3uibUv" id="6jbF0BoeZEw" role="1tU5fm">
+          <ref role="3uigEE" to="imb3:~Language" resolve="Language" />
+        </node>
+        <node concept="2AHcQZ" id="6jbF0BoeZEg" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BoeZEh" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="3clFbS" id="6jbF0BoeZEx" role="3clF47">
+        <node concept="3clFbF" id="6jbF0BoeZE$" role="3cqZAp">
+          <node concept="2OqwBi" id="6jbF0Bof3P6" role="3clFbG">
+            <node concept="37vLTw" id="6jbF0Bof3pA" role="2Oq$k0">
+              <ref role="3cqZAo" node="6jbF0BoeZEe" resolve="language" />
+            </node>
+            <node concept="liA8E" id="6jbF0Bof5hW" role="2OqNvi">
+              <ref role="37wK5l" to="imb3:~Language.getVersion()" resolve="getVersion" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BoeZEy" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6jbF0Bof2kD" role="jymVt" />
     <node concept="3clFb_" id="5M3rB6A0Hkh" role="jymVt">
       <property role="TrG5h" value="mapClassifier" />
       <node concept="3Tm1VV" id="5M3rB6A0Hki" role="1B3o_S" />
diff --git a/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.instance.lionweb2mps.mps b/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.instance.lionweb2mps.mps
index 73e06139..a130a11e 100644
--- a/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.instance.lionweb2mps.mps
+++ b/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.instance.lionweb2mps.mps
@@ -25,6 +25,7 @@
     <import index="y7p" ref="r:3303ef0b-a58e-4f50-b3cb-bd3d7aaf3653(io.lionweb.mps.m3.runtime)" />
     <import index="faaz" ref="r:63045ba4-9612-4b7c-87f4-19d1f2840fe2(io.lionweb.mps.converter.m2.idmapper.slanguage)" />
     <import index="en45" ref="r:22b51c3d-d5d6-4746-9401-f324f9429ada(io.lionweb.mps.converter.m2)" />
+    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" implicit="true" />
     <import index="teza" ref="r:84248d29-a48a-459b-8ba9-05c71de1fb63(io.lionweb.mps.converter.m2.idmapper)" implicit="true" />
     <import index="z8iw" ref="r:dfdf3542-dbcf-43df-870a-3c3504b3c840(jetbrains.mps.baseLanguage.collections.custom)" implicit="true" />
   </imports>
@@ -7148,6 +7149,14 @@
         <ref role="3uigEE" to="faaz:6VkSF6aHm0Q" resolve="SLanguageIdExtractor" />
       </node>
     </node>
+    <node concept="312cEg" id="6jbF0BoAaGq" role="jymVt">
+      <property role="TrG5h" value="attributeFinder" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm6S6" id="6jbF0BoAaGr" role="1B3o_S" />
+      <node concept="3uibUv" id="6jbF0BoAaGt" role="1tU5fm">
+        <ref role="3uigEE" to="y7p:pPZz6cPvUw" resolve="LionWebAttributeFinder" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="6lVb1tfVmJh" role="jymVt" />
     <node concept="3clFbW" id="6lVb1tfVtvX" role="jymVt">
       <node concept="3cqZAl" id="6lVb1tfVtvY" role="3clF45" />
@@ -7220,6 +7229,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="6jbF0BoAaGu" role="3cqZAp">
+          <node concept="37vLTI" id="6jbF0BoAaGw" role="3clFbG">
+            <node concept="2OqwBi" id="6jbF0BoAev2" role="37vLTJ">
+              <node concept="Xjq3P" id="6jbF0BoAeHD" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6jbF0BoAev5" role="2OqNvi">
+                <ref role="2Oxat5" node="6jbF0BoAaGq" resolve="attributeFinder" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="6jbF0BoAaG$" role="37vLTx">
+              <ref role="3cqZAo" node="6jbF0Bo0uNq" resolve="attributeFinder" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="37vLTG" id="6lVb1tfVtww" role="3clF46">
         <property role="TrG5h" value="idMapper" />
@@ -7257,6 +7279,15 @@
           <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
         </node>
       </node>
+      <node concept="37vLTG" id="6jbF0Bo0uNq" role="3clF46">
+        <property role="TrG5h" value="attributeFinder" />
+        <node concept="3uibUv" id="6jbF0Bo0uOp" role="1tU5fm">
+          <ref role="3uigEE" to="y7p:pPZz6cPvUw" resolve="LionWebAttributeFinder" />
+        </node>
+        <node concept="2AHcQZ" id="6jbF0Bo0zUM" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="6lVb1tfWaKG" role="jymVt" />
     <node concept="3clFb_" id="6lVb1tfV3aE" role="jymVt">
@@ -7316,28 +7347,84 @@
             </node>
           </node>
         </node>
-        <node concept="3SKdUt" id="6lVb1tfV3cy" role="3cqZAp">
-          <node concept="1PaTwC" id="6lVb1tfV3cz" role="1aUNEU">
-            <node concept="3oM_SD" id="6lVb1tfV3c$" role="1PaTwD">
-              <property role="3oM_SC" value="TODO:" />
-            </node>
-            <node concept="3oM_SD" id="6lVb1tfV3c_" role="1PaTwD">
-              <property role="3oM_SC" value="Check" />
-            </node>
-            <node concept="3oM_SD" id="6lVb1tfV3cA" role="1PaTwD">
-              <property role="3oM_SC" value="if" />
+        <node concept="3clFbH" id="6jbF0Bo_Oer" role="3cqZAp" />
+        <node concept="3cpWs8" id="6jbF0BoAhBe" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoAhBf" role="3cpWs9">
+            <property role="TrG5h" value="mpsVersion" />
+            <node concept="17QB3L" id="6jbF0BoAgHq" role="1tU5fm" />
+            <node concept="2YIFZM" id="6jbF0BoAhBg" role="33vP2m">
+              <ref role="1Pybhc" to="y7p:6jTTMHD72IS" resolve="MpsLanguageUtil" />
+              <ref role="37wK5l" to="y7p:6jbF0Bo0uK5" resolve="getLanguageVersionString" />
+              <node concept="37vLTw" id="6jbF0BoAhBh" role="37wK5m">
+                <ref role="3cqZAo" node="6lVb1tfV9Yb" resolve="result" />
+              </node>
+              <node concept="37vLTw" id="6jbF0BoAhBi" role="37wK5m">
+                <ref role="3cqZAo" node="6jbF0BoAaGq" resolve="attributeFinder" />
+              </node>
             </node>
-            <node concept="3oM_SD" id="6lVb1tfV3cB" role="1PaTwD">
-              <property role="3oM_SC" value="language" />
+          </node>
+        </node>
+        <node concept="3clFbJ" id="6jbF0BoApL7" role="3cqZAp">
+          <node concept="3clFbS" id="6jbF0BoApL9" role="3clFbx">
+            <node concept="3clFbF" id="6jbF0BoADX3" role="3cqZAp">
+              <node concept="1rXfSq" id="6jbF0BoADX4" role="3clFbG">
+                <ref role="37wK5l" node="6jbF0BoADX1" resolve="logWarning" />
+                <node concept="3cpWs3" id="6jbF0BoC29h" role="37wK5m">
+                  <node concept="3cpWs3" id="6jbF0BoBWBe" role="3uHU7B">
+                    <node concept="3cpWs3" id="6jbF0BoBuGq" role="3uHU7B">
+                      <node concept="3cpWs3" id="6jbF0BoBlIC" role="3uHU7B">
+                        <node concept="3cpWs3" id="6jbF0BoB8vp" role="3uHU7B">
+                          <node concept="3cpWs3" id="6jbF0BoB182" role="3uHU7B">
+                            <node concept="Xl_RD" id="6jbF0BoAUd_" role="3uHU7B">
+                              <property role="Xl_RC" value="language " />
+                            </node>
+                            <node concept="37vLTw" id="6jbF0BoB4Yv" role="3uHU7w">
+                              <ref role="3cqZAo" node="6lVb1tfV9Yb" resolve="result" />
+                            </node>
+                          </node>
+                          <node concept="Xl_RD" id="6jbF0BoB8wl" role="3uHU7w">
+                            <property role="Xl_RC" value=": metaPointer version '" />
+                          </node>
+                        </node>
+                        <node concept="2OqwBi" id="6jbF0BoBrqq" role="3uHU7w">
+                          <node concept="37vLTw" id="6jbF0BoBnEW" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6lVb1tfV3aH" resolve="metaPointer" />
+                          </node>
+                          <node concept="liA8E" id="6jbF0BoBsZm" role="2OqNvi">
+                            <ref role="37wK5l" to="xfsv:~MetaPointer.getVersion()" resolve="getVersion" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Xl_RD" id="6jbF0BoBy$a" role="3uHU7w">
+                        <property role="Xl_RC" value="' does not match language version '" />
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="6jbF0BoBY8X" role="3uHU7w">
+                      <ref role="3cqZAo" node="6jbF0BoAhBf" resolve="mpsVersion" />
+                    </node>
+                  </node>
+                  <node concept="Xl_RD" id="6jbF0BoC93M" role="3uHU7w">
+                    <property role="Xl_RC" value="'." />
+                  </node>
+                </node>
+              </node>
             </node>
-            <node concept="3oM_SD" id="6lVb1tfV3cC" role="1PaTwD">
-              <property role="3oM_SC" value="versions" />
+          </node>
+          <node concept="17QLQc" id="6jbF0BoAwhM" role="3clFbw">
+            <node concept="2OqwBi" id="6jbF0BoA$xJ" role="3uHU7w">
+              <node concept="37vLTw" id="6jbF0BoAz36" role="2Oq$k0">
+                <ref role="3cqZAo" node="6lVb1tfV3aH" resolve="metaPointer" />
+              </node>
+              <node concept="liA8E" id="6jbF0BoACmA" role="2OqNvi">
+                <ref role="37wK5l" to="xfsv:~MetaPointer.getVersion()" resolve="getVersion" />
+              </node>
             </node>
-            <node concept="3oM_SD" id="6lVb1tfV3cD" role="1PaTwD">
-              <property role="3oM_SC" value="match" />
+            <node concept="37vLTw" id="6jbF0BoAt_m" role="3uHU7B">
+              <ref role="3cqZAo" node="6jbF0BoAhBf" resolve="mpsVersion" />
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="6jbF0BoCjIE" role="3cqZAp" />
         <node concept="3cpWs6" id="6lVb1tfV3c8" role="3cqZAp">
           <node concept="37vLTw" id="6lVb1tfV3c9" role="3cqZAk">
             <ref role="3cqZAo" node="6lVb1tfV9Yb" resolve="result" />
@@ -7351,6 +7438,32 @@
         <ref role="3uigEE" to="apzt:3zvxfLhsQ3L" resolve="IdDeserializationException" />
       </node>
     </node>
+    <node concept="2tJIrI" id="6jbF0BoALm1" role="jymVt" />
+    <node concept="3clFb_" id="6jbF0BoADX1" role="jymVt">
+      <property role="TrG5h" value="logWarning" />
+      <node concept="3clFbS" id="6jbF0BoADX2" role="3clF47">
+        <node concept="3clFbF" id="6jbF0BoCprU" role="3cqZAp">
+          <node concept="2OqwBi" id="6jbF0BoCprR" role="3clFbG">
+            <node concept="10M0yZ" id="6jbF0BoCprS" role="2Oq$k0">
+              <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+              <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
+            </node>
+            <node concept="liA8E" id="6jbF0BoCprT" role="2OqNvi">
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+              <node concept="37vLTw" id="6jbF0BoCtiu" role="37wK5m">
+                <ref role="3cqZAo" node="6jbF0BoANpb" resolve="message" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="6jbF0BoADWZ" role="3clF45" />
+      <node concept="3Tmbuc" id="6jbF0BoAHWs" role="1B3o_S" />
+      <node concept="37vLTG" id="6jbF0BoANpb" role="3clF46">
+        <property role="TrG5h" value="message" />
+        <node concept="17QB3L" id="6jbF0BoANpa" role="1tU5fm" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="6lVb1tfVeLA" role="jymVt" />
     <node concept="3clFb_" id="3Lj28wljyjE" role="jymVt">
       <property role="TrG5h" value="getOrCreateConcept" />
@@ -13092,28 +13205,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3SKdUt" id="KVKr66AgLK" role="3cqZAp">
-              <node concept="1PaTwC" id="KVKr66AgLL" role="1aUNEU">
-                <node concept="3oM_SD" id="KVKr66AgLM" role="1PaTwD">
-                  <property role="3oM_SC" value="TODO:" />
-                </node>
-                <node concept="3oM_SD" id="KVKr66AgLN" role="1PaTwD">
-                  <property role="3oM_SC" value="Check" />
-                </node>
-                <node concept="3oM_SD" id="KVKr66AgLO" role="1PaTwD">
-                  <property role="3oM_SC" value="if" />
-                </node>
-                <node concept="3oM_SD" id="KVKr66AgLP" role="1PaTwD">
-                  <property role="3oM_SC" value="language" />
-                </node>
-                <node concept="3oM_SD" id="KVKr66AgLQ" role="1PaTwD">
-                  <property role="3oM_SC" value="versions" />
-                </node>
-                <node concept="3oM_SD" id="KVKr66AgLR" role="1PaTwD">
-                  <property role="3oM_SC" value="match" />
-                </node>
-              </node>
-            </node>
             <node concept="3cpWs6" id="KVKr66xNF1" role="3cqZAp">
               <node concept="37vLTw" id="KVKr66xNF2" role="3cqZAk">
                 <ref role="3cqZAo" node="KVKr66xNET" resolve="result" />
diff --git a/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.instance.mps2lionweb.mps b/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.instance.mps2lionweb.mps
index 3169ecb5..c23a94ef 100644
--- a/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.instance.mps2lionweb.mps
+++ b/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.instance.mps2lionweb.mps
@@ -5577,70 +5577,130 @@
         </node>
       </node>
       <node concept="3clFbS" id="5s4Z0e0go9j" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BoifmR" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoifmS" role="3cpWs9">
+            <property role="TrG5h" value="staple" />
+            <node concept="3uibUv" id="6jbF0Boif7L" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:7OJcYqvKf0O" resolve="IKeyedStaple" />
+            </node>
+            <node concept="1rXfSq" id="6jbF0BoifmT" role="33vP2m">
+              <ref role="37wK5l" node="6jbF0BohVaT" resolve="extractStaple" />
+              <node concept="37vLTw" id="6jbF0BoifmU" role="37wK5m">
+                <ref role="3cqZAo" node="5s4Z0e0go9r" resolve="element" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="6jbF0Boiicf" role="3cqZAp">
+          <node concept="3clFbS" id="6jbF0Boiich" role="3clFbx">
+            <node concept="3cpWs6" id="6jbF0BoissQ" role="3cqZAp">
+              <node concept="2OqwBi" id="6jbF0BoissS" role="3cqZAk">
+                <node concept="37vLTw" id="6jbF0BoissT" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6jbF0BoifmS" resolve="staple" />
+                </node>
+                <node concept="liA8E" id="6jbF0BoissU" role="2OqNvi">
+                  <ref role="37wK5l" to="y7p:7OJcYq_s$7A" resolve="getLcLanguageKey" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="6jbF0Boimmk" role="3clFbw">
+            <node concept="10Nm6u" id="6jbF0Boinxe" role="3uHU7w" />
+            <node concept="37vLTw" id="6jbF0Boij5a" role="3uHU7B">
+              <ref role="3cqZAo" node="6jbF0BoifmS" resolve="staple" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="5s4Z0e0go9k" role="3cqZAp">
+          <node concept="2OqwBi" id="5s4Z0e0go9l" role="3cqZAk">
+            <node concept="37vLTw" id="5s4Z0e0go9m" role="2Oq$k0">
+              <ref role="3cqZAo" node="5s4Z0e0f92p" resolve="idMapper" />
+            </node>
+            <node concept="liA8E" id="5s4Z0e0go9n" role="2OqNvi">
+              <ref role="37wK5l" to="teza:5M3rB6Ae5lM" resolve="mapLanguage" />
+              <node concept="2YIFZM" id="1f4Qr8VgUFS" role="37wK5m">
+                <ref role="37wK5l" to="33ny:~Objects.requireNonNull(java.lang.Object)" resolve="requireNonNull" />
+                <ref role="1Pybhc" to="33ny:~Objects" resolve="Objects" />
+                <node concept="2OqwBi" id="5s4Z0e0gp4U" role="37wK5m">
+                  <node concept="37vLTw" id="5s4Z0e0go9t" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5s4Z0e0go9r" resolve="element" />
+                  </node>
+                  <node concept="liA8E" id="5s4Z0e0gpb$" role="2OqNvi">
+                    <ref role="37wK5l" to="c17a:~SElement.getLanguage()" resolve="getLanguage" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="1f4Qr8VdJvs" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6jbF0BohRJT" role="jymVt" />
+    <node concept="3clFb_" id="6jbF0BohVaT" role="jymVt">
+      <property role="TrG5h" value="extractStaple" />
+      <node concept="3clFbS" id="6jbF0BohVaW" role="3clF47">
         <node concept="3clFbJ" id="6Z_tmAedT2m" role="3cqZAp">
           <node concept="3clFbS" id="6Z_tmAedT2o" role="3clFbx">
             <node concept="3clFbJ" id="6Z_tmAeeK0Y" role="3cqZAp">
               <node concept="3clFbS" id="6Z_tmAeeK10" role="3clFbx">
                 <node concept="3cpWs6" id="6Z_tmAef2FX" role="3cqZAp">
-                  <node concept="2OqwBi" id="7OJcYqzcLz1" role="3cqZAk">
-                    <node concept="2OqwBi" id="7OJcYqzcDzr" role="2Oq$k0">
-                      <node concept="2OqwBi" id="7OJcYqzcBaG" role="2Oq$k0">
-                        <node concept="37vLTw" id="7OJcYqzcA9T" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3Lj28wlDSZ5" resolve="constants" />
-                        </node>
-                        <node concept="liA8E" id="7OJcYqzcCij" role="2OqNvi">
-                          <ref role="37wK5l" to="y7p:7OJcYqx1HDk" resolve="listMpsInternalClassifiers" />
-                        </node>
+                  <node concept="2OqwBi" id="7OJcYqzcDzr" role="3cqZAk">
+                    <node concept="2OqwBi" id="7OJcYqzcBaG" role="2Oq$k0">
+                      <node concept="37vLTw" id="7OJcYqzcA9T" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3Lj28wlDSZ5" resolve="constants" />
                       </node>
-                      <node concept="1z4cxt" id="7OJcYqzcELc" role="2OqNvi">
-                        <node concept="1bVj0M" id="7OJcYqzcELe" role="23t8la">
-                          <node concept="3clFbS" id="7OJcYqzcELf" role="1bW5cS">
-                            <node concept="3clFbF" id="4r3Tp$pdkV2" role="3cqZAp">
-                              <node concept="15s5l7" id="4r3Tp$peLg9" role="lGtFl">
-                                <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: equals() between objects of inconvertible types&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/6293790355739144894]&quot;;" />
-                                <property role="huDt6" value="Warning: equals() between objects of inconvertible types" />
+                      <node concept="liA8E" id="7OJcYqzcCij" role="2OqNvi">
+                        <ref role="37wK5l" to="y7p:7OJcYqx1HDk" resolve="listMpsInternalClassifiers" />
+                      </node>
+                    </node>
+                    <node concept="1z4cxt" id="7OJcYqzcELc" role="2OqNvi">
+                      <node concept="1bVj0M" id="7OJcYqzcELe" role="23t8la">
+                        <node concept="3clFbS" id="7OJcYqzcELf" role="1bW5cS">
+                          <node concept="3clFbF" id="4r3Tp$pdkV2" role="3cqZAp">
+                            <node concept="15s5l7" id="4r3Tp$peLg9" role="lGtFl">
+                              <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: equals() between objects of inconvertible types&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/6293790355739144894]&quot;;" />
+                              <property role="huDt6" value="Warning: equals() between objects of inconvertible types" />
+                            </node>
+                            <node concept="2OqwBi" id="4r3Tp$pdm00" role="3clFbG">
+                              <node concept="37vLTw" id="4r3Tp$pdkV0" role="2Oq$k0">
+                                <ref role="3cqZAo" node="4r3Tp$pcYul" resolve="sComparer" />
                               </node>
-                              <node concept="2OqwBi" id="4r3Tp$pdm00" role="3clFbG">
-                                <node concept="37vLTw" id="4r3Tp$pdkV0" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4r3Tp$pcYul" resolve="sComparer" />
-                                </node>
-                                <node concept="liA8E" id="4r3Tp$pdmTf" role="2OqNvi">
-                                  <ref role="37wK5l" to="y7p:4r3Tp$paZgH" resolve="equals" />
-                                  <node concept="10QFUN" id="4r3Tp$pdsw2" role="37wK5m">
-                                    <node concept="2OqwBi" id="4r3Tp$pdsvZ" role="10QFUP">
-                                      <node concept="37vLTw" id="4r3Tp$pdsw0" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="7OJcYqzcELg" resolve="it" />
-                                      </node>
-                                      <node concept="liA8E" id="4r3Tp$pdsw1" role="2OqNvi">
-                                        <ref role="37wK5l" to="y7p:7OJcYqvKizN" resolve="getSlang" />
-                                      </node>
+                              <node concept="liA8E" id="4r3Tp$pdmTf" role="2OqNvi">
+                                <ref role="37wK5l" to="y7p:4r3Tp$paZgH" resolve="equals" />
+                                <node concept="10QFUN" id="4r3Tp$pdsw2" role="37wK5m">
+                                  <node concept="2OqwBi" id="4r3Tp$pdsvZ" role="10QFUP">
+                                    <node concept="37vLTw" id="4r3Tp$pdsw0" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="7OJcYqzcELg" resolve="it" />
                                     </node>
-                                    <node concept="3uibUv" id="4r3Tp$pdsvW" role="10QFUM">
-                                      <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
+                                    <node concept="liA8E" id="4r3Tp$pdsw1" role="2OqNvi">
+                                      <ref role="37wK5l" to="y7p:7OJcYqvKizN" resolve="getSlang" />
                                     </node>
                                   </node>
-                                  <node concept="10QFUN" id="4r3Tp$pd$ka" role="37wK5m">
-                                    <node concept="37vLTw" id="4r3Tp$pd$k9" role="10QFUP">
-                                      <ref role="3cqZAo" node="5s4Z0e0go9r" resolve="element" />
-                                    </node>
-                                    <node concept="3uibUv" id="4r3Tp$pd$k6" role="10QFUM">
-                                      <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
-                                    </node>
+                                  <node concept="3uibUv" id="4r3Tp$pdsvW" role="10QFUM">
+                                    <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
+                                  </node>
+                                </node>
+                                <node concept="10QFUN" id="4r3Tp$pd$ka" role="37wK5m">
+                                  <node concept="37vLTw" id="4r3Tp$pd$k9" role="10QFUP">
+                                    <ref role="3cqZAo" node="6jbF0BohWb3" resolve="element" />
+                                  </node>
+                                  <node concept="3uibUv" id="4r3Tp$pd$k6" role="10QFUM">
+                                    <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="7OJcYqzcELg" role="1bW2Oz">
-                            <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="7OJcYqzcELh" role="1tU5fm" />
-                          </node>
+                        </node>
+                        <node concept="Rh6nW" id="7OJcYqzcELg" role="1bW2Oz">
+                          <property role="TrG5h" value="it" />
+                          <node concept="2jxLKc" id="7OJcYqzcELh" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="7OJcYqzcMCD" role="2OqNvi">
-                      <ref role="37wK5l" to="y7p:7OJcYq_s$7A" resolve="getLcLanguageKey" />
-                    </node>
                   </node>
                 </node>
               </node>
@@ -5649,72 +5709,67 @@
                   <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
                 </node>
                 <node concept="37vLTw" id="6Z_tmAeeL1L" role="2ZW6bz">
-                  <ref role="3cqZAo" node="5s4Z0e0go9r" resolve="element" />
+                  <ref role="3cqZAo" node="6jbF0BohWb3" resolve="element" />
                 </node>
               </node>
             </node>
             <node concept="3clFbJ" id="6Z_tmAef3eD" role="3cqZAp">
               <node concept="3clFbS" id="6Z_tmAef3eF" role="3clFbx">
                 <node concept="3cpWs6" id="6Z_tmAef6wu" role="3cqZAp">
-                  <node concept="2OqwBi" id="7OJcYqzcVFO" role="3cqZAk">
-                    <node concept="2OqwBi" id="7OJcYqzcVFP" role="2Oq$k0">
-                      <node concept="2OqwBi" id="7OJcYqzcVFQ" role="2Oq$k0">
-                        <node concept="37vLTw" id="7OJcYqzcVFR" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3Lj28wlDSZ5" resolve="constants" />
-                        </node>
-                        <node concept="liA8E" id="7OJcYqzcVFS" role="2OqNvi">
-                          <ref role="37wK5l" to="y7p:7OJcYqx0tbv" resolve="listLcPrimitiveTypes" />
-                        </node>
+                  <node concept="2OqwBi" id="7OJcYqzcVFP" role="3cqZAk">
+                    <node concept="2OqwBi" id="7OJcYqzcVFQ" role="2Oq$k0">
+                      <node concept="37vLTw" id="7OJcYqzcVFR" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3Lj28wlDSZ5" resolve="constants" />
+                      </node>
+                      <node concept="liA8E" id="7OJcYqzcVFS" role="2OqNvi">
+                        <ref role="37wK5l" to="y7p:7OJcYqx0tbv" resolve="listLcPrimitiveTypes" />
                       </node>
-                      <node concept="1z4cxt" id="7OJcYqzcVFT" role="2OqNvi">
-                        <node concept="1bVj0M" id="7OJcYqzcVFU" role="23t8la">
-                          <node concept="3clFbS" id="7OJcYqzcVFV" role="1bW5cS">
-                            <node concept="3clFbF" id="4r3Tp$pdvvw" role="3cqZAp">
-                              <node concept="15s5l7" id="4r3Tp$peMwD" role="lGtFl">
-                                <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: equals() between objects of inconvertible types&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/6293790355739144894]&quot;;" />
-                                <property role="huDt6" value="Warning: equals() between objects of inconvertible types" />
+                    </node>
+                    <node concept="1z4cxt" id="7OJcYqzcVFT" role="2OqNvi">
+                      <node concept="1bVj0M" id="7OJcYqzcVFU" role="23t8la">
+                        <node concept="3clFbS" id="7OJcYqzcVFV" role="1bW5cS">
+                          <node concept="3clFbF" id="4r3Tp$pdvvw" role="3cqZAp">
+                            <node concept="15s5l7" id="4r3Tp$peMwD" role="lGtFl">
+                              <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: equals() between objects of inconvertible types&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/6293790355739144894]&quot;;" />
+                              <property role="huDt6" value="Warning: equals() between objects of inconvertible types" />
+                            </node>
+                            <node concept="2OqwBi" id="4r3Tp$pdvvy" role="3clFbG">
+                              <node concept="37vLTw" id="4r3Tp$pdvvz" role="2Oq$k0">
+                                <ref role="3cqZAo" node="4r3Tp$pcYul" resolve="sComparer" />
                               </node>
-                              <node concept="2OqwBi" id="4r3Tp$pdvvy" role="3clFbG">
-                                <node concept="37vLTw" id="4r3Tp$pdvvz" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4r3Tp$pcYul" resolve="sComparer" />
-                                </node>
-                                <node concept="liA8E" id="4r3Tp$pdvv$" role="2OqNvi">
-                                  <ref role="37wK5l" to="y7p:4r3Tp$pb180" resolve="equals" />
-                                  <node concept="10QFUN" id="4r3Tp$pdvv_" role="37wK5m">
-                                    <node concept="2OqwBi" id="4r3Tp$pdvvA" role="10QFUP">
-                                      <node concept="37vLTw" id="4r3Tp$pdvvB" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="7OJcYqzcVG2" resolve="it" />
-                                      </node>
-                                      <node concept="liA8E" id="4r3Tp$pdvvC" role="2OqNvi">
-                                        <ref role="37wK5l" to="y7p:7OJcYqvKizN" resolve="getSlang" />
-                                      </node>
+                              <node concept="liA8E" id="4r3Tp$pdvv$" role="2OqNvi">
+                                <ref role="37wK5l" to="y7p:4r3Tp$pb180" resolve="equals" />
+                                <node concept="10QFUN" id="4r3Tp$pdvv_" role="37wK5m">
+                                  <node concept="2OqwBi" id="4r3Tp$pdvvA" role="10QFUP">
+                                    <node concept="37vLTw" id="4r3Tp$pdvvB" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="7OJcYqzcVG2" resolve="it" />
                                     </node>
-                                    <node concept="3uibUv" id="4r3Tp$pdvvD" role="10QFUM">
-                                      <ref role="3uigEE" to="c17a:~SDataType" resolve="SDataType" />
+                                    <node concept="liA8E" id="4r3Tp$pdvvC" role="2OqNvi">
+                                      <ref role="37wK5l" to="y7p:7OJcYqvKizN" resolve="getSlang" />
                                     </node>
                                   </node>
-                                  <node concept="10QFUN" id="4r3Tp$pdCTi" role="37wK5m">
-                                    <node concept="37vLTw" id="4r3Tp$pdCTh" role="10QFUP">
-                                      <ref role="3cqZAo" node="5s4Z0e0go9r" resolve="element" />
-                                    </node>
-                                    <node concept="3uibUv" id="4r3Tp$pdCTe" role="10QFUM">
-                                      <ref role="3uigEE" to="c17a:~SDataType" resolve="SDataType" />
-                                    </node>
+                                  <node concept="3uibUv" id="4r3Tp$pdvvD" role="10QFUM">
+                                    <ref role="3uigEE" to="c17a:~SDataType" resolve="SDataType" />
+                                  </node>
+                                </node>
+                                <node concept="10QFUN" id="4r3Tp$pdCTi" role="37wK5m">
+                                  <node concept="37vLTw" id="4r3Tp$pdCTh" role="10QFUP">
+                                    <ref role="3cqZAo" node="6jbF0BohWb3" resolve="element" />
+                                  </node>
+                                  <node concept="3uibUv" id="4r3Tp$pdCTe" role="10QFUM">
+                                    <ref role="3uigEE" to="c17a:~SDataType" resolve="SDataType" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="7OJcYqzcVG2" role="1bW2Oz">
-                            <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="7OJcYqzcVG3" role="1tU5fm" />
-                          </node>
+                        </node>
+                        <node concept="Rh6nW" id="7OJcYqzcVG2" role="1bW2Oz">
+                          <property role="TrG5h" value="it" />
+                          <node concept="2jxLKc" id="7OJcYqzcVG3" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="7OJcYqzcVG4" role="2OqNvi">
-                      <ref role="37wK5l" to="y7p:7OJcYq_s$7A" resolve="getLcLanguageKey" />
-                    </node>
                   </node>
                 </node>
               </node>
@@ -5723,72 +5778,67 @@
                   <ref role="3uigEE" to="c17a:~SDataType" resolve="SDataType" />
                 </node>
                 <node concept="37vLTw" id="6Z_tmAef4ib" role="2ZW6bz">
-                  <ref role="3cqZAo" node="5s4Z0e0go9r" resolve="element" />
+                  <ref role="3cqZAo" node="6jbF0BohWb3" resolve="element" />
                 </node>
               </node>
             </node>
             <node concept="3clFbJ" id="6Z_tmAegzvh" role="3cqZAp">
               <node concept="3clFbS" id="6Z_tmAegzvj" role="3clFbx">
                 <node concept="3cpWs6" id="6Z_tmAegArS" role="3cqZAp">
-                  <node concept="2OqwBi" id="7OJcYqzcXSs" role="3cqZAk">
-                    <node concept="2OqwBi" id="7OJcYqzcXSt" role="2Oq$k0">
-                      <node concept="2OqwBi" id="7OJcYqzcXSu" role="2Oq$k0">
-                        <node concept="37vLTw" id="7OJcYqzcXSv" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3Lj28wlDSZ5" resolve="constants" />
-                        </node>
-                        <node concept="liA8E" id="7OJcYqzcXSw" role="2OqNvi">
-                          <ref role="37wK5l" to="y7p:7OJcYqx2zDi" resolve="listMpsInternalFeatures" />
-                        </node>
+                  <node concept="2OqwBi" id="7OJcYqzcXSt" role="3cqZAk">
+                    <node concept="2OqwBi" id="7OJcYqzcXSu" role="2Oq$k0">
+                      <node concept="37vLTw" id="7OJcYqzcXSv" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3Lj28wlDSZ5" resolve="constants" />
+                      </node>
+                      <node concept="liA8E" id="7OJcYqzcXSw" role="2OqNvi">
+                        <ref role="37wK5l" to="y7p:7OJcYqx2zDi" resolve="listMpsInternalFeatures" />
                       </node>
-                      <node concept="1z4cxt" id="7OJcYqzcXSx" role="2OqNvi">
-                        <node concept="1bVj0M" id="7OJcYqzcXSy" role="23t8la">
-                          <node concept="3clFbS" id="7OJcYqzcXSz" role="1bW5cS">
-                            <node concept="3clFbF" id="7OJcYqzcXS$" role="3cqZAp">
-                              <node concept="15s5l7" id="4r3Tp$peNOG" role="lGtFl">
-                                <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: equals() between objects of inconvertible types&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/6293790355739144894]&quot;;" />
-                                <property role="huDt6" value="Warning: equals() between objects of inconvertible types" />
+                    </node>
+                    <node concept="1z4cxt" id="7OJcYqzcXSx" role="2OqNvi">
+                      <node concept="1bVj0M" id="7OJcYqzcXSy" role="23t8la">
+                        <node concept="3clFbS" id="7OJcYqzcXSz" role="1bW5cS">
+                          <node concept="3clFbF" id="7OJcYqzcXS$" role="3cqZAp">
+                            <node concept="15s5l7" id="4r3Tp$peNOG" role="lGtFl">
+                              <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: equals() between objects of inconvertible types&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/6293790355739144894]&quot;;" />
+                              <property role="huDt6" value="Warning: equals() between objects of inconvertible types" />
+                            </node>
+                            <node concept="2OqwBi" id="4r3Tp$pdKD2" role="3clFbG">
+                              <node concept="37vLTw" id="4r3Tp$pdKD3" role="2Oq$k0">
+                                <ref role="3cqZAo" node="4r3Tp$pcYul" resolve="sComparer" />
                               </node>
-                              <node concept="2OqwBi" id="4r3Tp$pdKD2" role="3clFbG">
-                                <node concept="37vLTw" id="4r3Tp$pdKD3" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4r3Tp$pcYul" resolve="sComparer" />
-                                </node>
-                                <node concept="liA8E" id="4r3Tp$pdKD4" role="2OqNvi">
-                                  <ref role="37wK5l" to="y7p:4r3Tp$paZj3" resolve="equals" />
-                                  <node concept="10QFUN" id="4r3Tp$pdKD5" role="37wK5m">
-                                    <node concept="2OqwBi" id="4r3Tp$pdKD6" role="10QFUP">
-                                      <node concept="37vLTw" id="4r3Tp$pdKD7" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="7OJcYqzcXSE" resolve="it" />
-                                      </node>
-                                      <node concept="liA8E" id="4r3Tp$pdKD8" role="2OqNvi">
-                                        <ref role="37wK5l" to="y7p:7OJcYqvKizN" resolve="getSlang" />
-                                      </node>
+                              <node concept="liA8E" id="4r3Tp$pdKD4" role="2OqNvi">
+                                <ref role="37wK5l" to="y7p:4r3Tp$paZj3" resolve="equals" />
+                                <node concept="10QFUN" id="4r3Tp$pdKD5" role="37wK5m">
+                                  <node concept="2OqwBi" id="4r3Tp$pdKD6" role="10QFUP">
+                                    <node concept="37vLTw" id="4r3Tp$pdKD7" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="7OJcYqzcXSE" resolve="it" />
                                     </node>
-                                    <node concept="3uibUv" id="4r3Tp$pdKD9" role="10QFUM">
-                                      <ref role="3uigEE" to="c17a:~SConceptFeature" resolve="SConceptFeature" />
+                                    <node concept="liA8E" id="4r3Tp$pdKD8" role="2OqNvi">
+                                      <ref role="37wK5l" to="y7p:7OJcYqvKizN" resolve="getSlang" />
                                     </node>
                                   </node>
-                                  <node concept="10QFUN" id="4r3Tp$pdKDa" role="37wK5m">
-                                    <node concept="37vLTw" id="4r3Tp$pdKDb" role="10QFUP">
-                                      <ref role="3cqZAo" node="5s4Z0e0go9r" resolve="element" />
-                                    </node>
-                                    <node concept="3uibUv" id="4r3Tp$pdKDc" role="10QFUM">
-                                      <ref role="3uigEE" to="c17a:~SConceptFeature" resolve="SConceptFeature" />
-                                    </node>
+                                  <node concept="3uibUv" id="4r3Tp$pdKD9" role="10QFUM">
+                                    <ref role="3uigEE" to="c17a:~SConceptFeature" resolve="SConceptFeature" />
+                                  </node>
+                                </node>
+                                <node concept="10QFUN" id="4r3Tp$pdKDa" role="37wK5m">
+                                  <node concept="37vLTw" id="4r3Tp$pdKDb" role="10QFUP">
+                                    <ref role="3cqZAo" node="6jbF0BohWb3" resolve="element" />
+                                  </node>
+                                  <node concept="3uibUv" id="4r3Tp$pdKDc" role="10QFUM">
+                                    <ref role="3uigEE" to="c17a:~SConceptFeature" resolve="SConceptFeature" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="7OJcYqzcXSE" role="1bW2Oz">
-                            <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="7OJcYqzcXSF" role="1tU5fm" />
-                          </node>
+                        </node>
+                        <node concept="Rh6nW" id="7OJcYqzcXSE" role="1bW2Oz">
+                          <property role="TrG5h" value="it" />
+                          <node concept="2jxLKc" id="7OJcYqzcXSF" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="7OJcYqzcXSG" role="2OqNvi">
-                      <ref role="37wK5l" to="y7p:7OJcYq_s$7A" resolve="getLcLanguageKey" />
-                    </node>
                   </node>
                 </node>
               </node>
@@ -5797,7 +5847,7 @@
                   <ref role="3uigEE" to="c17a:~SConceptFeature" resolve="SConceptFeature" />
                 </node>
                 <node concept="37vLTw" id="6Z_tmAeg$4s" role="2ZW6bz">
-                  <ref role="3cqZAo" node="5s4Z0e0go9r" resolve="element" />
+                  <ref role="3cqZAo" node="6jbF0BohWb3" resolve="element" />
                 </node>
               </node>
             </node>
@@ -5809,36 +5859,31 @@
             <node concept="liA8E" id="6Z_tmAedVgQ" role="2OqNvi">
               <ref role="37wK5l" to="y7p:5JNiskiswUo" resolve="isMpsInternalElement" />
               <node concept="37vLTw" id="6Z_tmAedVKy" role="37wK5m">
-                <ref role="3cqZAo" node="5s4Z0e0go9r" resolve="element" />
+                <ref role="3cqZAo" node="6jbF0BohWb3" resolve="element" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="5s4Z0e0go9k" role="3cqZAp">
-          <node concept="2OqwBi" id="5s4Z0e0go9l" role="3cqZAk">
-            <node concept="37vLTw" id="5s4Z0e0go9m" role="2Oq$k0">
-              <ref role="3cqZAo" node="5s4Z0e0f92p" resolve="idMapper" />
-            </node>
-            <node concept="liA8E" id="5s4Z0e0go9n" role="2OqNvi">
-              <ref role="37wK5l" to="teza:5M3rB6Ae5lM" resolve="mapLanguage" />
-              <node concept="2YIFZM" id="1f4Qr8VgUFS" role="37wK5m">
-                <ref role="37wK5l" to="33ny:~Objects.requireNonNull(java.lang.Object)" resolve="requireNonNull" />
-                <ref role="1Pybhc" to="33ny:~Objects" resolve="Objects" />
-                <node concept="2OqwBi" id="5s4Z0e0gp4U" role="37wK5m">
-                  <node concept="37vLTw" id="5s4Z0e0go9t" role="2Oq$k0">
-                    <ref role="3cqZAo" node="5s4Z0e0go9r" resolve="element" />
-                  </node>
-                  <node concept="liA8E" id="5s4Z0e0gpb$" role="2OqNvi">
-                    <ref role="37wK5l" to="c17a:~SElement.getLanguage()" resolve="getLanguage" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
+        <node concept="3clFbH" id="6jbF0Boi9HZ" role="3cqZAp" />
+        <node concept="3cpWs6" id="6jbF0BoibrU" role="3cqZAp">
+          <node concept="10Nm6u" id="6jbF0BoibtK" role="3cqZAk" />
         </node>
       </node>
-      <node concept="2AHcQZ" id="1f4Qr8VdJvs" role="2AJF6D">
-        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+      <node concept="3Tm6S6" id="6jbF0BohTPR" role="1B3o_S" />
+      <node concept="3uibUv" id="6jbF0BohV43" role="3clF45">
+        <ref role="3uigEE" to="y7p:7OJcYqvKf0O" resolve="IKeyedStaple" />
+      </node>
+      <node concept="37vLTG" id="6jbF0BohWb3" role="3clF46">
+        <property role="TrG5h" value="element" />
+        <node concept="3uibUv" id="6jbF0BohWb2" role="1tU5fm">
+          <ref role="3uigEE" to="c17a:~SElement" resolve="SElement" />
+        </node>
+        <node concept="2AHcQZ" id="6jbF0BohXjg" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BohXvH" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
       </node>
     </node>
     <node concept="2tJIrI" id="5s4Z0e0gp$G" role="jymVt" />
@@ -5856,127 +5901,56 @@
         </node>
       </node>
       <node concept="3clFbS" id="5s4Z0e0gpye" role="3clF47">
-        <node concept="3cpWs8" id="1ryFPTS4LVW" role="3cqZAp">
-          <node concept="3cpWsn" id="1ryFPTS4LVX" role="3cpWs9">
-            <property role="TrG5h" value="languageKey" />
-            <node concept="17QB3L" id="1ryFPTS4LMe" role="1tU5fm" />
-            <node concept="1rXfSq" id="1ryFPTS4LVY" role="33vP2m">
-              <ref role="37wK5l" node="5s4Z0e0go9v" resolve="extractLanguageKey" />
-              <node concept="37vLTw" id="1ryFPTS4LVZ" role="37wK5m">
-                <ref role="3cqZAo" node="5s4Z0e0gpyc" resolve="element" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="1ryFPTS4Olu" role="3cqZAp" />
-        <node concept="3SKdUt" id="1ryFPTS6KMg" role="3cqZAp">
-          <node concept="1PaTwC" id="1ryFPTS6KMh" role="1aUNEU">
-            <node concept="3oM_SD" id="1ryFPTS6Lix" role="1PaTwD">
-              <property role="3oM_SC" value="TODO" />
-            </node>
-            <node concept="3oM_SD" id="1ryFPTS6Liz" role="1PaTwD">
-              <property role="3oM_SC" value="maybe" />
-            </node>
-            <node concept="3oM_SD" id="1ryFPTS6LiA" role="1PaTwD">
-              <property role="3oM_SC" value="move" />
-            </node>
-            <node concept="3oM_SD" id="1ryFPTS6LiE" role="1PaTwD">
-              <property role="3oM_SC" value="this" />
-            </node>
-            <node concept="3oM_SD" id="1ryFPTS6LiJ" role="1PaTwD">
-              <property role="3oM_SC" value="logic" />
-            </node>
-            <node concept="3oM_SD" id="1ryFPTS6LiP" role="1PaTwD">
-              <property role="3oM_SC" value="to" />
-            </node>
-            <node concept="3oM_SD" id="1ryFPTS6LiW" role="1PaTwD">
-              <property role="3oM_SC" value="idMapper?" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="7OJcYqzdfSj" role="3cqZAp">
-          <node concept="3cpWsn" id="7OJcYqzdfSk" role="3cpWs9">
+        <node concept="3cpWs8" id="6jbF0BoiufL" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BoiufM" role="3cpWs9">
             <property role="TrG5h" value="staple" />
-            <node concept="3uibUv" id="7OJcYqzdfDj" role="1tU5fm">
-              <ref role="3uigEE" to="y7p:7OJcYqvMQ8$" resolve="LanguageStaple" />
+            <node concept="3uibUv" id="6jbF0BoiufN" role="1tU5fm">
+              <ref role="3uigEE" to="y7p:7OJcYqvKf0O" resolve="IKeyedStaple" />
             </node>
-            <node concept="2OqwBi" id="7OJcYqzdfSl" role="33vP2m">
-              <node concept="2OqwBi" id="7OJcYqzdfSm" role="2Oq$k0">
-                <node concept="37vLTw" id="7OJcYqzdfSn" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3Lj28wlDSZ5" resolve="constants" />
-                </node>
-                <node concept="liA8E" id="7OJcYqzdfSo" role="2OqNvi">
-                  <ref role="37wK5l" to="y7p:7OJcYqwXhGH" resolve="listLcLanguages" />
-                </node>
-              </node>
-              <node concept="1z4cxt" id="7OJcYqzdfSp" role="2OqNvi">
-                <node concept="1bVj0M" id="7OJcYqzdfSq" role="23t8la">
-                  <node concept="3clFbS" id="7OJcYqzdfSr" role="1bW5cS">
-                    <node concept="3clFbF" id="7OJcYqzdfSs" role="3cqZAp">
-                      <node concept="17R0WA" id="7OJcYqzdfSt" role="3clFbG">
-                        <node concept="37vLTw" id="7OJcYqzdfSu" role="3uHU7w">
-                          <ref role="3cqZAo" node="1ryFPTS4LVX" resolve="languageKey" />
-                        </node>
-                        <node concept="2OqwBi" id="7OJcYqzdfSv" role="3uHU7B">
-                          <node concept="37vLTw" id="7OJcYqzdfSw" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7OJcYqzdfSy" resolve="it" />
-                          </node>
-                          <node concept="liA8E" id="7OJcYqzdfSx" role="2OqNvi">
-                            <ref role="37wK5l" to="y7p:7OJcYqvKqdu" resolve="getLcKey" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="Rh6nW" id="7OJcYqzdfSy" role="1bW2Oz">
-                    <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7OJcYqzdfSz" role="1tU5fm" />
-                  </node>
-                </node>
+            <node concept="1rXfSq" id="6jbF0BoiufO" role="33vP2m">
+              <ref role="37wK5l" node="6jbF0BohVaT" resolve="extractStaple" />
+              <node concept="37vLTw" id="6jbF0BoiufP" role="37wK5m">
+                <ref role="3cqZAo" node="5s4Z0e0gpyc" resolve="element" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="1ryFPTS6_bF" role="3cqZAp">
-          <node concept="3clFbS" id="1ryFPTS6_bH" role="3clFbx">
-            <node concept="3cpWs6" id="1ryFPTS6C2w" role="3cqZAp">
-              <node concept="2OqwBi" id="7OJcYqzdszs" role="3cqZAk">
-                <node concept="37vLTw" id="7OJcYqzdrs2" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7OJcYqzdfSk" resolve="staple" />
+        <node concept="3clFbJ" id="6jbF0BoiufQ" role="3cqZAp">
+          <node concept="3clFbS" id="6jbF0BoiufR" role="3clFbx">
+            <node concept="3cpWs6" id="6jbF0BoiufS" role="3cqZAp">
+              <node concept="2OqwBi" id="6jbF0BoiufT" role="3cqZAk">
+                <node concept="37vLTw" id="6jbF0BoiufU" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6jbF0BoiufM" resolve="staple" />
                 </node>
-                <node concept="liA8E" id="7OJcYqzdu03" role="2OqNvi">
-                  <ref role="37wK5l" to="y7p:7OJcYqvN0Qp" resolve="getLcVersion" />
+                <node concept="liA8E" id="6jbF0BoiufV" role="2OqNvi">
+                  <ref role="37wK5l" to="y7p:6jbF0Boix1I" resolve="getLcLanguageVersion" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3y3z36" id="7OJcYqzdpdx" role="3clFbw">
-            <node concept="10Nm6u" id="7OJcYqzdqzV" role="3uHU7w" />
-            <node concept="37vLTw" id="7OJcYqzdo7q" role="3uHU7B">
-              <ref role="3cqZAo" node="7OJcYqzdfSk" resolve="staple" />
+          <node concept="3y3z36" id="6jbF0BoiufW" role="3clFbw">
+            <node concept="10Nm6u" id="6jbF0BoiufX" role="3uHU7w" />
+            <node concept="37vLTw" id="6jbF0BoiufY" role="3uHU7B">
+              <ref role="3cqZAo" node="6jbF0BoiufM" resolve="staple" />
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="1ryFPTS4P1m" role="3cqZAp" />
-        <node concept="3cpWs6" id="5s4Z0e0gpyf" role="3cqZAp">
-          <node concept="15s5l7" id="1f4Qr8WLKeM" role="lGtFl">
-            <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: getLanguageVersion():int is deprecated&quot;;FLAVOUR_RULE_ID=&quot;[r:cec599e3-51d2-48a7-af31-989e3cbd593c(jetbrains.mps.lang.core.typesystem)/1225207423729]&quot;;" />
-            <property role="huDt6" value="Warning: getLanguageVersion():int is deprecated" />
-          </node>
-          <node concept="2YIFZM" id="5s4Z0e0gqe3" role="3cqZAk">
-            <ref role="37wK5l" to="wyt6:~Integer.toString(int)" resolve="toString" />
-            <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
-            <node concept="2YIFZM" id="5JNiskiLBP5" role="37wK5m">
-              <ref role="37wK5l" to="y7p:6jTTMHD72KX" resolve="getLanguageVersion" />
-              <ref role="1Pybhc" to="y7p:6jTTMHD72IS" resolve="MpsLanguageUtil" />
-              <node concept="2YIFZM" id="1f4Qr8VgVn1" role="37wK5m">
-                <ref role="1Pybhc" to="33ny:~Objects" resolve="Objects" />
+        <node concept="3clFbH" id="6jbF0Bosc9D" role="3cqZAp" />
+        <node concept="3cpWs6" id="6jbF0BoiufZ" role="3cqZAp">
+          <node concept="2OqwBi" id="6jbF0Boiug0" role="3cqZAk">
+            <node concept="37vLTw" id="6jbF0Boiug1" role="2Oq$k0">
+              <ref role="3cqZAo" node="5s4Z0e0f92p" resolve="idMapper" />
+            </node>
+            <node concept="liA8E" id="6jbF0Boiug2" role="2OqNvi">
+              <ref role="37wK5l" to="teza:6jbF0BoeFMx" resolve="mapLanguageVersion" />
+              <node concept="2YIFZM" id="6jbF0Boiug3" role="37wK5m">
                 <ref role="37wK5l" to="33ny:~Objects.requireNonNull(java.lang.Object)" resolve="requireNonNull" />
-                <node concept="2OqwBi" id="1f4Qr8VgVn2" role="37wK5m">
-                  <node concept="37vLTw" id="1f4Qr8VgVn3" role="2Oq$k0">
+                <ref role="1Pybhc" to="33ny:~Objects" resolve="Objects" />
+                <node concept="2OqwBi" id="6jbF0Boiug4" role="37wK5m">
+                  <node concept="37vLTw" id="6jbF0Boiug5" role="2Oq$k0">
                     <ref role="3cqZAo" node="5s4Z0e0gpyc" resolve="element" />
                   </node>
-                  <node concept="liA8E" id="1f4Qr8VgVn4" role="2OqNvi">
+                  <node concept="liA8E" id="6jbF0Boiug6" role="2OqNvi">
                     <ref role="37wK5l" to="c17a:~SElement.getLanguage()" resolve="getLanguage" />
                   </node>
                 </node>
diff --git a/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.language.mps b/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.language.mps
index 3213ee26..8cff2268 100644
--- a/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.language.mps
+++ b/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.language.mps
@@ -2023,21 +2023,23 @@
             </node>
             <node concept="liA8E" id="2chztJeIYtE" role="2OqNvi">
               <ref role="37wK5l" to="imb3:~Language.setVersion(java.lang.String)" resolve="setVersion" />
-              <node concept="2YIFZM" id="2chztJeJ8dp" role="37wK5m">
-                <ref role="37wK5l" to="wyt6:~Integer.toString(int)" resolve="toString" />
-                <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
-                <node concept="2YIFZM" id="5JNiskiLBP6" role="37wK5m">
-                  <ref role="37wK5l" to="y7p:6jTTMHD72KX" resolve="getLanguageVersion" />
-                  <ref role="1Pybhc" to="y7p:6jTTMHD72IS" resolve="MpsLanguageUtil" />
-                  <node concept="37vLTw" id="6jTTMHD81ew" role="37wK5m">
+              <node concept="2YIFZM" id="6jbF0Bo0HQI" role="37wK5m">
+                <ref role="1Pybhc" to="y7p:6jTTMHD72IS" resolve="MpsLanguageUtil" />
+                <ref role="37wK5l" to="y7p:6jbF0Bo0uK5" resolve="getLanguageVersionString" />
+                <node concept="2YIFZM" id="6jbF0Bo0HQJ" role="37wK5m">
+                  <ref role="37wK5l" to="33ny:~Objects.requireNonNull(java.lang.Object)" resolve="requireNonNull" />
+                  <ref role="1Pybhc" to="33ny:~Objects" resolve="Objects" />
+                  <node concept="37vLTw" id="6jbF0Bo1eMG" role="37wK5m">
                     <ref role="3cqZAo" node="48csSBNReDf" resolve="mps" />
                   </node>
                 </node>
+                <node concept="37vLTw" id="6jbF0Bo0HQN" role="37wK5m">
+                  <ref role="3cqZAo" node="5AGBwuFaSOK" resolve="attributeFinder" />
+                </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="48csSBPPFpP" role="3cqZAp" />
       </node>
       <node concept="3uibUv" id="48csSBPG5Gf" role="3clF45">
         <ref role="3uigEE" to="imb3:~Language" resolve="Language" />
@@ -2056,6 +2058,7 @@
         <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
       </node>
     </node>
+    <node concept="2tJIrI" id="6jbF0Bo1XQH" role="jymVt" />
     <node concept="3clFb_" id="48csSBNReDh" role="jymVt">
       <property role="TrG5h" value="linkLanguage" />
       <node concept="3clFbS" id="48csSBNReDi" role="3clF47">
diff --git a/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.mps b/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.mps
index 59d2503a..0a944bb7 100644
--- a/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.mps
+++ b/solutions/io.lionweb.mps.json/models/io.lionweb.mps.json.mps
@@ -78,12 +78,17 @@
       <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
         <child id="1145553007750" name="creator" index="2ShVmc" />
       </concept>
-      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
+      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P">
+        <reference id="1182955020723" name="classConcept" index="1HBi2w" />
+      </concept>
       <concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
       <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="4952749571008284462" name="jetbrains.mps.baseLanguage.structure.CatchVariable" flags="ng" index="XOnhg" />
+      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
+        <child id="1182160096073" name="cls" index="YeSDq" />
+      </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" />
@@ -228,6 +233,9 @@
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
       <concept id="1178893518978" name="jetbrains.mps.baseLanguage.structure.ThisConstructorInvocation" flags="nn" index="1VxSAg" />
+      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
+        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+      </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">
@@ -4971,19 +4979,55 @@
               <ref role="3uigEE" to="pe0e:3Lj28wlz81B" resolve="IMetaPointerConverter" />
             </node>
             <node concept="2ShNRf" id="1xqd6ptu0S7" role="33vP2m">
-              <node concept="1pGfFk" id="1xqd6ptu0S8" role="2ShVmc">
-                <ref role="37wK5l" to="pe0e:6lVb1tfVtvX" resolve="MetaPointerConverter" />
-                <node concept="37vLTw" id="1xqd6ptu0S9" role="37wK5m">
-                  <ref role="3cqZAo" node="1xqd6ptu0RI" resolve="jsonKeyMapper" />
-                </node>
-                <node concept="37vLTw" id="1xqd6ptu0Sa" role="37wK5m">
-                  <ref role="3cqZAo" node="1xqd6ptu0RV" resolve="metaAdapterFactoryHelper" />
-                </node>
-                <node concept="37vLTw" id="1xqd6ptu0Sb" role="37wK5m">
-                  <ref role="3cqZAo" node="1xqd6ptu0S0" resolve="metaPointerPostprocessor" />
-                </node>
-                <node concept="37vLTw" id="3M8YG$dhmx6" role="37wK5m">
-                  <ref role="3cqZAo" node="3M8YG$dhl3_" resolve="sLanguageIdExtractor" />
+              <node concept="YeOm9" id="6jbF0BoEQi0" role="2ShVmc">
+                <node concept="1Y3b0j" id="6jbF0BoEQi3" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <ref role="37wK5l" to="pe0e:6lVb1tfVtvX" resolve="MetaPointerConverter" />
+                  <ref role="1Y3XeK" to="pe0e:6lVb1tfUY2A" resolve="MetaPointerConverter" />
+                  <node concept="3Tm1VV" id="6jbF0BoEQi4" role="1B3o_S" />
+                  <node concept="37vLTw" id="1xqd6ptu0S9" role="37wK5m">
+                    <ref role="3cqZAo" node="1xqd6ptu0RI" resolve="jsonKeyMapper" />
+                  </node>
+                  <node concept="37vLTw" id="1xqd6ptu0Sa" role="37wK5m">
+                    <ref role="3cqZAo" node="1xqd6ptu0RV" resolve="metaAdapterFactoryHelper" />
+                  </node>
+                  <node concept="37vLTw" id="1xqd6ptu0Sb" role="37wK5m">
+                    <ref role="3cqZAo" node="1xqd6ptu0S0" resolve="metaPointerPostprocessor" />
+                  </node>
+                  <node concept="37vLTw" id="3M8YG$dhmx6" role="37wK5m">
+                    <ref role="3cqZAo" node="3M8YG$dhl3_" resolve="sLanguageIdExtractor" />
+                  </node>
+                  <node concept="37vLTw" id="6jbF0BoDOgV" role="37wK5m">
+                    <ref role="3cqZAo" node="1xqd6ptu0RO" resolve="attributeFinder" />
+                  </node>
+                  <node concept="2tJIrI" id="6jbF0BoEQsH" role="jymVt" />
+                  <node concept="3clFb_" id="6jbF0BoEQBh" role="jymVt">
+                    <property role="TrG5h" value="logWarning" />
+                    <node concept="3cqZAl" id="6jbF0BoEQBo" role="3clF45" />
+                    <node concept="3Tmbuc" id="6jbF0BoEQBp" role="1B3o_S" />
+                    <node concept="37vLTG" id="6jbF0BoEQBq" role="3clF46">
+                      <property role="TrG5h" value="message" />
+                      <node concept="17QB3L" id="6jbF0BoEQBr" role="1tU5fm" />
+                    </node>
+                    <node concept="3clFbS" id="6jbF0BoEQBt" role="3clF47">
+                      <node concept="3clFbF" id="6jbF0BoEXaa" role="3cqZAp">
+                        <node concept="2OqwBi" id="6jbF0BoEXyE" role="3clFbG">
+                          <node concept="Xjq3P" id="6jbF0BoEXlL" role="2Oq$k0">
+                            <ref role="1HBi2w" node="5TNjoy1_$_I" resolve="AJsonToX" />
+                          </node>
+                          <node concept="liA8E" id="6jbF0BoEXQN" role="2OqNvi">
+                            <ref role="37wK5l" node="6jbF0BoERKz" resolve="logWarning" />
+                            <node concept="37vLTw" id="6jbF0BoEY2t" role="37wK5m">
+                              <ref role="3cqZAo" node="6jbF0BoEQBq" resolve="message" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="6jbF0BoEQBu" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -5026,6 +5070,32 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="6jbF0BoERxu" role="jymVt" />
+    <node concept="3clFb_" id="6jbF0BoERKz" role="jymVt">
+      <property role="TrG5h" value="logWarning" />
+      <node concept="3cqZAl" id="6jbF0BoERK$" role="3clF45" />
+      <node concept="3Tmbuc" id="6jbF0BoERK_" role="1B3o_S" />
+      <node concept="37vLTG" id="6jbF0BoERKA" role="3clF46">
+        <property role="TrG5h" value="message" />
+        <node concept="17QB3L" id="6jbF0BoERKB" role="1tU5fm" />
+      </node>
+      <node concept="3clFbS" id="6jbF0BoERKC" role="3clF47">
+        <node concept="3clFbF" id="6jbF0BoCprU" role="3cqZAp">
+          <node concept="2OqwBi" id="6jbF0BoCprR" role="3clFbG">
+            <node concept="10M0yZ" id="6jbF0BoCprS" 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="6jbF0BoCprT" role="2OqNvi">
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+              <node concept="37vLTw" id="6jbF0BoCtiu" role="37wK5m">
+                <ref role="3cqZAo" node="6jbF0BoERKA" resolve="message" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="5TNjoy1_BHp" role="jymVt" />
     <node concept="3Tm1VV" id="5TNjoy1_$_J" role="1B3o_S" />
     <node concept="3UR2Jj" id="5TNjoy1PgI6" role="lGtFl">
diff --git a/solutions/io.lionweb.mps.m3.runtime/models/io.lionweb.mps.m3.runtime.mps b/solutions/io.lionweb.mps.m3.runtime/models/io.lionweb.mps.m3.runtime.mps
index 26c219d9..73574d78 100644
--- a/solutions/io.lionweb.mps.m3.runtime/models/io.lionweb.mps.m3.runtime.mps
+++ b/solutions/io.lionweb.mps.m3.runtime/models/io.lionweb.mps.m3.runtime.mps
@@ -616,6 +616,20 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="6jbF0Boq2y1" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0Boq2y2" role="3cpWs9">
+            <property role="TrG5h" value="mpsSpecificVersion" />
+            <node concept="17QB3L" id="6jbF0Boq1_e" role="1tU5fm" />
+            <node concept="2OqwBi" id="6jbF0Boq2y3" role="33vP2m">
+              <node concept="37vLTw" id="6jbF0Boq2y4" role="2Oq$k0">
+                <ref role="3cqZAo" node="7OJcYqw9N$5" resolve="attributeLc" />
+              </node>
+              <node concept="3TrcHB" id="6jbF0Boq2y5" role="2OqNvi">
+                <ref role="3TsBF5" to="h3y3:2chztJeDvZC" resolve="version" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="7OJcYqwWzAz" role="3cqZAp">
           <node concept="37vLTI" id="7OJcYqwWzA$" role="3clFbG">
             <node concept="2OqwBi" id="7OJcYqwWzA_" role="37vLTJ">
@@ -636,13 +650,8 @@
                     <property role="2V$B1Q" value="io.lionweb.mps.specific" />
                   </node>
                 </node>
-                <node concept="2OqwBi" id="7OJcYqwWzAG" role="37wK5m">
-                  <node concept="37vLTw" id="7OJcYqwWzAH" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7OJcYqw9N$5" resolve="attributeLc" />
-                  </node>
-                  <node concept="3TrcHB" id="7OJcYqwWzAI" role="2OqNvi">
-                    <ref role="3TsBF5" to="h3y3:2chztJeDvZC" resolve="version" />
-                  </node>
+                <node concept="37vLTw" id="6jbF0Boq2y6" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0Boq2y2" resolve="mpsSpecificVersion" />
                 </node>
                 <node concept="2OqwBi" id="7OJcYqwWzAJ" role="37wK5m">
                   <node concept="37vLTw" id="7OJcYqwWzAK" role="2Oq$k0">
@@ -783,6 +792,9 @@
                     </node>
                   </node>
                 </node>
+                <node concept="37vLTw" id="6jbF0Boq2y7" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0Boq2y2" resolve="mpsSpecificVersion" />
+                </node>
               </node>
             </node>
           </node>
@@ -900,6 +912,9 @@
                     </node>
                   </node>
                 </node>
+                <node concept="37vLTw" id="6jbF0Boq2y8" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0Boq2y2" resolve="mpsSpecificVersion" />
+                </node>
               </node>
             </node>
           </node>
@@ -922,6 +937,16 @@
                     <property role="2V$B1Q" value="jetbrains.mps.lang.structure" />
                   </node>
                 </node>
+                <node concept="2YIFZM" id="6jbF0Boy2Nt" role="37wK5m">
+                  <ref role="37wK5l" node="34Q84zMXVAC" resolve="getLanguageVersionString" />
+                  <ref role="1Pybhc" node="6jTTMHD72IS" resolve="MpsLanguageUtil" />
+                  <node concept="pHN19" id="6jbF0Boy3Q$" role="37wK5m">
+                    <node concept="2V$Bhx" id="6jbF0Boy3Q_" role="2V$M_3">
+                      <property role="2V$B1T" value="c72da2b9-7cce-4447-8389-f407dc1158b7" />
+                      <property role="2V$B1Q" value="jetbrains.mps.lang.structure" />
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
           </node>
@@ -1041,6 +1066,9 @@
                     </node>
                   </node>
                 </node>
+                <node concept="37vLTw" id="6jbF0Boq2y9" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0Boq2y2" resolve="mpsSpecificVersion" />
+                </node>
               </node>
             </node>
             <node concept="2OqwBi" id="6LPkCA$5a0J" role="37vLTJ">
@@ -1143,6 +1171,9 @@
                     </node>
                   </node>
                 </node>
+                <node concept="37vLTw" id="6jbF0Boq9oX" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0Boq2y2" resolve="mpsSpecificVersion" />
+                </node>
               </node>
             </node>
             <node concept="2OqwBi" id="6LPkCA$APap" role="37vLTJ">
@@ -1245,6 +1276,9 @@
                     </node>
                   </node>
                 </node>
+                <node concept="37vLTw" id="6jbF0Boqc8F" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0Boq2y2" resolve="mpsSpecificVersion" />
+                </node>
               </node>
             </node>
             <node concept="2OqwBi" id="6LPkCA$BenO" role="37vLTJ">
@@ -1256,6 +1290,30 @@
           </node>
         </node>
         <node concept="3clFbH" id="6LPkCA$Benp" role="3cqZAp" />
+        <node concept="3cpWs8" id="6jbF0Boqq3j" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0Boqq3k" role="3cpWs9">
+            <property role="TrG5h" value="m3Version" />
+            <node concept="17QB3L" id="6jbF0BoqpsN" role="1tU5fm" />
+            <node concept="2OqwBi" id="6jbF0Boqq3l" role="33vP2m">
+              <node concept="2OqwBi" id="6jbF0Boqq3m" role="2Oq$k0">
+                <node concept="2tJFMh" id="6jbF0Boqq3n" role="2Oq$k0">
+                  <node concept="ZC_QK" id="6jbF0Boqq3o" role="2tJFKM">
+                    <ref role="2aWVGs" to="i2js:5sACIIs$PgG" resolve="LionCore_M3" />
+                  </node>
+                </node>
+                <node concept="Vyspw" id="6jbF0Boqq3p" role="2OqNvi">
+                  <node concept="37vLTw" id="6jbF0Boqq3q" role="Vysub">
+                    <ref role="3cqZAo" node="DUXtGZOlyn" resolve="repository" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3TrcHB" id="6jbF0Boqq3r" role="2OqNvi">
+                <ref role="3TsBF5" to="h3y3:2chztJeDvZC" resolve="version" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6jbF0BoqdYh" role="3cqZAp" />
         <node concept="3cpWs8" id="6LPkCA_3hhi" role="3cqZAp">
           <node concept="3cpWsn" id="6LPkCA_3hhj" role="3cpWs9">
             <property role="TrG5h" value="mpsIKeyed" />
@@ -1329,6 +1387,9 @@
                     </node>
                   </node>
                 </node>
+                <node concept="37vLTw" id="6jbF0BoqwPz" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0Boqq3k" resolve="m3Version" />
+                </node>
               </node>
             </node>
             <node concept="2OqwBi" id="6LPkCA_3n33" role="37vLTJ">
@@ -1419,6 +1480,9 @@
                     </node>
                   </node>
                 </node>
+                <node concept="37vLTw" id="6jbF0Boqzq$" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0Boqq3k" resolve="m3Version" />
+                </node>
               </node>
             </node>
           </node>
@@ -1503,6 +1567,9 @@
                     </node>
                   </node>
                 </node>
+                <node concept="37vLTw" id="6jbF0Boq_LX" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0Boqq3k" resolve="m3Version" />
+                </node>
               </node>
             </node>
           </node>
@@ -1587,6 +1654,9 @@
                     </node>
                   </node>
                 </node>
+                <node concept="37vLTw" id="6jbF0BoqCgz" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0Boqq3k" resolve="m3Version" />
+                </node>
               </node>
             </node>
           </node>
@@ -1689,6 +1759,9 @@
                     </node>
                   </node>
                 </node>
+                <node concept="37vLTw" id="6jbF0BoqEJW" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0Boq2y2" resolve="mpsSpecificVersion" />
+                </node>
               </node>
             </node>
           </node>
@@ -1791,6 +1864,9 @@
                     </node>
                   </node>
                 </node>
+                <node concept="37vLTw" id="6jbF0BoqHob" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0Boq2y2" resolve="mpsSpecificVersion" />
+                </node>
               </node>
             </node>
           </node>
@@ -3587,16 +3663,6 @@
             <property role="1dT_AB" value="Tries to find custom LionWeb language key via `LionWebLanguageKey`." />
           </node>
         </node>
-        <node concept="TZ5HA" id="3M8YG$9B2$v" role="TZ5H$">
-          <node concept="1dT_AC" id="3M8YG$9B2$w" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="3M8YG$9AWM2" role="TZ5H$">
-          <node concept="1dT_AC" id="3M8YG$9AWM3" role="1dT_Ay">
-            <property role="1dT_AB" value="Transparently maps LionCore language keys." />
-          </node>
-        </node>
         <node concept="TUZQ0" id="3M8YG$9AU47" role="3nqlJM">
           <property role="TUZQ4" value="Language to inspect for an instance of `LionWebLanguageKey` in structure aspect." />
           <node concept="zr_55" id="3M8YG$9AU49" role="zr_5Q">
@@ -3658,7 +3724,7 @@
                 <node concept="liA8E" id="5M3rB6_W0yT" role="2OqNvi">
                   <ref role="37wK5l" to="mhbf:~SNode.isInstanceOfConcept(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="isInstanceOfConcept" />
                   <node concept="35c_gC" id="5M3rB6_W0yU" role="37wK5m">
-                    <ref role="35c_gD" to="234s:6fYiNFad_9U" resolve="LionWebLanguageKey" />
+                    <ref role="35c_gD" to="234s:6fYiNFad_9U" resolve="LionWebLanguage" />
                   </node>
                 </node>
               </node>
@@ -3703,16 +3769,6 @@
             <property role="1dT_AB" value="Tries to find custom LionWeb language key via `LionWebLanguageKey`." />
           </node>
         </node>
-        <node concept="TZ5HA" id="3M8YG$9Bay8" role="TZ5H$">
-          <node concept="1dT_AC" id="3M8YG$9Bay9" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="3M8YG$9Baya" role="TZ5H$">
-          <node concept="1dT_AC" id="3M8YG$9Bayb" role="1dT_Ay">
-            <property role="1dT_AB" value="Transparently maps LionCore language keys." />
-          </node>
-        </node>
         <node concept="TUZQ0" id="3M8YG$9AY8i" role="3nqlJM">
           <property role="TUZQ4" value="Language structure aspect to inspect for an instance of `LionWebLanguageKey`." />
           <node concept="zr_55" id="3M8YG$9AY8k" role="zr_5Q">
@@ -3724,6 +3780,200 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="6jbF0BnU3si" role="jymVt" />
+    <node concept="3clFb_" id="6jbF0BnTYl$" role="jymVt">
+      <property role="TrG5h" value="findVersionFromLanguage" />
+      <node concept="3clFbS" id="6jbF0BnTYl_" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BnTYlA" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BnTYlB" role="3cpWs9">
+            <property role="TrG5h" value="converter" />
+            <node concept="3uibUv" id="6jbF0BnTYlC" role="1tU5fm">
+              <ref role="3uigEE" node="39$JcGGnjRO" resolve="MpsLanguageConverter" />
+            </node>
+            <node concept="2YIFZM" id="6jbF0BnTYlD" role="33vP2m">
+              <ref role="37wK5l" node="39$JcGGnzni" resolve="getInstance" />
+              <ref role="1Pybhc" node="39$JcGGnjRO" resolve="MpsLanguageConverter" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6jbF0BnTYlE" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BnTYlF" role="3cpWs9">
+            <property role="TrG5h" value="structure" />
+            <node concept="3uibUv" id="6jbF0BnTYlG" role="1tU5fm">
+              <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
+            </node>
+            <node concept="2OqwBi" id="6jbF0BnTYlH" role="33vP2m">
+              <node concept="37vLTw" id="6jbF0BnTYlI" role="2Oq$k0">
+                <ref role="3cqZAo" node="6jbF0BnTYlB" resolve="converter" />
+              </node>
+              <node concept="liA8E" id="6jbF0BnTYlJ" role="2OqNvi">
+                <ref role="37wK5l" node="39$JcGGsLhM" resolve="toStructureModel" />
+                <node concept="37vLTw" id="6jbF0BnTYlK" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0BnTYlX" resolve="sLanguage" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="6jbF0BnTYlL" role="3cqZAp">
+          <node concept="3clFbS" id="6jbF0BnTYlM" role="3clFbx">
+            <node concept="3cpWs6" id="6jbF0BnTYlN" role="3cqZAp">
+              <node concept="10Nm6u" id="6jbF0BnTYlO" role="3cqZAk" />
+            </node>
+          </node>
+          <node concept="3clFbC" id="6jbF0BnTYlP" role="3clFbw">
+            <node concept="10Nm6u" id="6jbF0BnTYlQ" role="3uHU7w" />
+            <node concept="37vLTw" id="6jbF0BnTYlR" role="3uHU7B">
+              <ref role="3cqZAo" node="6jbF0BnTYlF" resolve="structure" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="6jbF0BnTYlS" role="3cqZAp">
+          <node concept="1rXfSq" id="6jbF0BnTYlT" role="3cqZAk">
+            <ref role="37wK5l" node="6jbF0BnTYkP" resolve="findVersionFromLanguage" />
+            <node concept="37vLTw" id="6jbF0BnTYlU" role="37wK5m">
+              <ref role="3cqZAo" node="6jbF0BnTYlF" resolve="structure" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6jbF0BnTYlV" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0BnTYlW" role="3clF45" />
+      <node concept="37vLTG" id="6jbF0BnTYlX" role="3clF46">
+        <property role="TrG5h" value="sLanguage" />
+        <node concept="3uibUv" id="6jbF0BnTYlY" role="1tU5fm">
+          <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
+        </node>
+        <node concept="2AHcQZ" id="6jbF0BnTYlZ" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BnTYm0" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="P$JXv" id="6jbF0BnTYm1" role="lGtFl">
+        <node concept="TZ5HA" id="6jbF0BnTYm2" role="TZ5H$">
+          <node concept="1dT_AC" id="6jbF0BnTYm3" role="1dT_Ay">
+            <property role="1dT_AB" value="Tries to find custom LionWeb language version via `LionWebLanguage`." />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="6jbF0BnTYm8" role="3nqlJM">
+          <property role="TUZQ4" value="Language to inspect for an instance of `LionWebLanguage` in structure aspect." />
+          <node concept="zr_55" id="6jbF0BnTYm9" role="zr_5Q">
+            <ref role="zr_51" node="6jbF0BnTYlX" resolve="sLanguage" />
+          </node>
+        </node>
+        <node concept="x79VA" id="6jbF0BnTYma" role="3nqlJM">
+          <property role="x79VB" value="Custom LionWeb version of `sLanguage`, if available." />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6jbF0BnTYlz" role="jymVt" />
+    <node concept="3clFb_" id="6jbF0BnTYkP" role="jymVt">
+      <property role="TrG5h" value="findVersionFromLanguage" />
+      <node concept="3Tm1VV" id="6jbF0BnTYkQ" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0BnTYkR" role="3clF45" />
+      <node concept="37vLTG" id="6jbF0BnTYkS" role="3clF46">
+        <property role="TrG5h" value="structure" />
+        <node concept="3uibUv" id="6jbF0BnTYkT" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
+        </node>
+        <node concept="2AHcQZ" id="6jbF0BnTYkU" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="6jbF0BnTYkV" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0BnTYkW" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0BnTYkX" role="3cpWs9">
+            <property role="TrG5h" value="rootNodes" />
+            <node concept="3uibUv" id="6jbF0BnTYkY" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
+              <node concept="3uibUv" id="6jbF0BnTYkZ" role="11_B2D">
+                <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="6jbF0BnTYl0" role="33vP2m">
+              <node concept="37vLTw" id="6jbF0BnTYl1" role="2Oq$k0">
+                <ref role="3cqZAo" node="6jbF0BnTYkS" resolve="structure" />
+              </node>
+              <node concept="liA8E" id="6jbF0BnTYl2" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getRootNodes()" resolve="getRootNodes" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2Gpval" id="6jbF0BnTYl3" role="3cqZAp">
+          <node concept="2GrKxI" id="6jbF0BnTYl4" role="2Gsz3X">
+            <property role="TrG5h" value="rootNode" />
+          </node>
+          <node concept="37vLTw" id="6jbF0BnTYl5" role="2GsD0m">
+            <ref role="3cqZAo" node="6jbF0BnTYkX" resolve="rootNodes" />
+          </node>
+          <node concept="3clFbS" id="6jbF0BnTYl6" role="2LFqv$">
+            <node concept="3clFbJ" id="6jbF0BnTYl7" role="3cqZAp">
+              <node concept="2OqwBi" id="6jbF0BnTYl8" role="3clFbw">
+                <node concept="2GrUjf" id="6jbF0BnTYl9" role="2Oq$k0">
+                  <ref role="2Gs0qQ" node="6jbF0BnTYl4" resolve="rootNode" />
+                </node>
+                <node concept="liA8E" id="6jbF0BnTYla" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SNode.isInstanceOfConcept(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="isInstanceOfConcept" />
+                  <node concept="35c_gC" id="6jbF0BnTYlb" role="37wK5m">
+                    <ref role="35c_gD" to="234s:6fYiNFad_9U" resolve="LionWebLanguage" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbS" id="6jbF0BnTYlc" role="3clFbx">
+                <node concept="3cpWs8" id="6jbF0BnTYld" role="3cqZAp">
+                  <node concept="3cpWsn" id="6jbF0BnTYle" role="3cpWs9">
+                    <property role="TrG5h" value="version" />
+                    <node concept="17QB3L" id="6jbF0BnTYlf" role="1tU5fm" />
+                    <node concept="2OqwBi" id="6jbF0BnTYlg" role="33vP2m">
+                      <node concept="2GrUjf" id="6jbF0BnTYlh" role="2Oq$k0">
+                        <ref role="2Gs0qQ" node="6jbF0BnTYl4" resolve="rootNode" />
+                      </node>
+                      <node concept="liA8E" id="6jbF0BnTYli" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SNode.getProperty(org.jetbrains.mps.openapi.language.SProperty)" resolve="getProperty" />
+                        <node concept="355D3s" id="6jbF0BnTYlj" role="37wK5m">
+                          <ref role="355D3t" to="234s:6fYiNFad_9U" resolve="LionWebLanguage" />
+                          <ref role="355D3u" to="234s:6jbF0BnT6Ct" resolve="version" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWs6" id="6jbF0BnTYlk" role="3cqZAp">
+                  <node concept="37vLTw" id="6jbF0BnTYll" role="3cqZAk">
+                    <ref role="3cqZAo" node="6jbF0BnTYle" resolve="version" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="6jbF0BnTYlm" role="3cqZAp">
+          <node concept="10Nm6u" id="6jbF0BnTYln" role="3cqZAk" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0BnTYlo" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="P$JXv" id="6jbF0BnTYlp" role="lGtFl">
+        <node concept="TZ5HA" id="6jbF0BnTYlq" role="TZ5H$">
+          <node concept="1dT_AC" id="6jbF0BnTYlr" role="1dT_Ay">
+            <property role="1dT_AB" value="Tries to find custom LionWeb language version via `LionWebLanguage.version`." />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="6jbF0BnTYlw" role="3nqlJM">
+          <property role="TUZQ4" value="Language structure aspect to inspect for an instance of `LionWebLanguage`." />
+          <node concept="zr_55" id="6jbF0BnTYlx" role="zr_5Q">
+            <ref role="zr_51" node="6jbF0BnTYkS" resolve="structure" />
+          </node>
+        </node>
+        <node concept="x79VA" id="6jbF0BnTYly" role="3nqlJM">
+          <property role="x79VB" value="Custom LionWeb version of `structure`, if available." />
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="3M8YG$9ChhL" role="jymVt" />
     <node concept="3clFb_" id="6fYiNFaH3n7" role="jymVt">
       <property role="TrG5h" value="findKeyFromAttribute" />
@@ -7293,6 +7543,16 @@
                     <property role="2V$B1Q" value="io.lionweb.mps.structure.attribute" />
                   </node>
                 </node>
+                <node concept="2YIFZM" id="6jbF0BoycSB" role="37wK5m">
+                  <ref role="37wK5l" node="34Q84zMXVAC" resolve="getLanguageVersionString" />
+                  <ref role="1Pybhc" node="6jTTMHD72IS" resolve="MpsLanguageUtil" />
+                  <node concept="pHN19" id="6jbF0BoydNa" role="37wK5m">
+                    <node concept="2V$Bhx" id="6jbF0BoyfFG" role="2V$M_3">
+                      <property role="2V$B1T" value="411e5b27-8a76-482e-8af8-1704262b4468" />
+                      <property role="2V$B1Q" value="io.lionweb.mps.structure.attribute" />
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
           </node>
@@ -7372,6 +7632,16 @@
                     <property role="2V$B1Q" value="jetbrains.mps.lang.core" />
                   </node>
                 </node>
+                <node concept="2YIFZM" id="6jbF0BoygE$" role="37wK5m">
+                  <ref role="37wK5l" node="34Q84zMXVAC" resolve="getLanguageVersionString" />
+                  <ref role="1Pybhc" node="6jTTMHD72IS" resolve="MpsLanguageUtil" />
+                  <node concept="pHN19" id="6jbF0BoygE_" role="37wK5m">
+                    <node concept="2V$Bhx" id="6jbF0BoyiuI" role="2V$M_3">
+                      <property role="2V$B1T" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c" />
+                      <property role="2V$B1Q" value="jetbrains.mps.lang.core" />
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
             <node concept="2OqwBi" id="7OJcYqxKYbm" role="37vLTJ">
@@ -7425,6 +7695,9 @@
                   <ref role="1PxDUh" to="xx25:~SPrimitiveTypes" resolve="SPrimitiveTypes" />
                   <ref role="3cqZAo" to="xx25:~SPrimitiveTypes.STRING" resolve="STRING" />
                 </node>
+                <node concept="37vLTw" id="6jbF0BoqUAU" role="37wK5m">
+                  <ref role="3cqZAo" node="3M8YG$9w5jG" resolve="LION_CORE_VERSION" />
+                </node>
               </node>
             </node>
           </node>
@@ -7472,6 +7745,9 @@
                   <ref role="3cqZAo" to="xx25:~SPrimitiveTypes.BOOLEAN" resolve="BOOLEAN" />
                   <ref role="1PxDUh" to="xx25:~SPrimitiveTypes" resolve="SPrimitiveTypes" />
                 </node>
+                <node concept="37vLTw" id="6jbF0BoqX5D" role="37wK5m">
+                  <ref role="3cqZAo" node="3M8YG$9w5jG" resolve="LION_CORE_VERSION" />
+                </node>
               </node>
             </node>
           </node>
@@ -7519,6 +7795,9 @@
                   <ref role="3cqZAo" to="xx25:~SPrimitiveTypes.INTEGER" resolve="INTEGER" />
                   <ref role="1PxDUh" to="xx25:~SPrimitiveTypes" resolve="SPrimitiveTypes" />
                 </node>
+                <node concept="37vLTw" id="6jbF0BoqZLW" role="37wK5m">
+                  <ref role="3cqZAo" node="3M8YG$9w5jG" resolve="LION_CORE_VERSION" />
+                </node>
               </node>
             </node>
           </node>
@@ -7643,6 +7922,9 @@
                     </node>
                   </node>
                 </node>
+                <node concept="37vLTw" id="6jbF0Bor2_Q" role="37wK5m">
+                  <ref role="3cqZAo" node="3M8YG$9w5jG" resolve="LION_CORE_VERSION" />
+                </node>
               </node>
             </node>
           </node>
@@ -7738,6 +8020,9 @@
                 <node concept="37vLTw" id="7OJcYqwdP1Q" role="37wK5m">
                   <ref role="3cqZAo" node="7OJcYqwdP1F" resolve="slangNode" />
                 </node>
+                <node concept="37vLTw" id="6jbF0Bor4_M" role="37wK5m">
+                  <ref role="3cqZAo" node="3M8YG$9w5jG" resolve="LION_CORE_VERSION" />
+                </node>
               </node>
             </node>
           </node>
@@ -7822,6 +8107,9 @@
                     </node>
                   </node>
                 </node>
+                <node concept="37vLTw" id="6jbF0Bor75x" role="37wK5m">
+                  <ref role="3cqZAo" node="3M8YG$9w5jG" resolve="LION_CORE_VERSION" />
+                </node>
               </node>
             </node>
           </node>
@@ -7872,6 +8160,9 @@
                     <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
                   </node>
                 </node>
+                <node concept="37vLTw" id="6jbF0Bor9MU" role="37wK5m">
+                  <ref role="3cqZAo" node="3M8YG$9w5jG" resolve="LION_CORE_VERSION" />
+                </node>
               </node>
             </node>
           </node>
@@ -7956,6 +8247,9 @@
                     </node>
                   </node>
                 </node>
+                <node concept="37vLTw" id="6jbF0Borcwz" role="37wK5m">
+                  <ref role="3cqZAo" node="3M8YG$9w5jG" resolve="LION_CORE_VERSION" />
+                </node>
               </node>
             </node>
           </node>
@@ -8058,6 +8352,9 @@
                     </node>
                   </node>
                 </node>
+                <node concept="37vLTw" id="6jbF0Boreq_" role="37wK5m">
+                  <ref role="3cqZAo" node="3M8YG$9w5jG" resolve="LION_CORE_VERSION" />
+                </node>
               </node>
             </node>
           </node>
@@ -10236,6 +10533,84 @@
         <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
       </node>
     </node>
+    <node concept="2tJIrI" id="6jbF0Bo0wtH" role="jymVt" />
+    <node concept="2YIFZL" id="6jbF0Bo0uK5" role="jymVt">
+      <property role="TrG5h" value="getLanguageVersionString" />
+      <node concept="3clFbS" id="6jbF0Bo0uK6" role="3clF47">
+        <node concept="3cpWs8" id="6jbF0Bo0vdZ" role="3cqZAp">
+          <node concept="3cpWsn" id="6jbF0Bo0ve0" role="3cpWs9">
+            <property role="TrG5h" value="version" />
+            <node concept="17QB3L" id="6jbF0Bo0v8b" role="1tU5fm" />
+            <node concept="2OqwBi" id="6jbF0Bo0ve1" role="33vP2m">
+              <node concept="37vLTw" id="6jbF0Bo0ve2" role="2Oq$k0">
+                <ref role="3cqZAo" node="6jbF0Bo0uNq" resolve="attributeFinder" />
+              </node>
+              <node concept="liA8E" id="6jbF0Bo0ve3" role="2OqNvi">
+                <ref role="37wK5l" node="6jbF0BnTYl$" resolve="findVersionFromLanguage" />
+                <node concept="37vLTw" id="6jbF0Bo0ve4" role="37wK5m">
+                  <ref role="3cqZAo" node="6jbF0Bo0uKd" resolve="language" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6jbF0Bo0vhK" role="3cqZAp" />
+        <node concept="3clFbJ" id="6jbF0Bo0vlw" role="3cqZAp">
+          <node concept="3clFbS" id="6jbF0Bo0vly" role="3clFbx">
+            <node concept="3clFbF" id="6jbF0Bo0vVQ" role="3cqZAp">
+              <node concept="37vLTI" id="6jbF0Bo0wc2" role="3clFbG">
+                <node concept="37vLTw" id="6jbF0Bo0vVO" role="37vLTJ">
+                  <ref role="3cqZAo" node="6jbF0Bo0ve0" resolve="version" />
+                </node>
+                <node concept="1rXfSq" id="6jbF0BoxTZr" role="37vLTx">
+                  <ref role="37wK5l" node="34Q84zMXVAC" resolve="getLanguageVersionString" />
+                  <node concept="37vLTw" id="6jbF0BoxU27" role="37wK5m">
+                    <ref role="3cqZAo" node="6jbF0Bo0uKd" resolve="language" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbC" id="6jbF0Bo0vEl" role="3clFbw">
+            <node concept="10Nm6u" id="6jbF0Bo0vT3" role="3uHU7w" />
+            <node concept="37vLTw" id="6jbF0Bo0vm7" role="3uHU7B">
+              <ref role="3cqZAo" node="6jbF0Bo0ve0" resolve="version" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6jbF0Bo0wle" role="3cqZAp" />
+        <node concept="3cpWs6" id="6jbF0Bo0wnS" role="3cqZAp">
+          <node concept="37vLTw" id="6jbF0Bo0woy" role="3cqZAk">
+            <ref role="3cqZAo" node="6jbF0Bo0ve0" resolve="version" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6jbF0Bo0uKb" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0Bo0uKc" role="3clF45" />
+      <node concept="37vLTG" id="6jbF0Bo0uKd" role="3clF46">
+        <property role="TrG5h" value="language" />
+        <node concept="3uibUv" id="6jbF0Bo0uKe" role="1tU5fm">
+          <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
+        </node>
+        <node concept="2AHcQZ" id="6jbF0Bo0uKf" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="6jbF0Bo0uNq" role="3clF46">
+        <property role="TrG5h" value="attributeFinder" />
+        <node concept="3uibUv" id="6jbF0Bo0uOp" role="1tU5fm">
+          <ref role="3uigEE" node="pPZz6cPvUw" resolve="LionWebAttributeFinder" />
+        </node>
+        <node concept="2AHcQZ" id="6jbF0Bo0zUM" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0Bo0uKg" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6jbF0Bo0uIK" role="jymVt" />
+    <node concept="2tJIrI" id="6jbF0Bo0uJh" role="jymVt" />
     <node concept="3Tm1VV" id="6jTTMHD72IT" role="1B3o_S" />
     <node concept="3UR2Jj" id="6jTTMHD72JM" role="lGtFl">
       <node concept="TZ5HA" id="6jTTMHD72JN" role="TZ5H$">
@@ -10321,6 +10696,15 @@
         <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
       </node>
     </node>
+    <node concept="3clFb_" id="6jbF0Boix1I" role="jymVt">
+      <property role="TrG5h" value="getLcLanguageVersion" />
+      <node concept="17QB3L" id="6jbF0Boix1J" role="3clF45" />
+      <node concept="3Tm1VV" id="6jbF0Boix1K" role="1B3o_S" />
+      <node concept="3clFbS" id="6jbF0Boix1L" role="3clF47" />
+      <node concept="2AHcQZ" id="6jbF0Boix1Q" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+    </node>
     <node concept="3Tm1VV" id="7OJcYqvKf0P" role="1B3o_S" />
     <node concept="16euLQ" id="7OJcYqvKf2B" role="16eVyc">
       <property role="TrG5h" value="LC" />
@@ -10447,6 +10831,12 @@
       <node concept="3Tm6S6" id="7OJcYq_sAXf" role="1B3o_S" />
       <node concept="17QB3L" id="7OJcYq_sAXh" role="1tU5fm" />
     </node>
+    <node concept="312cEg" id="6jbF0BoizmN" role="jymVt">
+      <property role="TrG5h" value="lcLanguageVersion" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm6S6" id="6jbF0BoizmO" role="1B3o_S" />
+      <node concept="17QB3L" id="6jbF0BoizmQ" role="1tU5fm" />
+    </node>
     <node concept="2tJIrI" id="7OJcYq_sC1m" role="jymVt" />
     <node concept="3clFbW" id="7OJcYqvKqOn" role="jymVt">
       <node concept="3cqZAl" id="7OJcYqvKqOo" role="3clF45" />
@@ -10543,6 +10933,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="6jbF0BoizmR" role="3cqZAp">
+          <node concept="37vLTI" id="6jbF0BoizmT" role="3clFbG">
+            <node concept="2OqwBi" id="6jbF0BoizLn" role="37vLTJ">
+              <node concept="Xjq3P" id="6jbF0BoizUz" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6jbF0BoizLq" role="2OqNvi">
+                <ref role="2Oxat5" node="6jbF0BoizmN" resolve="lcLanguageVersion" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="6jbF0BoizmX" role="37vLTx">
+              <ref role="3cqZAo" node="6jbF0BoiyL_" resolve="lcLanguageVersion" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="37vLTG" id="7OJcYqvKqXW" role="3clF46">
         <property role="TrG5h" value="lc" />
@@ -10599,6 +11002,13 @@
           <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
         </node>
       </node>
+      <node concept="37vLTG" id="6jbF0BoiyL_" role="3clF46">
+        <property role="TrG5h" value="lcLanguageVersion" />
+        <node concept="17QB3L" id="6jbF0Boiz3k" role="1tU5fm" />
+        <node concept="2AHcQZ" id="6jbF0Boiz8y" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+        </node>
+      </node>
     </node>
     <node concept="3clFb_" id="7OJcYqvKqcL" role="jymVt">
       <property role="TrG5h" value="getLc" />
@@ -10747,6 +11157,24 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="3clFb_" id="6jbF0Boi_gF" role="jymVt">
+      <property role="TrG5h" value="getLcLanguageVersion" />
+      <node concept="17QB3L" id="6jbF0Boi_gG" role="3clF45" />
+      <node concept="3Tm1VV" id="6jbF0Boi_gH" role="1B3o_S" />
+      <node concept="2AHcQZ" id="6jbF0Boi_gJ" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="3clFbS" id="6jbF0Boi_gK" role="3clF47">
+        <node concept="3clFbF" id="6jbF0BoiAAF" role="3cqZAp">
+          <node concept="37vLTw" id="6jbF0BoiAAC" role="3clFbG">
+            <ref role="3cqZAo" node="6jbF0BoizmN" resolve="lcLanguageVersion" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6jbF0Boi_gL" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
     <node concept="2YIFZL" id="5M3rB6_QlA6" role="jymVt">
       <property role="TrG5h" value="extractKey" />
       <node concept="3clFbS" id="5M3rB6_QlAc" role="3clF47">
@@ -10936,6 +11364,9 @@
               </node>
             </node>
           </node>
+          <node concept="37vLTw" id="6jbF0BoiF_Q" role="37wK5m">
+            <ref role="3cqZAo" node="6jbF0BoiFf3" resolve="lcLanguageVersion" />
+          </node>
         </node>
       </node>
       <node concept="37vLTG" id="7OJcYqvKXdF" role="3clF46">
@@ -10965,6 +11396,13 @@
           <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
         </node>
       </node>
+      <node concept="37vLTG" id="6jbF0BoiFf3" role="3clF46">
+        <property role="TrG5h" value="lcLanguageVersion" />
+        <node concept="17QB3L" id="6jbF0BoiFf4" role="1tU5fm" />
+        <node concept="2AHcQZ" id="6jbF0BoiFf5" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+        </node>
+      </node>
     </node>
     <node concept="3uibUv" id="7OJcYqwYpbh" role="EKbjA">
       <ref role="3uigEE" node="7OJcYqwYeSL" resolve="IClassifierStaple" />
@@ -11059,6 +11497,9 @@
               </node>
             </node>
           </node>
+          <node concept="37vLTw" id="6jbF0BoiMJ2" role="37wK5m">
+            <ref role="3cqZAo" node="6jbF0BoiMkh" resolve="lcLanguageVersion" />
+          </node>
         </node>
         <node concept="3clFbH" id="7OJcYq_mndi" role="3cqZAp" />
         <node concept="3clFbF" id="7OJcYq_mnyF" role="3cqZAp">
@@ -11108,6 +11549,13 @@
           <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
         </node>
       </node>
+      <node concept="37vLTG" id="6jbF0BoiMkh" role="3clF46">
+        <property role="TrG5h" value="lcLanguageVersion" />
+        <node concept="17QB3L" id="6jbF0BoiMki" role="1tU5fm" />
+        <node concept="2AHcQZ" id="6jbF0BoiMkj" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+        </node>
+      </node>
     </node>
     <node concept="3clFb_" id="7OJcYqwP92e" role="jymVt">
       <property role="TrG5h" value="getLc" />
@@ -11207,12 +11655,6 @@
       <node concept="3Tm6S6" id="7OJcYqwopVI" role="1B3o_S" />
       <node concept="10Oyi0" id="7OJcYqwoq8T" role="1tU5fm" />
     </node>
-    <node concept="312cEg" id="7OJcYqxRpgA" role="jymVt">
-      <property role="TrG5h" value="lcVersion" />
-      <property role="3TUv4t" value="true" />
-      <node concept="3Tm6S6" id="7OJcYqxRoR8" role="1B3o_S" />
-      <node concept="17QB3L" id="7OJcYqxRpbY" role="1tU5fm" />
-    </node>
     <node concept="3clFbW" id="7OJcYqvMRo3" role="jymVt">
       <node concept="3cqZAl" id="7OJcYqvMRo4" role="3clF45" />
       <node concept="3Tm1VV" id="7OJcYqvMRo5" role="1B3o_S" />
@@ -11247,6 +11689,9 @@
           <node concept="37vLTw" id="7OJcYq_sMfc" role="37wK5m">
             <ref role="3cqZAo" node="7OJcYqvMRoP" resolve="lcKey" />
           </node>
+          <node concept="37vLTw" id="6jbF0BoiLdQ" role="37wK5m">
+            <ref role="3cqZAo" node="7OJcYqvO4y8" resolve="lcLanguageVersion" />
+          </node>
         </node>
         <node concept="3clFbF" id="7OJcYqvNTvz" role="3cqZAp">
           <node concept="37vLTI" id="7OJcYqvNU3e" role="3clFbG">
@@ -11282,19 +11727,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="7OJcYqvMZyu" role="3cqZAp">
-          <node concept="37vLTI" id="7OJcYqvN09E" role="3clFbG">
-            <node concept="37vLTw" id="7OJcYqvN0fj" role="37vLTx">
-              <ref role="3cqZAo" node="7OJcYqvO4y8" resolve="lcVersion" />
-            </node>
-            <node concept="2OqwBi" id="7OJcYqvMZEN" role="37vLTJ">
-              <node concept="Xjq3P" id="7OJcYqvMZys" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7OJcYqvMZNH" role="2OqNvi">
-                <ref role="2Oxat5" node="7OJcYqxRpgA" resolve="lcVersion" />
-              </node>
-            </node>
-          </node>
-        </node>
       </node>
       <node concept="37vLTG" id="7OJcYqxRdhz" role="3clF46">
         <property role="TrG5h" value="lc" />
@@ -11315,7 +11747,7 @@
         </node>
       </node>
       <node concept="37vLTG" id="7OJcYqvO4y8" role="3clF46">
-        <property role="TrG5h" value="lcVersion" />
+        <property role="TrG5h" value="lcLanguageVersion" />
         <node concept="17QB3L" id="7OJcYqvO6KI" role="1tU5fm" />
         <node concept="2AHcQZ" id="7OJcYqwMwUp" role="2AJF6D">
           <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
@@ -11346,12 +11778,8 @@
           <node concept="37vLTw" id="7OJcYqwqr1O" role="37wK5m">
             <ref role="3cqZAo" node="7OJcYqwqm4H" resolve="slang" />
           </node>
-          <node concept="2YIFZM" id="7OJcYqwqrGk" role="37wK5m">
-            <ref role="37wK5l" node="34Q84zMXVAC" resolve="getLanguageVersionString" />
-            <ref role="1Pybhc" node="6jTTMHD72IS" resolve="MpsLanguageUtil" />
-            <node concept="37vLTw" id="7OJcYqwqrGl" role="37wK5m">
-              <ref role="3cqZAo" node="7OJcYqwqm4H" resolve="slang" />
-            </node>
+          <node concept="37vLTw" id="6jbF0BoxX9l" role="37wK5m">
+            <ref role="3cqZAo" node="6jbF0BoxWZK" resolve="lcLanguageVersion" />
           </node>
           <node concept="2OqwBi" id="7OJcYqwqwht" role="37wK5m">
             <node concept="2YIFZM" id="7OJcYqwquaC" role="2Oq$k0">
@@ -11385,6 +11813,13 @@
           <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
         </node>
       </node>
+      <node concept="37vLTG" id="6jbF0BoxWZK" role="3clF46">
+        <property role="TrG5h" value="lcLanguageVersion" />
+        <node concept="17QB3L" id="6jbF0BoxWZL" role="1tU5fm" />
+        <node concept="2AHcQZ" id="6jbF0BoxWZM" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
     </node>
     <node concept="3Tm1VV" id="7OJcYqvMQ8_" role="1B3o_S" />
     <node concept="3clFb_" id="7OJcYqw7aei" role="jymVt">
@@ -11422,24 +11857,6 @@
         </node>
       </node>
     </node>
-    <node concept="3clFb_" id="7OJcYqvN0Qp" role="jymVt">
-      <property role="TrG5h" value="getLcVersion" />
-      <node concept="17QB3L" id="7OJcYqvN0Qq" role="3clF45" />
-      <node concept="3Tm1VV" id="7OJcYqvN0Qr" role="1B3o_S" />
-      <node concept="3clFbS" id="7OJcYqvN0Qs" role="3clF47">
-        <node concept="3clFbF" id="7OJcYqvN0Qt" role="3cqZAp">
-          <node concept="2OqwBi" id="7OJcYqvN0Qm" role="3clFbG">
-            <node concept="Xjq3P" id="7OJcYqvN0Qn" role="2Oq$k0" />
-            <node concept="2OwXpG" id="7OJcYqvN0Qo" role="2OqNvi">
-              <ref role="2Oxat5" node="7OJcYqxRpgA" resolve="lcVersion" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="7OJcYqwMZw2" role="2AJF6D">
-        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-      </node>
-    </node>
     <node concept="3uibUv" id="7OJcYqxR8Gt" role="1zkMxy">
       <ref role="3uigEE" node="7OJcYqvKk3R" resolve="AKeyedStaple" />
       <node concept="3Tqbb2" id="7OJcYqxRaqI" role="11_B2D">
@@ -11526,6 +11943,9 @@
               </node>
             </node>
           </node>
+          <node concept="37vLTw" id="6jbF0BoiHQ$" role="37wK5m">
+            <ref role="3cqZAo" node="6jbF0BoiHyh" resolve="lcLanguageVersion" />
+          </node>
         </node>
       </node>
       <node concept="37vLTG" id="7OJcYqvQc4_" role="3clF46">
@@ -11555,6 +11975,13 @@
           <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
         </node>
       </node>
+      <node concept="37vLTG" id="6jbF0BoiHyh" role="3clF46">
+        <property role="TrG5h" value="lcLanguageVersion" />
+        <node concept="17QB3L" id="6jbF0BoiHyi" role="1tU5fm" />
+        <node concept="2AHcQZ" id="6jbF0BoiHyj" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+        </node>
+      </node>
     </node>
     <node concept="3uibUv" id="7OJcYqx2xSv" role="EKbjA">
       <ref role="3uigEE" node="7OJcYqx2vhv" resolve="IFeatureStaple" />
@@ -11642,6 +12069,9 @@
               </node>
             </node>
           </node>
+          <node concept="37vLTw" id="6jbF0BoiNek" role="37wK5m">
+            <ref role="3cqZAo" node="6jbF0BoiMZ7" resolve="lcLanguageVersion" />
+          </node>
         </node>
       </node>
       <node concept="37vLTG" id="7OJcYqvRxYM" role="3clF46">
@@ -11671,6 +12101,13 @@
           <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
         </node>
       </node>
+      <node concept="37vLTG" id="6jbF0BoiMZ7" role="3clF46">
+        <property role="TrG5h" value="lcLanguageVersion" />
+        <node concept="17QB3L" id="6jbF0BoiMZ8" role="1tU5fm" />
+        <node concept="2AHcQZ" id="6jbF0BoiMZ9" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+        </node>
+      </node>
     </node>
     <node concept="3uibUv" id="7OJcYqx2wVp" role="EKbjA">
       <ref role="3uigEE" node="7OJcYq$EbsZ" resolve="IPropertyStaple" />
@@ -11749,6 +12186,9 @@
               </node>
             </node>
           </node>
+          <node concept="37vLTw" id="6jbF0BoiKie" role="37wK5m">
+            <ref role="3cqZAo" node="6jbF0BoiIxK" resolve="lcLanguageVersion" />
+          </node>
         </node>
       </node>
       <node concept="37vLTG" id="7OJcYqvXZ9h" role="3clF46">
@@ -11778,6 +12218,13 @@
           <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
         </node>
       </node>
+      <node concept="37vLTG" id="6jbF0BoiIxK" role="3clF46">
+        <property role="TrG5h" value="lcLanguageVersion" />
+        <node concept="17QB3L" id="6jbF0BoiIxL" role="1tU5fm" />
+        <node concept="2AHcQZ" id="6jbF0BoiIxM" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+        </node>
+      </node>
     </node>
     <node concept="3clFb_" id="7OJcYqwOWjc" role="jymVt">
       <property role="TrG5h" value="getLc" />
@@ -11928,6 +12375,9 @@
               </node>
             </node>
           </node>
+          <node concept="37vLTw" id="6jbF0BoiGJ1" role="37wK5m">
+            <ref role="3cqZAo" node="6jbF0BoiG6y" resolve="lcLanguageVersion" />
+          </node>
         </node>
         <node concept="3clFbH" id="7OJcYq_muor" role="3cqZAp" />
         <node concept="3clFbF" id="7OJcYq_muos" role="3cqZAp">
@@ -11977,6 +12427,13 @@
           <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
         </node>
       </node>
+      <node concept="37vLTG" id="6jbF0BoiG6y" role="3clF46">
+        <property role="TrG5h" value="lcLanguageVersion" />
+        <node concept="17QB3L" id="6jbF0BoiG6z" role="1tU5fm" />
+        <node concept="2AHcQZ" id="6jbF0BoiG6$" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+        </node>
+      </node>
     </node>
     <node concept="3clFb_" id="7OJcYqwOOzI" role="jymVt">
       <property role="TrG5h" value="getLc" />
@@ -12146,6 +12603,9 @@
               </node>
             </node>
           </node>
+          <node concept="37vLTw" id="6jbF0BoiEXR" role="37wK5m">
+            <ref role="3cqZAo" node="6jbF0BoiEoX" resolve="lcLanguageVersion" />
+          </node>
         </node>
         <node concept="3clFbF" id="7OJcYqwpbTR" role="3cqZAp">
           <node concept="37vLTI" id="7OJcYqwpbTT" role="3clFbG">
@@ -12214,6 +12674,13 @@
           <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
         </node>
       </node>
+      <node concept="37vLTG" id="6jbF0BoiEoX" role="3clF46">
+        <property role="TrG5h" value="lcLanguageVersion" />
+        <node concept="17QB3L" id="6jbF0BoiEoY" role="1tU5fm" />
+        <node concept="2AHcQZ" id="6jbF0BoiEoZ" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+        </node>
+      </node>
     </node>
     <node concept="3clFb_" id="7OJcYqwOF7L" role="jymVt">
       <property role="TrG5h" value="getLc" />
@@ -12386,6 +12853,9 @@
               </node>
             </node>
           </node>
+          <node concept="37vLTw" id="6jbF0BoiDvG" role="37wK5m">
+            <ref role="3cqZAo" node="6jbF0BoiBVS" resolve="lcLanguageVersion" />
+          </node>
         </node>
       </node>
       <node concept="37vLTG" id="7OJcYqwqLmz" role="3clF46">
@@ -12415,6 +12885,13 @@
           <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
         </node>
       </node>
+      <node concept="37vLTG" id="6jbF0BoiBVS" role="3clF46">
+        <property role="TrG5h" value="lcLanguageVersion" />
+        <node concept="17QB3L" id="6jbF0BoiCqp" role="1tU5fm" />
+        <node concept="2AHcQZ" id="6jbF0BoiCss" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+        </node>
+      </node>
     </node>
     <node concept="3clFb_" id="7OJcYqwO$_8" role="jymVt">
       <property role="TrG5h" value="getLc" />
diff --git a/solutions/io.lionweb.mps.m3.selfdescription/models/io.lionweb.mps.m3.selfdescription.converted.mps b/solutions/io.lionweb.mps.m3.selfdescription/models/io.lionweb.mps.m3.selfdescription.converted.mps
index 2b07a568..91c50973 100644
--- a/solutions/io.lionweb.mps.m3.selfdescription/models/io.lionweb.mps.m3.selfdescription.converted.mps
+++ b/solutions/io.lionweb.mps.m3.selfdescription/models/io.lionweb.mps.m3.selfdescription.converted.mps
@@ -3325,7 +3325,7 @@
   <node concept="2RzRRF" id="4R9posqf3NK">
     <property role="2RzON1" value="My-TestLang3" />
     <property role="TrG5h" value="io.lionweb.mps.converter.TestLang3" />
-    <property role="3HH78N" value="0" />
+    <property role="3HH78N" value="00 my! VERSION 😀" />
     <node concept="2RzPWn" id="4R9posqf3NL" role="2RzR6B">
       <property role="2RzP46" value="false" />
       <property role="TrG5h" value="TestConceptPlain" />
diff --git a/solutions/io.lionweb.mps.m3.selfdescription/models/io.lionweb.mps.m3.selfdescription.imported.mps b/solutions/io.lionweb.mps.m3.selfdescription/models/io.lionweb.mps.m3.selfdescription.imported.mps
index e21708d3..4885fed8 100644
--- a/solutions/io.lionweb.mps.m3.selfdescription/models/io.lionweb.mps.m3.selfdescription.imported.mps
+++ b/solutions/io.lionweb.mps.m3.selfdescription/models/io.lionweb.mps.m3.selfdescription.imported.mps
@@ -73,7 +73,7 @@
   </node>
   <node concept="2RzRRF" id="7pLZNi2wTGx">
     <property role="TrG5h" value="LionCore.M3" />
-    <property role="3HH78N" value="1" />
+    <property role="3HH78N" value="2023.1" />
     <property role="2RzON1" value="LionCore_M3" />
     <node concept="2RzPWn" id="7pLZNi2wTGy" role="2RzR6B">
       <property role="2RzP46" value="true" />
@@ -301,7 +301,7 @@
   </node>
   <node concept="2RzRRF" id="5sACIIs$PgG">
     <property role="TrG5h" value="LionCore.M3" />
-    <property role="3HH78N" value="1" />
+    <property role="3HH78N" value="2023.1" />
     <property role="2RzON1" value="LionCore_M3" />
     <node concept="2RzPWn" id="5sACIIs$PgH" role="2RzR6B">
       <property role="2RzP46" value="true" />