From 1b44f41fb107a15c0a7136fe5c6088c2a85ae904 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Wed, 20 Jan 2016 08:59:02 +0100
Subject: [PATCH 01/48] migrate to mps 3.3 final

---
 .mps/encodings.xml                            |   7 +-
 .mps/migration.xml                            |   3 +
 .mps/misc.xml                                 |   5 +-
 .../CodeReviewPreferences/module.msd          |   5 +-
 .../__spreferences/PlatformTemplates.mps      |  55 ++++--
 _spreferences/PlatformTemplates/module.msd    |  32 +++-
 .../__spreferences/TypeSizeConfiguration.mps  |   2 +-
 .../TypeSizeConfiguration/module.msd          |  13 +-
 .../languageModels/editor.mps                 |  83 +++++----
 .../languageModels/intentions.mps             |   2 +-
 .../languageModels/structure.mps              |  53 +++++-
 .../languageModels/typesystem.mps             |   2 +-
 .../mbeddr.arduino.core.mpl                   | 157 ++++++++++++----
 .../pluginSolution/mbeddr.arduino.util.msd    |  92 ++++++----
 .../arduino/core/pluginSolution/plugin.mps    |   4 +-
 .../languageModels/editor.mps                 |   2 +-
 .../languageModels/structure.mps              |   5 +-
 .../mbeddr.arduino.interrupts.mpl             | 120 +++++++++---
 .../generator/template/main@generator.mps     |   4 +-
 .../languageModels/editor.mps                 |   2 +-
 .../languageModels/structure.mps              |   4 +-
 .../mbeddr.arduino.registers.mpl              | 120 ++++++++++--
 .../generator/template/main@generator.mps     |  16 +-
 .../languageModels/constraints.mps            |  16 +-
 .../languageModels/editor.mps                 |   6 +-
 .../languageModels/structure.mps              |   6 +-
 .../mbeddr.arduino.statemachine.mpl           | 172 +++++++++++++-----
 solutions/arduino.samples/arduino.samples.msd |  86 ++++++---
 .../TypeSizeConfiguration (a.s.Atomic).mpsr   |  10 +
 .../TypeSizeConfiguration (a.s.Blinker).mpsr  |  10 +
 .../models/arduino/samples/Serial/.model      |   2 +-
 .../TypeSizeConfiguration (a.s.Serial).mpsr   |  10 +
 .../arduino/samples/statemachine/.model       |   4 +-
 ...eSizeConfiguration (a.s.statemachine).mpsr |  10 +
 .../models/arduino/samples/weather/.model     |   4 +-
 .../TypeSizeConfiguration (a.s.weather).mpsr  |  10 +
 .../mbeddr.arduino.build.msd                  |  11 +-
 .../mbeddr.arduino.header.msd                 |  26 ++-
 .../mbeddr.arduino.platform.msd               |  22 ++-
 .../models/mbeddr/arduino/platform/Main.mps   |   2 +-
 40 files changed, 882 insertions(+), 313 deletions(-)

diff --git a/.mps/encodings.xml b/.mps/encodings.xml
index e206d70..f758959 100644
--- a/.mps/encodings.xml
+++ b/.mps/encodings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.mps/migration.xml b/.mps/migration.xml
index b90449f..858acbf 100644
--- a/.mps/migration.xml
+++ b/.mps/migration.xml
@@ -2,9 +2,12 @@
 <project version="4">
   <component name="MigrationProperties">
     <entry key="jetbrains.mps.cleanSrc" value="executed" />
+    <entry key="jetbrains.mps.cleanSrc_3.3" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v33.UpdateModuleUsedLang" value="executed" />
     <entry key="jetbrains.mps.name2id_gen_perroot" value="executed" />
     <entry key="jetbrains.mps.obsoletePropsCleanup" value="executed" />
     <entry key="jetbrains.mps.projectJavaVersionMigration" value="executed" />
     <entry key="jetbrains.mps.resaveModules" value="executed" />
+    <entry key="jetbrains.mps.v8_elimination" value="executed" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.mps/misc.xml b/.mps/misc.xml
index 7455aa1..a26a506 100644
--- a/.mps/misc.xml
+++ b/.mps/misc.xml
@@ -4,7 +4,6 @@
     <favorites_list name="Heise">
       <favorite_root model_ref="r:d17b3c02-eb62-4d31-bd40-470ae787a5fc(arduino.samples.heating)" />
     </favorites_list>
+    <option name="keepMe" value="true" />
   </component>
-  <component name="ProjectRootManager" version="2" />
-</project>
-
+</project>
\ No newline at end of file
diff --git a/_spreferences/CodeReviewPreferences/module.msd b/_spreferences/CodeReviewPreferences/module.msd
index c692aab..1cece81 100644
--- a/_spreferences/CodeReviewPreferences/module.msd
+++ b/_spreferences/CodeReviewPreferences/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="mbeddr.arduino.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#mbeddr.arduino.__spreferences.CodeReviewPreferences" compileInMPS="true">
+<solution name="mbeddr.arduino.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#mbeddr.arduino.__spreferences.CodeReviewPreferences" moduleVersion="0" compileInMPS="true">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -9,5 +9,8 @@
   <languageVersions>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
   </languageVersions>
+  <dependencyVersions>
+    <module reference="~_PreferencesModule#mbeddr.arduino.__spreferences.CodeReviewPreferences(mbeddr.arduino.__spreferences.CodeReviewPreferences)" version="0" />
+  </dependencyVersions>
 </solution>
 
diff --git a/_spreferences/PlatformTemplates/models/mbeddr/arduino/__spreferences/PlatformTemplates.mps b/_spreferences/PlatformTemplates/models/mbeddr/arduino/__spreferences/PlatformTemplates.mps
index 1fa3441..4768d56 100644
--- a/_spreferences/PlatformTemplates/models/mbeddr/arduino/__spreferences/PlatformTemplates.mps
+++ b/_spreferences/PlatformTemplates/models/mbeddr/arduino/__spreferences/PlatformTemplates.mps
@@ -1,20 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model modelUID="r:0b7ab537-8e2d-339d-960f-70950647ff3c(mbeddr.arduino.__spreferences.PlatformTemplates)">
-  <persistence version="8" />
-  <language namespace="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" />
-  <import index="51wr" modelUID="r:b31f1c3c-99aa-4f1e-a329-cba27efb1a6b(com.mbeddr.core.buildconfig.structure)" version="1" implicit="yes" />
-  <import index="tpck" modelUID="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" version="0" implicit="yes" />
-  <root type="51wr.PlatformTemplateContainer" typeId="51wr.8719112291174072691" id="6587930476890405245" nodeInfo="ng">
-    <node role="templates" roleId="51wr.8719112291174072694" type="51wr.PlatformTemplate" typeId="51wr.8719112291174069759" id="6587930476890405247" nodeInfo="ng">
-      <property name="name" nameId="tpck.1169194664001" value="Desktop Platform" />
-      <node role="template" roleId="51wr.8719112291174069823" type="51wr.DesktopPlatform" typeId="51wr.5323740605968447022" id="6587930476890405246" nodeInfo="ng">
-        <property name="compiler" nameId="51wr.5323740605968447024" value="gcc" />
-        <property name="gdb" nameId="51wr.3963667026125442601" value="gdb" />
-        <property name="make" nameId="51wr.3963667026125442676" value="make" />
-        <property name="compilerOptions" nameId="51wr.5323740605968447025" value="-std=c99" />
-        <property name="debugOptions" nameId="51wr.2736179788492003937" value="-g" />
+<model ref="r:0b7ab537-8e2d-339d-960f-70950647ff3c(mbeddr.arduino.__spreferences.PlatformTemplates)">
+  <persistence version="9" />
+  <languages>
+    <use id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" name="com.mbeddr.core.buildconfig" version="0" />
+  </languages>
+  <imports />
+  <registry>
+    <language id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" name="com.mbeddr.core.buildconfig">
+      <concept id="8719112291174069759" name="com.mbeddr.core.buildconfig.structure.PlatformTemplate" flags="ng" index="2xbbuh">
+        <child id="8719112291174069823" name="template" index="2xbbhh" />
+      </concept>
+      <concept id="8719112291174072691" name="com.mbeddr.core.buildconfig.structure.PlatformTemplateContainer" flags="ng" index="2xbcct">
+        <child id="8719112291174072694" name="templates" index="2xbcco" />
+      </concept>
+      <concept id="5323740605968447022" name="com.mbeddr.core.buildconfig.structure.DesktopPlatform" flags="ng" index="2AWWZL">
+        <property id="5323740605968447025" name="compilerOptions" index="2AWWZI" />
+        <property id="5323740605968447024" name="compiler" index="2AWWZJ" />
+        <property id="3963667026125442601" name="gdb" index="3r8Kw1" />
+        <property id="3963667026125442676" name="make" index="3r8Kxs" />
+      </concept>
+      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
+        <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="2xbcct" id="5HH1XP81r_X">
+    <node concept="2xbbuh" id="5HH1XP81r_Z" role="2xbcco">
+      <property role="TrG5h" value="Desktop Platform" />
+      <node concept="2AWWZL" id="5HH1XP81r_Y" role="2xbbhh">
+        <property role="2AWWZJ" value="gcc" />
+        <property role="3r8Kw1" value="gdb" />
+        <property role="3r8Kxs" value="make" />
+        <property role="2AWWZI" value="-std=c99" />
+        <property role="1FkSt$" value="-g" />
       </node>
     </node>
-  </root>
+  </node>
 </model>
 
diff --git a/_spreferences/PlatformTemplates/module.msd b/_spreferences/PlatformTemplates/module.msd
index 1dd39af..b568d0a 100644
--- a/_spreferences/PlatformTemplates/module.msd
+++ b/_spreferences/PlatformTemplates/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="mbeddr.arduino.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#mbeddr.arduino.__spreferences.PlatformTemplates" compileInMPS="true">
+<solution name="mbeddr.arduino.__spreferences.PlatformTemplates" uuid="~_PreferencesModule#mbeddr.arduino.__spreferences.PlatformTemplates" moduleVersion="0" compileInMPS="true">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -7,7 +7,35 @@
   </models>
   <sourcePath />
   <languageVersions>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="0" />
+    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="2" />
+    <language id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" fqName="com.mbeddr.core.buildconfig" version="0" />
+    <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
+    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="2" />
+    <language id="f93d1dbe-bfd1-42dd-932a-f375fa6f5373" fqName="com.mbeddr.core.make" version="1" />
+    <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" fqName="com.mbeddr.core.modules" version="0" />
+    <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" fqName="com.mbeddr.core.pointers" version="0" />
+    <language id="a9d69647-0840-491e-bf39-2eb0805d2011" fqName="com.mbeddr.core.statements" version="1" />
+    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
+    <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
+    <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />
+    <language id="b4d28e19-7d2d-47e9-943e-3a41f97a0e52" fqName="com.mbeddr.mpsutil.plantuml.node" version="0" />
+    <language id="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2" fqName="com.mbeddr.mpsutil.suppresswarning" version="0" />
+    <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
+    <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
+    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
+    <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" fqName="jetbrains.mps.core.xml" version="0" />
+    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
+    <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
+    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
   </languageVersions>
+  <dependencyVersions>
+    <module reference="~_PreferencesModule#mbeddr.arduino.__spreferences.PlatformTemplates(mbeddr.arduino.__spreferences.PlatformTemplates)" version="0" />
+  </dependencyVersions>
 </solution>
 
diff --git a/_spreferences/TypeSizeConfiguration/models/mbeddr/arduino/__spreferences/TypeSizeConfiguration.mps b/_spreferences/TypeSizeConfiguration/models/mbeddr/arduino/__spreferences/TypeSizeConfiguration.mps
index 43c3d21..d8ae20a 100644
--- a/_spreferences/TypeSizeConfiguration/models/mbeddr/arduino/__spreferences/TypeSizeConfiguration.mps
+++ b/_spreferences/TypeSizeConfiguration/models/mbeddr/arduino/__spreferences/TypeSizeConfiguration.mps
@@ -2,7 +2,7 @@
 <model ref="r:c5acdef6-b720-4ea9-8144-f4ed19a0f531(mbeddr.arduino.__spreferences.TypeSizeConfiguration)">
   <persistence version="9" />
   <languages>
-    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="1" />
+    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="2" />
   </languages>
   <imports />
   <registry>
diff --git a/_spreferences/TypeSizeConfiguration/module.msd b/_spreferences/TypeSizeConfiguration/module.msd
index d4ef936..256340f 100644
--- a/_spreferences/TypeSizeConfiguration/module.msd
+++ b/_spreferences/TypeSizeConfiguration/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="mbeddr.arduino.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#mbeddr.arduino.__spreferences.TypeSizeConfiguration" compileInMPS="true">
+<solution name="mbeddr.arduino.__spreferences.TypeSizeConfiguration" uuid="~_PreferencesModule#mbeddr.arduino.__spreferences.TypeSizeConfiguration" moduleVersion="0" compileInMPS="true">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -7,15 +7,15 @@
   </models>
   <sourcePath />
   <languageVersions>
-    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="1" />
+    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="2" />
     <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
-    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="1" />
+    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="2" />
     <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
     <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
     <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />
     <language id="b4d28e19-7d2d-47e9-943e-3a41f97a0e52" fqName="com.mbeddr.mpsutil.plantuml.node" version="0" />
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
@@ -24,9 +24,12 @@
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
   </languageVersions>
+  <dependencyVersions>
+    <module reference="~_PreferencesModule#mbeddr.arduino.__spreferences.TypeSizeConfiguration(mbeddr.arduino.__spreferences.TypeSizeConfiguration)" version="0" />
+  </dependencyVersions>
 </solution>
 
diff --git a/languages/mbeddr.arduino.core/languageModels/editor.mps b/languages/mbeddr.arduino.core/languageModels/editor.mps
index 7ecb85d..dbf368e 100644
--- a/languages/mbeddr.arduino.core/languageModels/editor.mps
+++ b/languages/mbeddr.arduino.core/languageModels/editor.mps
@@ -2,24 +2,24 @@
 <model ref="r:189ba765-1078-4e40-9618-53a1c5428233(mbeddr.arduino.core.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="-1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
     <use id="7e450f4e-1ac3-41ef-a851-4598161bdb94" name="de.slisson.mps.tables" version="-1" />
     <use id="f89904fb-9486-43a1-865e-5ad0375a8a88" name="de.itemis.mps.editor.bool" version="-1" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
     <import index="koo2" ref="r:3c7790ca-a687-4dfa-a94e-7b5e9848d78c(mbeddr.arduino.core.structure)" />
-    <import index="8q6x" ref="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.awt.event(JDK/java.awt.event@java_stub)" />
-    <import index="dbrf" ref="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#javax.swing(JDK/javax.swing@java_stub)" />
-    <import index="fxg7" ref="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.io(JDK/java.io@java_stub)" />
+    <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
+    <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
+    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" />
     <import index="tpen" ref="r:00000000-0000-4000-0000-011c895902c3(jetbrains.mps.baseLanguage.editor)" />
     <import index="cl6c" ref="r:890ea833-37c9-445e-a04d-3b69ce24aa30(com.mbeddr.core.modules.editor)" />
     <import index="bnk3" ref="r:9805308e-34d7-4576-b7d2-a758b4bd38a3(de.slisson.mps.tables.structure)" />
     <import index="k146" ref="r:5209fc71-bade-45c9-9079-f2d474f0d6ca(com.mbeddr.core.util.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-    <import index="e2lb" ref="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.lang(JDK/java.lang@java_stub)" implicit="true" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -284,6 +284,16 @@
       <concept id="4900677560559655527" name="de.itemis.mps.editor.bool.structure.CellModel_Checkbox" flags="sg" stub="416014060004381438" index="27S6Sx" />
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1204851882688" name="jetbrains.mps.lang.smodel.structure.LinkRefQualifier" flags="ng" index="26LbJo">
+        <reference id="1204851882689" name="link" index="26LbJp" />
+      </concept>
+      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
+        <child id="1144104376918" name="parameter" index="1xVPHs" />
+      </concept>
+      <concept id="7835263205327057228" name="jetbrains.mps.lang.smodel.structure.Node_GetChildrenAndChildAttributesOperation" flags="ng" index="Bykcj" />
+      <concept id="5168775467716640652" name="jetbrains.mps.lang.smodel.structure.OperationParm_LinkQualifier" flags="ng" index="1aIX9F">
+        <child id="5168775467716640653" name="linkQualifier" index="1aIX9E" />
+      </concept>
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
@@ -303,6 +313,9 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
+    </language>
   </registry>
   <node concept="24kQdi" id="4JsbL6NpKGJ">
     <property role="3GE5qa" value="register" />
@@ -1119,11 +1132,11 @@
               <node concept="3cpWsn" id="69ZS$qQFufQ" role="3cpWs9">
                 <property role="TrG5h" value="dcb" />
                 <node concept="3uibUv" id="69ZS$qQFufR" role="1tU5fm">
-                  <ref role="3uigEE" to="dbrf:~JButton" resolve="JButton" />
+                  <ref role="3uigEE" to="dxuu:~JButton" resolve="JButton" />
                 </node>
                 <node concept="2ShNRf" id="69ZS$qQFufT" role="33vP2m">
                   <node concept="1pGfFk" id="69ZS$qQFufU" role="2ShVmc">
-                    <ref role="37wK5l" to="dbrf:~JButton.&lt;init&gt;(java.lang.String)" resolve="JButton" />
+                    <ref role="37wK5l" to="dxuu:~JButton.&lt;init&gt;(java.lang.String)" resolve="JButton" />
                     <node concept="Xl_RD" id="69ZS$qQFufV" role="37wK5m">
                       <property role="Xl_RC" value="..." />
                     </node>
@@ -1137,13 +1150,13 @@
                   <ref role="3cqZAo" node="69ZS$qQFufQ" resolve="dcb" />
                 </node>
                 <node concept="liA8E" id="69ZS$qQFugc" role="2OqNvi">
-                  <ref role="37wK5l" to="dbrf:~AbstractButton.addActionListener(java.awt.event.ActionListener):void" resolve="addActionListener" />
+                  <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener):void" resolve="addActionListener" />
                   <node concept="2ShNRf" id="69ZS$qQFugd" role="37wK5m">
                     <node concept="YeOm9" id="69ZS$qQFuVo" role="2ShVmc">
                       <node concept="1Y3b0j" id="69ZS$qQFuVp" role="YeSDq">
                         <property role="2bfB8j" value="true" />
-                        <ref role="1Y3XeK" to="8q6x:~ActionListener" resolve="ActionListener" />
-                        <ref role="37wK5l" to="e2lb:~Object.&lt;init&gt;()" resolve="Object" />
+                        <ref role="1Y3XeK" to="hyam:~ActionListener" resolve="ActionListener" />
+                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                         <node concept="3Tm1VV" id="69ZS$qQFuVq" role="1B3o_S" />
                         <node concept="3clFb_" id="69ZS$qQFuVr" role="jymVt">
                           <property role="1EzhhJ" value="false" />
@@ -1155,7 +1168,7 @@
                           <node concept="37vLTG" id="69ZS$qQFuVu" role="3clF46">
                             <property role="TrG5h" value="p0" />
                             <node concept="3uibUv" id="69ZS$qQFuVv" role="1tU5fm">
-                              <ref role="3uigEE" to="8q6x:~ActionEvent" resolve="ActionEvent" />
+                              <ref role="3uigEE" to="hyam:~ActionEvent" resolve="ActionEvent" />
                             </node>
                           </node>
                           <node concept="3clFbS" id="69ZS$qQFuVw" role="3clF47">
@@ -1163,11 +1176,11 @@
                               <node concept="3cpWsn" id="4yay9GGyUMF" role="3cpWs9">
                                 <property role="TrG5h" value="jfc" />
                                 <node concept="3uibUv" id="4yay9GGyUMG" role="1tU5fm">
-                                  <ref role="3uigEE" to="dbrf:~JFileChooser" resolve="JFileChooser" />
+                                  <ref role="3uigEE" to="dxuu:~JFileChooser" resolve="JFileChooser" />
                                 </node>
                                 <node concept="2ShNRf" id="4yay9GGyUMI" role="33vP2m">
                                   <node concept="1pGfFk" id="4yay9GGz8II" role="2ShVmc">
-                                    <ref role="37wK5l" to="dbrf:~JFileChooser.&lt;init&gt;()" resolve="JFileChooser" />
+                                    <ref role="37wK5l" to="dxuu:~JFileChooser.&lt;init&gt;()" resolve="JFileChooser" />
                                   </node>
                                 </node>
                               </node>
@@ -1178,7 +1191,7 @@
                                   <ref role="3cqZAo" node="4yay9GGyUMF" resolve="jfc" />
                                 </node>
                                 <node concept="liA8E" id="4yay9GG$znE" role="2OqNvi">
-                                  <ref role="37wK5l" to="dbrf:~JFileChooser.setAcceptAllFileFilterUsed(boolean):void" resolve="setAcceptAllFileFilterUsed" />
+                                  <ref role="37wK5l" to="dxuu:~JFileChooser.setAcceptAllFileFilterUsed(boolean):void" resolve="setAcceptAllFileFilterUsed" />
                                   <node concept="3clFbT" id="4yay9GG$znF" role="37wK5m">
                                     <property role="3clFbU" value="true" />
                                   </node>
@@ -1191,10 +1204,10 @@
                                   <ref role="3cqZAo" node="4yay9GGyUMF" resolve="jfc" />
                                 </node>
                                 <node concept="liA8E" id="4yay9GG$zuh" role="2OqNvi">
-                                  <ref role="37wK5l" to="dbrf:~JFileChooser.setFileSelectionMode(int):void" resolve="setFileSelectionMode" />
+                                  <ref role="37wK5l" to="dxuu:~JFileChooser.setFileSelectionMode(int):void" resolve="setFileSelectionMode" />
                                   <node concept="10M0yZ" id="4yay9GG$zui" role="37wK5m">
-                                    <ref role="1PxDUh" to="dbrf:~JFileChooser" resolve="JFileChooser" />
-                                    <ref role="3cqZAo" to="dbrf:~JFileChooser.DIRECTORIES_ONLY" resolve="DIRECTORIES_ONLY" />
+                                    <ref role="1PxDUh" to="dxuu:~JFileChooser" resolve="JFileChooser" />
+                                    <ref role="3cqZAo" to="dxuu:~JFileChooser.DIRECTORIES_ONLY" resolve="DIRECTORIES_ONLY" />
                                   </node>
                                 </node>
                               </node>
@@ -1223,11 +1236,11 @@
                                         <node concept="3cpWsn" id="3oTXq6kJcOc" role="3cpWs9">
                                           <property role="TrG5h" value="f" />
                                           <node concept="3uibUv" id="3oTXq6kJcOd" role="1tU5fm">
-                                            <ref role="3uigEE" to="fxg7:~File" resolve="File" />
+                                            <ref role="3uigEE" to="guwi:~File" resolve="File" />
                                           </node>
                                           <node concept="2ShNRf" id="3oTXq6kJcOf" role="33vP2m">
                                             <node concept="1pGfFk" id="3oTXq6kJcOg" role="2ShVmc">
-                                              <ref role="37wK5l" to="fxg7:~File.&lt;init&gt;(java.lang.String)" resolve="File" />
+                                              <ref role="37wK5l" to="guwi:~File.&lt;init&gt;(java.lang.String)" resolve="File" />
                                               <node concept="37vLTw" id="2GeljgLpZyT" role="37wK5m">
                                                 <ref role="3cqZAo" node="3oTXq6kJija" resolve="path" />
                                               </node>
@@ -1243,7 +1256,7 @@
                                                 <ref role="3cqZAo" node="4yay9GGyUMF" resolve="jfc" />
                                               </node>
                                               <node concept="liA8E" id="3oTXq6kJc2b" role="2OqNvi">
-                                                <ref role="37wK5l" to="dbrf:~JFileChooser.setCurrentDirectory(java.io.File):void" resolve="setCurrentDirectory" />
+                                                <ref role="37wK5l" to="dxuu:~JFileChooser.setCurrentDirectory(java.io.File):void" resolve="setCurrentDirectory" />
                                                 <node concept="37vLTw" id="2GeljgL484Q" role="37wK5m">
                                                   <ref role="3cqZAo" node="3oTXq6kJcOc" resolve="f" />
                                                 </node>
@@ -1256,7 +1269,7 @@
                                             <ref role="3cqZAo" node="3oTXq6kJcOc" resolve="f" />
                                           </node>
                                           <node concept="liA8E" id="3oTXq6kJcO$" role="2OqNvi">
-                                            <ref role="37wK5l" to="fxg7:~File.exists():boolean" resolve="exists" />
+                                            <ref role="37wK5l" to="guwi:~File.exists():boolean" resolve="exists" />
                                           </node>
                                         </node>
                                       </node>
@@ -1267,7 +1280,7 @@
                                           <property role="Xl_RC" value="" />
                                         </node>
                                         <node concept="liA8E" id="2GeljgLk$vf" role="2OqNvi">
-                                          <ref role="37wK5l" to="e2lb:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                                          <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
                                           <node concept="37vLTw" id="2GeljgLk$vg" role="37wK5m">
                                             <ref role="3cqZAo" node="3oTXq6kJija" resolve="path" />
                                           </node>
@@ -1287,7 +1300,7 @@
                                     <ref role="3cqZAo" node="4yay9GGyUMF" resolve="jfc" />
                                   </node>
                                   <node concept="liA8E" id="4yay9GGzb5O" role="2OqNvi">
-                                    <ref role="37wK5l" to="dbrf:~JFileChooser.showOpenDialog(java.awt.Component):int" resolve="showOpenDialog" />
+                                    <ref role="37wK5l" to="dxuu:~JFileChooser.showOpenDialog(java.awt.Component):int" resolve="showOpenDialog" />
                                     <node concept="10Nm6u" id="69ZS$qQFv4X" role="37wK5m" />
                                   </node>
                                 </node>
@@ -1308,11 +1321,11 @@
                                                 <ref role="3cqZAo" node="4yay9GGyUMF" resolve="jfc" />
                                               </node>
                                               <node concept="liA8E" id="4yay9GG$zFd" role="2OqNvi">
-                                                <ref role="37wK5l" to="dbrf:~JFileChooser.getSelectedFile():java.io.File" resolve="getSelectedFile" />
+                                                <ref role="37wK5l" to="dxuu:~JFileChooser.getSelectedFile():java.io.File" resolve="getSelectedFile" />
                                               </node>
                                             </node>
                                             <node concept="liA8E" id="4yay9GG$zFn" role="2OqNvi">
-                                              <ref role="37wK5l" to="fxg7:~File.getAbsolutePath():java.lang.String" resolve="getAbsolutePath" />
+                                              <ref role="37wK5l" to="guwi:~File.getAbsolutePath():java.lang.String" resolve="getAbsolutePath" />
                                             </node>
                                           </node>
                                         </node>
@@ -1342,8 +1355,8 @@
                                   <ref role="3cqZAo" node="4yay9GGzblo" resolve="ret" />
                                 </node>
                                 <node concept="10M0yZ" id="4yay9GG$z$H" role="3uHU7w">
-                                  <ref role="1PxDUh" to="dbrf:~JFileChooser" resolve="JFileChooser" />
-                                  <ref role="3cqZAo" to="dbrf:~JFileChooser.CANCEL_OPTION" resolve="CANCEL_OPTION" />
+                                  <ref role="1PxDUh" to="dxuu:~JFileChooser" resolve="JFileChooser" />
+                                  <ref role="3cqZAo" to="dxuu:~JFileChooser.CANCEL_OPTION" resolve="CANCEL_OPTION" />
                                 </node>
                               </node>
                             </node>
@@ -1406,8 +1419,8 @@
                     <node concept="3clFbS" id="4O$fzoZSO9e" role="2VODD2">
                       <node concept="3clFbF" id="4O$fzoZSRxk" role="3cqZAp">
                         <node concept="2YIFZM" id="4O$fzoZSYZT" role="3clFbG">
-                          <ref role="1Pybhc" to="e2lb:~String" resolve="String" />
-                          <ref role="37wK5l" to="e2lb:~String.valueOf(int):java.lang.String" resolve="valueOf" />
+                          <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                          <ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
                           <node concept="2OqwBi" id="4O$fzoZSRC$" role="37wK5m">
                             <node concept="pncrf" id="4O$fzoZSRxj" role="2Oq$k0" />
                             <node concept="3TrcHB" id="4O$fzoZSTcy" role="2OqNvi">
@@ -2157,14 +2170,18 @@
         <node concept="pkWqt" id="6RZtz2ljrbj" role="pqm2j">
           <node concept="3clFbS" id="6RZtz2ljrbk" role="2VODD2">
             <node concept="3clFbF" id="6RZtz2ljrlU" role="3cqZAp">
-              <node concept="2OqwBi" id="6RZtz2ljvAt" role="3clFbG">
+              <node concept="2OqwBi" id="xPyHHTtYTn" role="3clFbG">
                 <node concept="2OqwBi" id="6RZtz2ljrxn" role="2Oq$k0">
                   <node concept="pncrf" id="6RZtz2ljrlT" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="6RZtz2lju21" role="2OqNvi">
-                    <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" />
+                  <node concept="Bykcj" id="xPyHHTtYTk" role="2OqNvi">
+                    <node concept="1aIX9F" id="xPyHHTtYTl" role="1xVPHs">
+                      <node concept="26LbJo" id="xPyHHTtYTm" role="1aIX9E">
+                        <ref role="26LbJp" to="koo2:6RZtz2l5VS8" />
+                      </node>
+                    </node>
                   </node>
                 </node>
-                <node concept="3x8VRR" id="6RZtz2ljwMV" role="2OqNvi" />
+                <node concept="3GX2aA" id="xPyHHTtYTo" role="2OqNvi" />
               </node>
             </node>
           </node>
diff --git a/languages/mbeddr.arduino.core/languageModels/intentions.mps b/languages/mbeddr.arduino.core/languageModels/intentions.mps
index 5cd0a4a..eb21c5a 100644
--- a/languages/mbeddr.arduino.core/languageModels/intentions.mps
+++ b/languages/mbeddr.arduino.core/languageModels/intentions.mps
@@ -7,7 +7,7 @@
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
     <use id="3c4c8461-a533-4459-916a-dc0176793b4c" name="mbeddr.arduino.core" version="-1" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="-1" />
-    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="1" />
+    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/languages/mbeddr.arduino.core/languageModels/structure.mps b/languages/mbeddr.arduino.core/languageModels/structure.mps
index aaae2e5..2dfa8ce 100644
--- a/languages/mbeddr.arduino.core/languageModels/structure.mps
+++ b/languages/mbeddr.arduino.core/languageModels/structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:3c7790ca-a687-4dfa-a94e-7b5e9848d78c(mbeddr.arduino.core.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="-1" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
     <devkit ref="d2a9c55c-6bdc-4cc2-97e1-4ba7552f5584(com.mbeddr.core)" />
   </languages>
@@ -40,6 +40,7 @@
         <property id="4628067390765907488" name="conceptShortDescription" index="R4oN_" />
         <property id="4628067390765956802" name="abstract" index="R5$K7" />
         <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
+        <property id="1587916991969465369" name="conceptId" index="1pbfSe" />
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
         <child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
       </concept>
@@ -78,6 +79,7 @@
     <property role="TrG5h" value="ArduinoPlatform" />
     <property role="3GE5qa" value="platform" />
     <property role="34LRSv" value="arduino" />
+    <property role="1pbfSe" value="988530998" />
     <ref role="1TJDcQ" to="51wr:4BxItZJ4BoF" resolve="Platform" />
     <node concept="1TJgyj" id="4JsbL6NpX5B" role="1TKVEi">
       <property role="20lmBu" value="reference" />
@@ -107,14 +109,17 @@
   <node concept="PlHQZ" id="22vbFi$tHds">
     <property role="TrG5h" value="IMcuAwareComponent" />
     <property role="3GE5qa" value="platform" />
+    <property role="1pbfSe" value="988413424" />
   </node>
   <node concept="PlHQZ" id="22vbFi$tHdB">
     <property role="TrG5h" value="ICpuSpeedAwareComponent" />
     <property role="3GE5qa" value="platform" />
+    <property role="1pbfSe" value="988413413" />
   </node>
   <node concept="1TIwiD" id="4JsbL6NpngK">
     <property role="TrG5h" value="ArduinoDescription" />
     <property role="19KtqR" value="true" />
+    <property role="1pbfSe" value="12475583" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="5cS3I48Zmhd" role="1TKVEi">
       <property role="20lmBu" value="reference" />
@@ -197,6 +202,7 @@
   <node concept="1TIwiD" id="4JsbL6NpngL">
     <property role="TrG5h" value="DigitalPin" />
     <property role="3GE5qa" value="pin" />
+    <property role="1pbfSe" value="12475582" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="4JsbL6NpKGV" role="1TKVEl">
       <property role="TrG5h" value="bit" />
@@ -235,6 +241,7 @@
   <node concept="PlHQZ" id="4JsbL6NpngN">
     <property role="TrG5h" value="IPin" />
     <property role="3GE5qa" value="pin" />
+    <property role="1pbfSe" value="12475580" />
     <node concept="1TJgyi" id="4JsbL6NpngO" role="1TKVEl">
       <property role="TrG5h" value="canBeInput" />
       <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
@@ -252,6 +259,7 @@
     <property role="TrG5h" value="Register" />
     <property role="3GE5qa" value="register" />
     <property role="R5$K7" value="true" />
+    <property role="1pbfSe" value="12475574" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="5cS3I48YO7u" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -268,11 +276,13 @@
     <property role="3GE5qa" value="register" />
     <property role="R4oN_" value="a byte register" />
     <property role="34LRSv" value="register8" />
+    <property role="1pbfSe" value="12389702" />
     <ref role="1TJDcQ" node="4JsbL6NpngT" resolve="Register" />
   </node>
   <node concept="1TIwiD" id="4JsbL6NpTFx">
     <property role="TrG5h" value="AnalogPin" />
     <property role="3GE5qa" value="pin" />
+    <property role="1pbfSe" value="12334606" />
     <ref role="1TJDcQ" to="mj1l:7FQByU3CrCQ" resolve="Type" />
     <node concept="1TJgyi" id="4JsbL6NpTF_" role="1TKVEl">
       <property role="TrG5h" value="muxSelector" />
@@ -289,6 +299,7 @@
   <node concept="1TIwiD" id="3gdl6si6JD4">
     <property role="3GE5qa" value="platform" />
     <property role="TrG5h" value="ArduinoConfiguration" />
+    <property role="1pbfSe" value="1177046699" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="3gdl6si6LyV" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -309,6 +320,7 @@
   <node concept="1TIwiD" id="3gdl6si6JD6">
     <property role="3GE5qa" value="platform" />
     <property role="TrG5h" value="DigitalPinConfiguration" />
+    <property role="1pbfSe" value="1177046701" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="3gdl6si6JDf" role="1TKVEl">
       <property role="TrG5h" value="configuration" />
@@ -348,6 +360,7 @@
   <node concept="1TIwiD" id="4EC9auLEQrA">
     <property role="3GE5qa" value="pin" />
     <property role="TrG5h" value="InitializePinsAnnotation" />
+    <property role="1pbfSe" value="61633651" />
     <ref role="1TJDcQ" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
     <node concept="M6xJ_" id="6qOINfCPivy" role="lGtFl">
       <property role="Hh88m" value="pinInit" />
@@ -359,6 +372,7 @@
   <node concept="1TIwiD" id="4EC9auLFa7I">
     <property role="3GE5qa" value="pin" />
     <property role="TrG5h" value="DigitalPinType" />
+    <property role="1pbfSe" value="61553003" />
     <ref role="1TJDcQ" to="mj1l:7FQByU3CrCQ" resolve="Type" />
     <node concept="PrWs8" id="4EC9auLFa7J" role="PzmwI">
       <ref role="PrY4T" to="vs0r:65XyadYMMYC" resolve="ICommentable" />
@@ -368,11 +382,13 @@
     <property role="3GE5qa" value="pin" />
     <property role="TrG5h" value="DigitalValueLiteral" />
     <property role="R5$K7" value="true" />
+    <property role="1pbfSe" value="61553001" />
     <ref role="1TJDcQ" to="mj1l:7FQByU3CrDq" resolve="Literal" />
   </node>
   <node concept="1TIwiD" id="4EC9auLFa7N">
     <property role="3GE5qa" value="pin" />
     <property role="TrG5h" value="DigitalPinRefExpression" />
+    <property role="1pbfSe" value="61552998" />
     <ref role="1TJDcQ" to="mj1l:7FQByU3CrCM" resolve="Expression" />
     <node concept="1TJgyj" id="4EC9auLFa7O" role="1TKVEi">
       <property role="20lmBu" value="reference" />
@@ -385,17 +401,20 @@
     <property role="3GE5qa" value="pin" />
     <property role="TrG5h" value="HighLiteral" />
     <property role="34LRSv" value="high" />
+    <property role="1pbfSe" value="2122968864" />
     <ref role="1TJDcQ" node="4EC9auLFa7K" resolve="DigitalValueLiteral" />
   </node>
   <node concept="1TIwiD" id="4tlTGsRdcXl">
     <property role="3GE5qa" value="pin" />
     <property role="TrG5h" value="LowLiteral" />
     <property role="34LRSv" value="low" />
+    <property role="1pbfSe" value="2123019804" />
     <ref role="1TJDcQ" node="4EC9auLFa7K" resolve="DigitalValueLiteral" />
   </node>
   <node concept="1TIwiD" id="cDLCOYiq1u">
     <property role="3GE5qa" value="register" />
     <property role="TrG5h" value="RegisterRefExpression" />
+    <property role="1pbfSe" value="1098082027" />
     <ref role="1TJDcQ" to="mj1l:7FQByU3CrCM" resolve="Expression" />
     <node concept="1TJgyj" id="cDLCOYiq1v" role="1TKVEi">
       <property role="20lmBu" value="reference" />
@@ -410,6 +429,7 @@
   <node concept="1TIwiD" id="26IgR5b9LNZ">
     <property role="TrG5h" value="DelayExpression" />
     <property role="34LRSv" value="delay" />
+    <property role="1pbfSe" value="1825923184" />
     <ref role="1TJDcQ" to="mj1l:7FQByU3CrCM" resolve="Expression" />
     <node concept="1TJgyj" id="26IgR5b9RPe" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -421,6 +441,7 @@
   <node concept="1TIwiD" id="1pOg3uxo38n">
     <property role="TrG5h" value="AtomicExpression" />
     <property role="34LRSv" value="atomic" />
+    <property role="1pbfSe" value="1210813874" />
     <ref role="1TJDcQ" to="c4fa:3CmSUB7FmO3" resolve="Statement" />
     <node concept="PrWs8" id="zSFqGmbfWz" role="PzmwI">
       <ref role="PrY4T" to="c4fa:1OcdQnySJNS" resolve="ILocalVarScopeProvider" />
@@ -435,6 +456,7 @@
   <node concept="1TIwiD" id="1qwvy7xGC6o">
     <property role="3GE5qa" value="pin" />
     <property role="TrG5h" value="AnalogPinRefExpression" />
+    <property role="1pbfSe" value="128778311" />
     <ref role="1TJDcQ" to="mj1l:7FQByU3CrCM" resolve="Expression" />
     <node concept="1TJgyj" id="1qwvy7xGC6t" role="1TKVEi">
       <property role="20lmBu" value="reference" />
@@ -446,6 +468,7 @@
   <node concept="1TIwiD" id="1qwvy7xGC73">
     <property role="3GE5qa" value="platform" />
     <property role="TrG5h" value="AnalogPinConfiguration" />
+    <property role="1pbfSe" value="128778268" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="1qwvy7xGC75" role="1TKVEi">
       <property role="20lmBu" value="reference" />
@@ -461,12 +484,14 @@
     <property role="TrG5h" value="ArduinoExecutale" />
     <property role="R4oN_" value="an arduino executable binary" />
     <property role="34LRSv" value="arduino executalbe" />
+    <property role="1pbfSe" value="1451612430" />
     <ref role="1TJDcQ" to="51wr:4o9sgv8QoKi" resolve="Executable" />
   </node>
   <node concept="1TIwiD" id="5QG4IuautVs">
     <property role="TrG5h" value="SerialReportingStrategy" />
     <property role="R4oN_" value="reporting via UART" />
     <property role="34LRSv" value="serial" />
+    <property role="1pbfSe" value="400166461" />
     <ref role="1TJDcQ" to="k146:3R$6B6bKEUa" resolve="ReportingStrategy" />
     <node concept="1TJgyj" id="7fU3Y2eiWVo" role="1TKVEi">
       <property role="20lmBu" value="reference" />
@@ -492,6 +517,7 @@
     <property role="TrG5h" value="SerialConfiguration" />
     <property role="34LRSv" value="serial" />
     <property role="R4oN_" value="UART setup" />
+    <property role="1pbfSe" value="138523647" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="3gQUTJ3y9pO" role="1TKVEi">
       <property role="20lmBu" value="reference" />
@@ -524,6 +550,7 @@
     <property role="TrG5h" value="SerialPort" />
     <property role="34LRSv" value="serial port" />
     <property role="R4oN_" value="a serial port" />
+    <property role="1pbfSe" value="138449491" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="7fU3Y2ecVfa" role="1TKVEi">
       <property role="20lmBu" value="reference" />
@@ -646,10 +673,12 @@
     <property role="3GE5qa" value="register" />
     <property role="R4oN_" value="a word register" />
     <property role="34LRSv" value="register16" />
+    <property role="1pbfSe" value="426927465" />
     <ref role="1TJDcQ" node="4JsbL6NpngT" resolve="Register" />
   </node>
   <node concept="PlHQZ" id="4Mvxa96Acs8">
     <property role="TrG5h" value="IWriteTarget" />
+    <property role="1pbfSe" value="1825027158" />
     <node concept="PrWs8" id="4Mvxa96Af43" role="PrDN$">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
@@ -658,6 +687,7 @@
     <property role="TrG5h" value="WriteStatement" />
     <property role="34LRSv" value="write" />
     <property role="R4oN_" value="writes data to a given target" />
+    <property role="1pbfSe" value="1825026142" />
     <ref role="1TJDcQ" to="c4fa:3CmSUB7FmO3" resolve="Statement" />
     <node concept="1TJgyj" id="4Mvxa96AcG3" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -676,6 +706,7 @@
     <property role="TrG5h" value="SetUpVoid" />
     <property role="34LRSv" value="setup" />
     <property role="R4oN_" value="setup function called before the mainloop is executed" />
+    <property role="1pbfSe" value="1285482730" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="3dH4JopctrM" role="PzmwI">
       <ref role="PrY4T" to="x27k:5_l8w1EmTdf" resolve="IModuleContent" />
@@ -700,6 +731,7 @@
     <property role="TrG5h" value="MainLoop" />
     <property role="34LRSv" value="mainLoop" />
     <property role="R4oN_" value="main loop that is called in an infinite loop" />
+    <property role="1pbfSe" value="1287865659" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="3dH4Jopl$nI" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -728,12 +760,14 @@
     <property role="R5$K7" value="true" />
     <property role="34LRSv" value="sleep mode" />
     <property role="3GE5qa" value="sleep" />
+    <property role="1pbfSe" value="49839446" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
   </node>
   <node concept="1TIwiD" id="6RZtz2kYjem">
     <property role="TrG5h" value="SleepStatement" />
     <property role="34LRSv" value="sleep" />
     <property role="3GE5qa" value="sleep" />
+    <property role="1pbfSe" value="49850822" />
     <ref role="1TJDcQ" to="c4fa:3CmSUB7FmO3" resolve="Statement" />
     <node concept="1TJgyj" id="6RZtz2kYjen" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -751,36 +785,42 @@
     <property role="TrG5h" value="SleepModeIdle" />
     <property role="34LRSv" value="Idle Mode" />
     <property role="3GE5qa" value="sleep" />
+    <property role="1pbfSe" value="49855636" />
     <ref role="1TJDcQ" node="6RZtz2kYgsA" resolve="SleepMode" />
   </node>
   <node concept="1TIwiD" id="6RZtz2kYliE">
     <property role="3GE5qa" value="sleep" />
     <property role="TrG5h" value="SleepModeADC" />
     <property role="34LRSv" value="ADC Noise Reduction Mode" />
+    <property role="1pbfSe" value="49859290" />
     <ref role="1TJDcQ" node="6RZtz2kYgsA" resolve="SleepMode" />
   </node>
   <node concept="1TIwiD" id="6RZtz2kYl_y">
     <property role="3GE5qa" value="sleep" />
     <property role="TrG5h" value="SleepModePwrDown" />
     <property role="34LRSv" value="Power-Down Mode" />
+    <property role="1pbfSe" value="49860498" />
     <ref role="1TJDcQ" node="6RZtz2kYgsA" resolve="SleepMode" />
   </node>
   <node concept="1TIwiD" id="6RZtz2kYl_z">
     <property role="3GE5qa" value="sleep" />
     <property role="TrG5h" value="SleepModePwrSave" />
     <property role="34LRSv" value="Power-Save-Mode" />
+    <property role="1pbfSe" value="49860499" />
     <ref role="1TJDcQ" node="6RZtz2kYgsA" resolve="SleepMode" />
   </node>
   <node concept="1TIwiD" id="6RZtz2kYlEU">
     <property role="3GE5qa" value="sleep" />
     <property role="TrG5h" value="SleepModeStdBy" />
     <property role="34LRSv" value="Standby-Mode" />
+    <property role="1pbfSe" value="49860842" />
     <ref role="1TJDcQ" node="6RZtz2kYgsA" resolve="SleepMode" />
   </node>
   <node concept="1TIwiD" id="2$_w8oMMBHX">
     <property role="TrG5h" value="Time" />
     <property role="R5$K7" value="true" />
     <property role="3GE5qa" value="time" />
+    <property role="1pbfSe" value="1542454275" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="2$_w8oMMC12" role="1TKVEl">
       <property role="TrG5h" value="amount" />
@@ -790,6 +830,7 @@
   <node concept="1TIwiD" id="2$_w8oMMCQf">
     <property role="3GE5qa" value="time" />
     <property role="TrG5h" value="TimeConfiguration" />
+    <property role="1pbfSe" value="1542458901" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2$_w8oMMCQ$" role="PzmwI">
       <ref role="PrY4T" to="vs0r:3R$6B6bKw0C" resolve="IConfigurationItem" />
@@ -798,47 +839,55 @@
   <node concept="PlHQZ" id="2$_w8oMMCRk">
     <property role="3GE5qa" value="time" />
     <property role="TrG5h" value="ITimeConfiguration" />
+    <property role="1pbfSe" value="1542458970" />
   </node>
   <node concept="1TIwiD" id="1Jb2EknEKI_">
     <property role="3GE5qa" value="time" />
     <property role="TrG5h" value="NanoSecond" />
     <property role="34LRSv" value="ns" />
+    <property role="1pbfSe" value="863376970" />
     <ref role="1TJDcQ" node="2$_w8oMMBHX" resolve="Time" />
   </node>
   <node concept="1TIwiD" id="1Jb2EknEY6Q">
     <property role="3GE5qa" value="time" />
     <property role="TrG5h" value="MicroSecond" />
     <property role="34LRSv" value="µs" />
+    <property role="1pbfSe" value="863431771" />
     <ref role="1TJDcQ" node="2$_w8oMMBHX" resolve="Time" />
   </node>
   <node concept="1TIwiD" id="1Jb2EknEYch">
     <property role="3GE5qa" value="time" />
     <property role="TrG5h" value="MilliSecond" />
     <property role="34LRSv" value="ms" />
+    <property role="1pbfSe" value="863432118" />
     <ref role="1TJDcQ" node="2$_w8oMMBHX" resolve="Time" />
   </node>
   <node concept="1TIwiD" id="1Jb2EknEYhI">
     <property role="3GE5qa" value="time" />
     <property role="TrG5h" value="Second" />
     <property role="34LRSv" value="s" />
+    <property role="1pbfSe" value="863432467" />
     <ref role="1TJDcQ" node="2$_w8oMMBHX" resolve="Time" />
   </node>
   <node concept="1TIwiD" id="1Jb2EknEYhJ">
     <property role="3GE5qa" value="time" />
     <property role="TrG5h" value="Minute" />
     <property role="34LRSv" value="m" />
+    <property role="1pbfSe" value="863432468" />
     <ref role="1TJDcQ" node="2$_w8oMMBHX" resolve="Time" />
   </node>
   <node concept="1TIwiD" id="1Jb2EknEYhK">
     <property role="3GE5qa" value="time" />
     <property role="TrG5h" value="Hour" />
     <property role="34LRSv" value="h" />
+    <property role="1pbfSe" value="863432469" />
     <ref role="1TJDcQ" node="2$_w8oMMBHX" resolve="Time" />
   </node>
   <node concept="1TIwiD" id="1Jb2EknHM2o">
     <property role="TrG5h" value="Task" />
     <property role="3GE5qa" value="scheduling" />
     <property role="34LRSv" value="task" />
+    <property role="1pbfSe" value="864168765" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="1Jb2EknJfAJ" role="1TKVEl">
       <property role="TrG5h" value="proi" />
@@ -888,6 +937,7 @@
     <property role="TrG5h" value="ScheduleStatement" />
     <property role="34LRSv" value="schdule" />
     <property role="R4oN_" value="schedule a task" />
+    <property role="1pbfSe" value="866361413" />
     <ref role="1TJDcQ" to="c4fa:3CmSUB7FmO3" resolve="Statement" />
     <node concept="1TJgyj" id="1Jb2EknQ9mz" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -904,6 +954,7 @@
   </node>
   <node concept="1TIwiD" id="1ZYgP9n4r$2">
     <property role="TrG5h" value="Interrupt" />
+    <property role="1pbfSe" value="1997536340" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="1ZYgP9n4uno" role="1TKVEl">
       <property role="TrG5h" value="vector" />
diff --git a/languages/mbeddr.arduino.core/languageModels/typesystem.mps b/languages/mbeddr.arduino.core/languageModels/typesystem.mps
index c20ced8..0d16714 100644
--- a/languages/mbeddr.arduino.core/languageModels/typesystem.mps
+++ b/languages/mbeddr.arduino.core/languageModels/typesystem.mps
@@ -5,7 +5,7 @@
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
     <use id="3c4c8461-a533-4459-916a-dc0176793b4c" name="mbeddr.arduino.core" version="-1" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
-    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="1" />
+    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl b/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl
index 307ba61..a899bba 100644
--- a/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl
+++ b/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language namespace="mbeddr.arduino.core" uuid="3c4c8461-a533-4459-916a-dc0176793b4c" version="0">
+<language namespace="mbeddr.arduino.core" uuid="3c4c8461-a533-4459-916a-dc0176793b4c" languageVersion="0" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="languageModels" />
@@ -39,29 +39,19 @@
         <dependency reexport="false">e562f51e-6403-4857-b773-44632077c67d(mbeddr.arduino.interrupts)</dependency>
         <dependency reexport="false">3bba6cee-44fc-4378-bb35-082abd0dafc4(mbeddr.arduino.interrupts#5152824560131035305)</dependency>
       </dependencies>
-      <usedLanguages>
-        <usedLanguage>63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)</usedLanguage>
-        <usedLanguage>b67a6ca0-735e-4903-b238-4b525bddf96a(com.mbeddr.mpsutil.genutil)</usedLanguage>
-        <usedLanguage>92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</usedLanguage>
-        <usedLanguage>af65afd8-f0dd-4942-87d9-63a55f2a9db1(jetbrains.mps.lang.behavior)</usedLanguage>
-        <usedLanguage>b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator)</usedLanguage>
-        <usedLanguage>d7706f63-9be2-479c-a3da-ae92af1e64d5(jetbrains.mps.lang.generator.generationContext)</usedLanguage>
-        <usedLanguage>13744753-c81f-424a-9c1b-cf8943bf4e86(jetbrains.mps.lang.sharedConcepts)</usedLanguage>
-        <usedLanguage>7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)</usedLanguage>
-      </usedLanguages>
       <usedDevKits>
         <usedDevKit>d2a9c55c-6bdc-4cc2-97e1-4ba7552f5584(com.mbeddr.core)</usedDevKit>
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
       </usedDevKits>
       <languageVersions>
-        <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="0" />
+        <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="2" />
         <language id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" fqName="com.mbeddr.core.buildconfig" version="0" />
         <language id="b2da2e1a-b542-47f5-9be0-4dc21efe74a4" fqName="com.mbeddr.core.checks" version="0" />
         <language id="390de4af-0c8d-4716-8dec-3d05ca751b28" fqName="com.mbeddr.core.cinterpreter" version="0" />
         <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
         <language id="ebb5e132-d298-4649-b320-b3f4d7f3acff" fqName="com.mbeddr.core.debug.blext" version="0" />
         <language id="783af01f-87a7-412c-be99-293a162652b5" fqName="com.mbeddr.core.embedded" version="0" />
-        <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="1" />
+        <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="2" />
         <language id="ad5e9db1-9600-47c7-86ef-614165b281b8" fqName="com.mbeddr.core.legacy" version="0" />
         <language id="f93d1dbe-bfd1-42dd-932a-f375fa6f5373" fqName="com.mbeddr.core.make" version="1" />
         <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" fqName="com.mbeddr.core.modules" version="0" />
@@ -69,7 +59,7 @@
         <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" fqName="com.mbeddr.core.pointers" version="0" />
         <language id="a9d69647-0840-491e-bf39-2eb0805d2011" fqName="com.mbeddr.core.statements" version="1" />
         <language id="efda956e-491e-4f00-ba14-36af2f213ecf" fqName="com.mbeddr.core.udt" version="1" />
-        <language id="06d68b77-b699-4918-83b8-857e63787800" fqName="com.mbeddr.core.unittest" version="0" />
+        <language id="06d68b77-b699-4918-83b8-857e63787800" fqName="com.mbeddr.core.unittest" version="1" />
         <language id="2693fc71-9b0e-4b05-ab13-f57227d675f2" fqName="com.mbeddr.core.util" version="0" />
         <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
         <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
@@ -82,7 +72,7 @@
         <language id="7a060fae-09e0-4372-be36-6696d6554c0e" fqName="com.mbeddr.mpsutil.review.annotation" version="0" />
         <language id="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2" fqName="com.mbeddr.mpsutil.suppresswarning" version="0" />
         <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
         <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
         <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
         <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
@@ -99,10 +89,61 @@
         <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
         <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
         <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-        <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+        <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
         <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
         <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
       </languageVersions>
+      <dependencyVersions>
+        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+        <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+        <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
+        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+        <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+        <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+        <module reference="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" version="0" />
+        <module reference="3201b692-7d0a-49d1-ac65-5d4aaeb141fb(com.mbeddr.core.buildconfig#7717755763392579406)" version="0" />
+        <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
+        <module reference="783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)" version="0" />
+        <module reference="7f02a174-6bab-4ef7-8a81-22b54a82846a(com.mbeddr.core.embedded#6847490852669402965)" version="0" />
+        <module reference="61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)" version="0" />
+        <module reference="984f0332-8a86-4f5c-9184-03eae96b5d16(com.mbeddr.core.expressions.runtime)" version="0" />
+        <module reference="f93d1dbe-bfd1-42dd-932a-f375fa6f5373(com.mbeddr.core.make)" version="0" />
+        <module reference="6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)" version="0" />
+        <module reference="3bf5377a-e904-4ded-9754-5a516023bfaa(com.mbeddr.core.pointers)" version="0" />
+        <module reference="a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)" version="0" />
+        <module reference="efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt)" version="0" />
+        <module reference="2693fc71-9b0e-4b05-ab13-f57227d675f2(com.mbeddr.core.util)" version="0" />
+        <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
+        <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
+        <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
+        <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
+        <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
+        <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
+        <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
+        <module reference="af19274f-5f89-42dd-8f3c-c9932448f7f2(jetbrains.mps.analyzers.runtime)" version="0" />
+        <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+        <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
+        <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+        <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+        <module reference="760a0a8c-eabb-4521-8bfd-65db761a9ba3(jetbrains.mps.baseLanguage.logging)" version="0" />
+        <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+        <module reference="479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)" version="0" />
+        <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
+        <module reference="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
+        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+        <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+        <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+        <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
+        <module reference="3c4c8461-a533-4459-916a-dc0176793b4c(mbeddr.arduino.core)" version="0" />
+        <module reference="151f32f8-2c45-4b6c-ad8c-3b4e2f69cfdb(mbeddr.arduino.core#2350648883898979172)" version="0" />
+        <module reference="336a1564-6617-4b5b-84e7-3d25ed4b8c8c(mbeddr.arduino.header)" version="0" />
+        <module reference="e562f51e-6403-4857-b773-44632077c67d(mbeddr.arduino.interrupts)" version="0" />
+        <module reference="3bba6cee-44fc-4378-bb35-082abd0dafc4(mbeddr.arduino.interrupts#5152824560131035305)" version="0" />
+      </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
           <greater-priority-mapping>
@@ -165,33 +206,20 @@
     <dependency reexport="true">336a1564-6617-4b5b-84e7-3d25ed4b8c8c(mbeddr.arduino.header)</dependency>
     <dependency reexport="false">e562f51e-6403-4857-b773-44632077c67d(mbeddr.arduino.interrupts)</dependency>
   </dependencies>
-  <usedLanguages>
-    <usedLanguage>61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</usedLanguage>
-    <usedLanguage>f89904fb-9486-43a1-865e-5ad0375a8a88(de.itemis.mps.editor.bool)</usedLanguage>
-    <usedLanguage>7e450f4e-1ac3-41ef-a851-4598161bdb94(de.slisson.mps.tables)</usedLanguage>
-    <usedLanguage>ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)</usedLanguage>
-    <usedLanguage>774bf8a0-62e5-41e1-af63-f4812e60e48b(jetbrains.mps.baseLanguage.checkedDots)</usedLanguage>
-    <usedLanguage>63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)</usedLanguage>
-    <usedLanguage>aee9cad2-acd4-4608-aef2-0004f6a1cdbd(jetbrains.mps.lang.actions)</usedLanguage>
-    <usedLanguage>d8f591ec-4d86-4af2-9f92-a9e93c803ffa(jetbrains.mps.lang.scopes)</usedLanguage>
-    <usedLanguage>9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)</usedLanguage>
-    <usedLanguage>7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)</usedLanguage>
-    <usedLanguage>3c4c8461-a533-4459-916a-dc0176793b4c(mbeddr.arduino.core)</usedLanguage>
-  </usedLanguages>
   <usedDevKits>
     <usedDevKit>d2a9c55c-6bdc-4cc2-97e1-4ba7552f5584(com.mbeddr.core)</usedDevKit>
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
     <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="0" />
+    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="2" />
     <language id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" fqName="com.mbeddr.core.buildconfig" version="0" />
     <language id="b2da2e1a-b542-47f5-9be0-4dc21efe74a4" fqName="com.mbeddr.core.checks" version="0" />
     <language id="390de4af-0c8d-4716-8dec-3d05ca751b28" fqName="com.mbeddr.core.cinterpreter" version="0" />
     <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
     <language id="ebb5e132-d298-4649-b320-b3f4d7f3acff" fqName="com.mbeddr.core.debug.blext" version="0" />
     <language id="783af01f-87a7-412c-be99-293a162652b5" fqName="com.mbeddr.core.embedded" version="0" />
-    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="1" />
+    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="2" />
     <language id="ad5e9db1-9600-47c7-86ef-614165b281b8" fqName="com.mbeddr.core.legacy" version="0" />
     <language id="f93d1dbe-bfd1-42dd-932a-f375fa6f5373" fqName="com.mbeddr.core.make" version="1" />
     <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" fqName="com.mbeddr.core.modules" version="0" />
@@ -199,7 +227,7 @@
     <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" fqName="com.mbeddr.core.pointers" version="0" />
     <language id="a9d69647-0840-491e-bf39-2eb0805d2011" fqName="com.mbeddr.core.statements" version="1" />
     <language id="efda956e-491e-4f00-ba14-36af2f213ecf" fqName="com.mbeddr.core.udt" version="1" />
-    <language id="06d68b77-b699-4918-83b8-857e63787800" fqName="com.mbeddr.core.unittest" version="0" />
+    <language id="06d68b77-b699-4918-83b8-857e63787800" fqName="com.mbeddr.core.unittest" version="1" />
     <language id="2693fc71-9b0e-4b05-ab13-f57227d675f2" fqName="com.mbeddr.core.util" version="0" />
     <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
     <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
@@ -213,13 +241,14 @@
     <language id="f89904fb-9486-43a1-865e-5ad0375a8a88" fqName="de.itemis.mps.editor.bool" version="0" />
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
     <language id="7e450f4e-1ac3-41ef-a851-4598161bdb94" fqName="de.slisson.mps.tables" version="0" />
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" fqName="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" fqName="jetbrains.mps.baseLanguage.unitTest" version="0" />
@@ -230,18 +259,76 @@
     <language id="fe9d76d7-5809-45c9-ae28-a40915b4d6ff" fqName="jetbrains.mps.lang.checkedName" version="0" />
     <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" fqName="jetbrains.mps.lang.constraints" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="0" />
+    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="1" />
     <language id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" fqName="jetbrains.mps.lang.intentions" version="0" />
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
     <language id="d8f591ec-4d86-4af2-9f92-a9e93c803ffa" fqName="jetbrains.mps.lang.scopes" version="0" />
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
     <language id="b83431fe-5c8f-40bc-8a36-65e25f4dd253" fqName="jetbrains.mps.lang.textGen" version="0" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
     <language id="3c4c8461-a533-4459-916a-dc0176793b4c" fqName="mbeddr.arduino.core" version="0" />
   </languageVersions>
+  <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" version="0" />
+    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+    <module reference="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" version="0" />
+    <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
+    <module reference="783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)" version="0" />
+    <module reference="61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)" version="0" />
+    <module reference="984f0332-8a86-4f5c-9184-03eae96b5d16(com.mbeddr.core.expressions.runtime)" version="0" />
+    <module reference="f93d1dbe-bfd1-42dd-932a-f375fa6f5373(com.mbeddr.core.make)" version="0" />
+    <module reference="6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)" version="0" />
+    <module reference="3bf5377a-e904-4ded-9754-5a516023bfaa(com.mbeddr.core.pointers)" version="0" />
+    <module reference="a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)" version="0" />
+    <module reference="efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt)" version="0" />
+    <module reference="2693fc71-9b0e-4b05-ab13-f57227d675f2(com.mbeddr.core.util)" version="0" />
+    <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
+    <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
+    <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
+    <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
+    <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
+    <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
+    <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
+    <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
+    <module reference="7e450f4e-1ac3-41ef-a851-4598161bdb94(de.slisson.mps.tables)" version="0" />
+    <module reference="da21218f-a674-474d-8b4e-d59e33007003(de.slisson.mps.tables.runtime)" version="0" />
+    <module reference="af19274f-5f89-42dd-8f3c-c9932448f7f2(jetbrains.mps.analyzers.runtime)" version="0" />
+    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
+    <module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
+    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+    <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+    <module reference="760a0a8c-eabb-4521-8bfd-65db761a9ba3(jetbrains.mps.baseLanguage.logging)" version="0" />
+    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="798100da-4f0a-421a-b991-71f8c50ce5d2(jetbrains.mps.build)" version="0" />
+    <module reference="698a8d22-a104-47a0-ba8d-10e3ec237f13(jetbrains.mps.build.workflow)" version="0" />
+    <module reference="58f98fef-90ad-4b72-a390-fad66ec7005a(jetbrains.mps.core.properties)" version="0" />
+    <module reference="479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)" version="0" />
+    <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
+    <module reference="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
+    <module reference="aee9cad2-acd4-4608-aef2-0004f6a1cdbd(jetbrains.mps.lang.actions)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="13744753-c81f-424a-9c1b-cf8943bf4e86(jetbrains.mps.lang.sharedConcepts)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+    <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
+    <module reference="3c4c8461-a533-4459-916a-dc0176793b4c(mbeddr.arduino.core)" version="0" />
+    <module reference="336a1564-6617-4b5b-84e7-3d25ed4b8c8c(mbeddr.arduino.header)" version="0" />
+    <module reference="e562f51e-6403-4857-b773-44632077c67d(mbeddr.arduino.interrupts)" version="0" />
+  </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>2693fc71-9b0e-4b05-ab13-f57227d675f2(com.mbeddr.core.util)</extendedLanguage>
     <extendedLanguage>783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)</extendedLanguage>
diff --git a/languages/mbeddr.arduino.core/solutions/pluginSolution/mbeddr.arduino.util.msd b/languages/mbeddr.arduino.core/solutions/pluginSolution/mbeddr.arduino.util.msd
index 15b3779..c867d39 100644
--- a/languages/mbeddr.arduino.core/solutions/pluginSolution/mbeddr.arduino.util.msd
+++ b/languages/mbeddr.arduino.core/solutions/pluginSolution/mbeddr.arduino.util.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="mbeddr.arduino.core.pluginSolution" uuid="8e15ed0b-eb5e-477c-a001-d8e231c8fba9" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="mbeddr.arduino.core.pluginSolution" uuid="8e15ed0b-eb5e-477c-a001-d8e231c8fba9" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -22,45 +22,14 @@
     <dependency reexport="false">04b376d5-fc16-403b-a344-c68b30193c6a(jetbrains.mps.execution.library)</dependency>
     <dependency reexport="false">3c4c8461-a533-4459-916a-dc0176793b4c(mbeddr.arduino.core)</dependency>
   </dependencies>
-  <usedLanguages>
-    <usedLanguage>f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</usedLanguage>
-    <usedLanguage>443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)</usedLanguage>
-    <usedLanguage>fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)</usedLanguage>
-    <usedLanguage>760a0a8c-eabb-4521-8bfd-65db761a9ba3(jetbrains.mps.baseLanguage.logging)</usedLanguage>
-    <usedLanguage>f3347d8a-0e79-4f35-8ac9-1574f25c986f(jetbrains.mps.execution.commands)</usedLanguage>
-    <usedLanguage>22e72e4c-0f69-46ce-8403-6750153aa615(jetbrains.mps.execution.configurations)</usedLanguage>
-    <usedLanguage>756e911c-3f1f-4a48-bdf5-a2ceb91b723c(jetbrains.mps.execution.settings)</usedLanguage>
-    <usedLanguage>63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)</usedLanguage>
-    <usedLanguage>ef7bf5ac-d06c-4342-b11d-e42104eb9343(jetbrains.mps.lang.plugin.standalone)</usedLanguage>
-    <usedLanguage>982eb8df-2c96-4bd7-9963-11712ea622e5(jetbrains.mps.lang.resources)</usedLanguage>
-    <usedLanguage>7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</usedLanguage>
-    <usedLanguage>3c4c8461-a533-4459-916a-dc0176793b4c(mbeddr.arduino.core)</usedLanguage>
-  </usedLanguages>
   <languageVersions>
-    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="0" />
-    <language id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" fqName="com.mbeddr.core.buildconfig" version="0" />
-    <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
-    <language id="783af01f-87a7-412c-be99-293a162652b5" fqName="com.mbeddr.core.embedded" version="0" />
-    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="0" />
-    <language id="f93d1dbe-bfd1-42dd-932a-f375fa6f5373" fqName="com.mbeddr.core.make" version="0" />
-    <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" fqName="com.mbeddr.core.modules" version="0" />
-    <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" fqName="com.mbeddr.core.pointers" version="0" />
-    <language id="a9d69647-0840-491e-bf39-2eb0805d2011" fqName="com.mbeddr.core.statements" version="1" />
-    <language id="efda956e-491e-4f00-ba14-36af2f213ecf" fqName="com.mbeddr.core.udt" version="1" />
-    <language id="2693fc71-9b0e-4b05-ab13-f57227d675f2" fqName="com.mbeddr.core.util" version="0" />
-    <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
-    <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />
-    <language id="b4d28e19-7d2d-47e9-943e-3a41f97a0e52" fqName="com.mbeddr.mpsutil.plantuml.node" version="0" />
-    <language id="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2" fqName="com.mbeddr.mpsutil.suppresswarning" version="0" />
-    <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="1" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" fqName="jetbrains.mps.core.xml" version="0" />
     <language id="fbc14279-5e2a-4c87-a5d1-5f7061e6c456" fqName="jetbrains.mps.debugger.api.lang" version="0" />
     <language id="f3347d8a-0e79-4f35-8ac9-1574f25c986f" fqName="jetbrains.mps.execution.commands" version="0" />
     <language id="73c1a490-99fa-4d0d-8292-b8985697c74b" fqName="jetbrains.mps.execution.common" version="0" />
@@ -72,10 +41,61 @@
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" fqName="jetbrains.mps.lang.plugin" version="0" />
     <language id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" fqName="jetbrains.mps.lang.plugin.standalone" version="0" />
     <language id="982eb8df-2c96-4bd7-9963-11712ea622e5" fqName="jetbrains.mps.lang.resources" version="0" />
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="0" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
-    <language id="3c4c8461-a533-4459-916a-dc0176793b4c" fqName="mbeddr.arduino.core" version="0" />
   </languageVersions>
+  <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" version="0" />
+    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+    <module reference="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" version="0" />
+    <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
+    <module reference="783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)" version="0" />
+    <module reference="61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)" version="0" />
+    <module reference="984f0332-8a86-4f5c-9184-03eae96b5d16(com.mbeddr.core.expressions.runtime)" version="0" />
+    <module reference="f93d1dbe-bfd1-42dd-932a-f375fa6f5373(com.mbeddr.core.make)" version="0" />
+    <module reference="6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)" version="0" />
+    <module reference="3bf5377a-e904-4ded-9754-5a516023bfaa(com.mbeddr.core.pointers)" version="0" />
+    <module reference="a51f87f6-b1c1-4962-bffc-cddc26760c2d(com.mbeddr.core.runconfiguration.pluginSolution)" version="0" />
+    <module reference="a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)" version="0" />
+    <module reference="efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt)" version="0" />
+    <module reference="2693fc71-9b0e-4b05-ab13-f57227d675f2(com.mbeddr.core.util)" version="0" />
+    <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
+    <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
+    <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
+    <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
+    <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
+    <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
+    <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
+    <module reference="af19274f-5f89-42dd-8f3c-c9932448f7f2(jetbrains.mps.analyzers.runtime)" version="0" />
+    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
+    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+    <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+    <module reference="760a0a8c-eabb-4521-8bfd-65db761a9ba3(jetbrains.mps.baseLanguage.logging)" version="0" />
+    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)" version="0" />
+    <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
+    <module reference="cf8c9de5-1b4a-4dc8-8e6d-847159af31dd(jetbrains.mps.debugger.java.api)" version="0" />
+    <module reference="36c11d2d-1875-4a95-8bdb-70ea1ac63222(jetbrains.mps.execution.api)" version="0" />
+    <module reference="04b376d5-fc16-403b-a344-c68b30193c6a(jetbrains.mps.execution.library)" version="0" />
+    <module reference="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+    <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
+    <module reference="3c4c8461-a533-4459-916a-dc0176793b4c(mbeddr.arduino.core)" version="0" />
+    <module reference="8e15ed0b-eb5e-477c-a001-d8e231c8fba9(mbeddr.arduino.core.pluginSolution)" version="0" />
+    <module reference="336a1564-6617-4b5b-84e7-3d25ed4b8c8c(mbeddr.arduino.header)" version="0" />
+  </dependencyVersions>
 </solution>
 
diff --git a/languages/mbeddr.arduino.core/solutions/pluginSolution/models/mbeddr/arduino/core/pluginSolution/plugin.mps b/languages/mbeddr.arduino.core/solutions/pluginSolution/models/mbeddr/arduino/core/pluginSolution/plugin.mps
index 1113278..542a2b9 100644
--- a/languages/mbeddr.arduino.core/solutions/pluginSolution/models/mbeddr/arduino/core/pluginSolution/plugin.mps
+++ b/languages/mbeddr.arduino.core/solutions/pluginSolution/models/mbeddr/arduino/core/pluginSolution/plugin.mps
@@ -6,13 +6,13 @@
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
     <use id="22e72e4c-0f69-46ce-8403-6750153aa615" name="jetbrains.mps.execution.configurations" version="-1" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
     <use id="756e911c-3f1f-4a48-bdf5-a2ceb91b723c" name="jetbrains.mps.execution.settings" version="-1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="-1" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
   </languages>
   <imports>
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
diff --git a/languages/mbeddr.arduino.interrupts/languageModels/editor.mps b/languages/mbeddr.arduino.interrupts/languageModels/editor.mps
index b1430f4..2a486cc 100644
--- a/languages/mbeddr.arduino.interrupts/languageModels/editor.mps
+++ b/languages/mbeddr.arduino.interrupts/languageModels/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:a392ba58-d039-4eb9-97de-dbfd5d1cf77b(mbeddr.arduino.interrupts.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="-1" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports />
diff --git a/languages/mbeddr.arduino.interrupts/languageModels/structure.mps b/languages/mbeddr.arduino.interrupts/languageModels/structure.mps
index 639852d..111a8f4 100644
--- a/languages/mbeddr.arduino.interrupts/languageModels/structure.mps
+++ b/languages/mbeddr.arduino.interrupts/languageModels/structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:d55f0341-9e17-4146-bd31-d6e253c08cba(mbeddr.arduino.interrupts.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="-1" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -16,6 +16,7 @@
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
         <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
+        <property id="1587916991969465369" name="conceptId" index="1pbfSe" />
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
         <child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
       </concept>
@@ -48,6 +49,7 @@
   <node concept="1TIwiD" id="4u2wEbSxlZT">
     <property role="3GE5qa" value="platform" />
     <property role="TrG5h" value="ArduinoIsr" />
+    <property role="1pbfSe" value="1074258587" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="SwwM9UHwwL" role="PzmwI">
       <ref role="PrY4T" to="x27k:5_l8w1EmTdf" resolve="IModuleContent" />
@@ -73,6 +75,7 @@
     <property role="3GE5qa" value="platform" />
     <property role="TrG5h" value="ArduinoInterruptKind" />
     <property role="34LRSv" value="arduino" />
+    <property role="1pbfSe" value="1074722032" />
     <ref role="1TJDcQ" to="nbyu:7X9xw2qCZP5" resolve="AbstractInterruptKind" />
   </node>
 </model>
diff --git a/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl b/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl
index e01c8b0..ca67445 100644
--- a/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl
+++ b/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language namespace="mbeddr.arduino.interrupts" uuid="e562f51e-6403-4857-b773-44632077c67d" version="0">
+<language namespace="mbeddr.arduino.interrupts" uuid="e562f51e-6403-4857-b773-44632077c67d" languageVersion="0" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="languageModels" />
@@ -30,37 +30,17 @@
         <dependency reexport="false">2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)</dependency>
         <dependency reexport="false">783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)</dependency>
       </dependencies>
-      <usedLanguages>
-        <usedLanguage>b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator)</usedLanguage>
-        <usedLanguage>d7706f63-9be2-479c-a3da-ae92af1e64d5(jetbrains.mps.lang.generator.generationContext)</usedLanguage>
-        <usedLanguage>13744753-c81f-424a-9c1b-cf8943bf4e86(jetbrains.mps.lang.sharedConcepts)</usedLanguage>
-        <usedLanguage>e562f51e-6403-4857-b773-44632077c67d(mbeddr.arduino.interrupts)</usedLanguage>
-      </usedLanguages>
       <usedDevKits>
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
       </usedDevKits>
       <languageVersions>
-        <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="0" />
-        <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
-        <language id="783af01f-87a7-412c-be99-293a162652b5" fqName="com.mbeddr.core.embedded" version="0" />
-        <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="1" />
-        <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" fqName="com.mbeddr.core.modules" version="0" />
-        <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" fqName="com.mbeddr.core.pointers" version="0" />
-        <language id="a9d69647-0840-491e-bf39-2eb0805d2011" fqName="com.mbeddr.core.statements" version="1" />
-        <language id="efda956e-491e-4f00-ba14-36af2f213ecf" fqName="com.mbeddr.core.udt" version="1" />
-        <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
-        <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />
-        <language id="b4d28e19-7d2d-47e9-943e-3a41f97a0e52" fqName="com.mbeddr.mpsutil.plantuml.node" version="0" />
-        <language id="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2" fqName="com.mbeddr.mpsutil.suppresswarning" version="0" />
-        <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
         <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
         <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
         <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
         <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
         <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" fqName="jetbrains.mps.core.xml" version="0" />
         <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
         <language id="b401a680-8325-4110-8fd3-84331ff25bef" fqName="jetbrains.mps.lang.generator" version="0" />
         <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" fqName="jetbrains.mps.lang.generator.generationContext" version="0" />
@@ -70,6 +50,54 @@
         <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
         <language id="e562f51e-6403-4857-b773-44632077c67d" fqName="mbeddr.arduino.interrupts" version="0" />
       </languageVersions>
+      <dependencyVersions>
+        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+        <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+        <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
+        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+        <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+        <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+        <module reference="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" version="0" />
+        <module reference="3201b692-7d0a-49d1-ac65-5d4aaeb141fb(com.mbeddr.core.buildconfig#7717755763392579406)" version="0" />
+        <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
+        <module reference="783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)" version="0" />
+        <module reference="7f02a174-6bab-4ef7-8a81-22b54a82846a(com.mbeddr.core.embedded#6847490852669402965)" version="0" />
+        <module reference="61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)" version="0" />
+        <module reference="984f0332-8a86-4f5c-9184-03eae96b5d16(com.mbeddr.core.expressions.runtime)" version="0" />
+        <module reference="f93d1dbe-bfd1-42dd-932a-f375fa6f5373(com.mbeddr.core.make)" version="0" />
+        <module reference="6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)" version="0" />
+        <module reference="3bf5377a-e904-4ded-9754-5a516023bfaa(com.mbeddr.core.pointers)" version="0" />
+        <module reference="a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)" version="0" />
+        <module reference="efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt)" version="0" />
+        <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
+        <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
+        <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
+        <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
+        <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
+        <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
+        <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
+        <module reference="af19274f-5f89-42dd-8f3c-c9932448f7f2(jetbrains.mps.analyzers.runtime)" version="0" />
+        <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+        <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
+        <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+        <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+        <module reference="760a0a8c-eabb-4521-8bfd-65db761a9ba3(jetbrains.mps.baseLanguage.logging)" version="0" />
+        <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+        <module reference="479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)" version="0" />
+        <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
+        <module reference="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
+        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+        <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+        <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+        <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
+        <module reference="151f32f8-2c45-4b6c-ad8c-3b4e2f69cfdb(mbeddr.arduino.core#2350648883898979172)" version="0" />
+        <module reference="e562f51e-6403-4857-b773-44632077c67d(mbeddr.arduino.interrupts)" version="0" />
+        <module reference="3bba6cee-44fc-4378-bb35-082abd0dafc4(mbeddr.arduino.interrupts#5152824560131035305)" version="0" />
+      </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="before_or_together">
           <greater-priority-mapping>
@@ -100,7 +128,7 @@
     <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -112,15 +140,57 @@
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" fqName="jetbrains.mps.lang.behavior" version="0" />
     <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" fqName="jetbrains.mps.lang.constraints" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="0" />
+    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="1" />
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
     <language id="b83431fe-5c8f-40bc-8a36-65e25f4dd253" fqName="jetbrains.mps.lang.textGen" version="0" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
   </languageVersions>
+  <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+    <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
+    <module reference="783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)" version="0" />
+    <module reference="61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)" version="0" />
+    <module reference="984f0332-8a86-4f5c-9184-03eae96b5d16(com.mbeddr.core.expressions.runtime)" version="0" />
+    <module reference="6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)" version="0" />
+    <module reference="3bf5377a-e904-4ded-9754-5a516023bfaa(com.mbeddr.core.pointers)" version="0" />
+    <module reference="a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)" version="0" />
+    <module reference="efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt)" version="0" />
+    <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
+    <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
+    <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
+    <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
+    <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
+    <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
+    <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
+    <module reference="af19274f-5f89-42dd-8f3c-c9932448f7f2(jetbrains.mps.analyzers.runtime)" version="0" />
+    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
+    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+    <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+    <module reference="760a0a8c-eabb-4521-8bfd-65db761a9ba3(jetbrains.mps.baseLanguage.logging)" version="0" />
+    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)" version="0" />
+    <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
+    <module reference="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+    <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
+    <module reference="e562f51e-6403-4857-b773-44632077c67d(mbeddr.arduino.interrupts)" version="0" />
+  </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</extendedLanguage>
     <extendedLanguage>783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)</extendedLanguage>
diff --git a/languages/mbeddr.arduino.registers/generator/template/main@generator.mps b/languages/mbeddr.arduino.registers/generator/template/main@generator.mps
index 605b55f..fca5937 100644
--- a/languages/mbeddr.arduino.registers/generator/template/main@generator.mps
+++ b/languages/mbeddr.arduino.registers/generator/template/main@generator.mps
@@ -8,7 +8,7 @@
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
     <use id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements" version="-1" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="-1" />
-    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="1" />
+    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -18,8 +18,8 @@
     <import index="nbyu" ref="r:5104a07c-c91d-412c-8374-26edb13383eb(com.mbeddr.core.embedded.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="hwgx" ref="r:fd2980c8-676c-4b19-b524-18c70e02f8b7(com.mbeddr.core.base.behavior)" implicit="true" />
     <import index="fv0w" ref="r:e648f910-e88b-4609-8aaf-328a8c189343(mbeddr.arduino.registers.structure)" implicit="true" />
+    <import index="hwgx" ref="r:fd2980c8-676c-4b19-b524-18c70e02f8b7(com.mbeddr.core.base.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts">
diff --git a/languages/mbeddr.arduino.registers/languageModels/editor.mps b/languages/mbeddr.arduino.registers/languageModels/editor.mps
index bbbb1cb..85c2b51 100644
--- a/languages/mbeddr.arduino.registers/languageModels/editor.mps
+++ b/languages/mbeddr.arduino.registers/languageModels/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:8b3f9793-7cc3-4ec8-a378-8e489d99fd48(mbeddr.arduino.registers.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="-1" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports />
diff --git a/languages/mbeddr.arduino.registers/languageModels/structure.mps b/languages/mbeddr.arduino.registers/languageModels/structure.mps
index 6495bb8..dae617a 100644
--- a/languages/mbeddr.arduino.registers/languageModels/structure.mps
+++ b/languages/mbeddr.arduino.registers/languageModels/structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:e648f910-e88b-4609-8aaf-328a8c189343(mbeddr.arduino.registers.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="-1" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -12,6 +12,7 @@
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
         <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
+        <property id="1587916991969465369" name="conceptId" index="1pbfSe" />
       </concept>
       <concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
         <reference id="1071489389519" name="extends" index="1TJDcQ" />
@@ -30,6 +31,7 @@
     <property role="3GE5qa" value="registers.mbeddr" />
     <property role="TrG5h" value="ArduinoRegisterKind" />
     <property role="34LRSv" value="arduino" />
+    <property role="1pbfSe" value="1074137845" />
     <ref role="1TJDcQ" to="nbyu:5W7baq$aGq_" resolve="AbstractRegisterTransformationKind" />
   </node>
 </model>
diff --git a/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl b/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl
index eae9884..9791917 100644
--- a/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl
+++ b/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language namespace="mbeddr.arduino.registers" uuid="3828799d-97c8-48d0-af8b-39b903457e1e" version="0">
+<language namespace="mbeddr.arduino.registers" uuid="3828799d-97c8-48d0-af8b-39b903457e1e" languageVersion="0" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="languageModels" />
@@ -20,32 +20,20 @@
         <dependency reexport="false">2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)</dependency>
         <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
       </dependencies>
-      <usedLanguages>
-        <usedLanguage>b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator)</usedLanguage>
-        <usedLanguage>d7706f63-9be2-479c-a3da-ae92af1e64d5(jetbrains.mps.lang.generator.generationContext)</usedLanguage>
-        <usedLanguage>3828799d-97c8-48d0-af8b-39b903457e1e(mbeddr.arduino.registers)</usedLanguage>
-        <usedLanguage>a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)</usedLanguage>
-        <usedLanguage>13744753-c81f-424a-9c1b-cf8943bf4e86(jetbrains.mps.lang.sharedConcepts)</usedLanguage>
-        <usedLanguage>61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</usedLanguage>
-      </usedLanguages>
       <usedDevKits>
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
       </usedDevKits>
       <languageVersions>
-        <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="0" />
+        <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="2" />
         <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
-        <language id="783af01f-87a7-412c-be99-293a162652b5" fqName="com.mbeddr.core.embedded" version="0" />
-        <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="1" />
-        <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" fqName="com.mbeddr.core.modules" version="0" />
-        <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" fqName="com.mbeddr.core.pointers" version="0" />
+        <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="2" />
         <language id="a9d69647-0840-491e-bf39-2eb0805d2011" fqName="com.mbeddr.core.statements" version="1" />
-        <language id="efda956e-491e-4f00-ba14-36af2f213ecf" fqName="com.mbeddr.core.udt" version="1" />
+        <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
         <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
         <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />
         <language id="b4d28e19-7d2d-47e9-943e-3a41f97a0e52" fqName="com.mbeddr.mpsutil.plantuml.node" version="0" />
-        <language id="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2" fqName="com.mbeddr.mpsutil.suppresswarning" version="0" />
         <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
         <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
         <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
         <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
@@ -53,15 +41,65 @@
         <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
         <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
         <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" fqName="jetbrains.mps.core.xml" version="0" />
+        <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
         <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
         <language id="b401a680-8325-4110-8fd3-84331ff25bef" fqName="jetbrains.mps.lang.generator" version="0" />
         <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" fqName="jetbrains.mps.lang.generator.generationContext" version="0" />
         <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
         <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
         <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
+        <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
         <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
+        <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
         <language id="3828799d-97c8-48d0-af8b-39b903457e1e" fqName="mbeddr.arduino.registers" version="0" />
       </languageVersions>
+      <dependencyVersions>
+        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+        <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+        <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
+        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+        <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+        <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+        <module reference="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" version="0" />
+        <module reference="3201b692-7d0a-49d1-ac65-5d4aaeb141fb(com.mbeddr.core.buildconfig#7717755763392579406)" version="0" />
+        <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
+        <module reference="783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)" version="0" />
+        <module reference="7f02a174-6bab-4ef7-8a81-22b54a82846a(com.mbeddr.core.embedded#6847490852669402965)" version="0" />
+        <module reference="61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)" version="0" />
+        <module reference="984f0332-8a86-4f5c-9184-03eae96b5d16(com.mbeddr.core.expressions.runtime)" version="0" />
+        <module reference="f93d1dbe-bfd1-42dd-932a-f375fa6f5373(com.mbeddr.core.make)" version="0" />
+        <module reference="6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)" version="0" />
+        <module reference="3bf5377a-e904-4ded-9754-5a516023bfaa(com.mbeddr.core.pointers)" version="0" />
+        <module reference="a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)" version="0" />
+        <module reference="efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt)" version="0" />
+        <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
+        <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
+        <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
+        <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
+        <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
+        <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
+        <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
+        <module reference="af19274f-5f89-42dd-8f3c-c9932448f7f2(jetbrains.mps.analyzers.runtime)" version="0" />
+        <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+        <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
+        <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+        <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+        <module reference="760a0a8c-eabb-4521-8bfd-65db761a9ba3(jetbrains.mps.baseLanguage.logging)" version="0" />
+        <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+        <module reference="479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)" version="0" />
+        <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
+        <module reference="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
+        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+        <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+        <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+        <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
+        <module reference="3828799d-97c8-48d0-af8b-39b903457e1e(mbeddr.arduino.registers)" version="0" />
+        <module reference="5fedd8d1-a723-4001-ab7b-30cda79fe730(mbeddr.arduino.registers#5152824560130938155)" version="0" />
+      </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_together">
           <greater-priority-mapping>
@@ -88,7 +126,7 @@
     <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -100,14 +138,56 @@
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" fqName="jetbrains.mps.lang.behavior" version="0" />
     <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" fqName="jetbrains.mps.lang.constraints" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="0" />
+    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="1" />
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
   </languageVersions>
+  <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+    <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
+    <module reference="783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)" version="0" />
+    <module reference="61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)" version="0" />
+    <module reference="984f0332-8a86-4f5c-9184-03eae96b5d16(com.mbeddr.core.expressions.runtime)" version="0" />
+    <module reference="6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)" version="0" />
+    <module reference="3bf5377a-e904-4ded-9754-5a516023bfaa(com.mbeddr.core.pointers)" version="0" />
+    <module reference="a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)" version="0" />
+    <module reference="efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt)" version="0" />
+    <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
+    <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
+    <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
+    <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
+    <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
+    <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
+    <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
+    <module reference="af19274f-5f89-42dd-8f3c-c9932448f7f2(jetbrains.mps.analyzers.runtime)" version="0" />
+    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
+    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+    <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+    <module reference="760a0a8c-eabb-4521-8bfd-65db761a9ba3(jetbrains.mps.baseLanguage.logging)" version="0" />
+    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)" version="0" />
+    <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
+    <module reference="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+    <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
+    <module reference="3828799d-97c8-48d0-af8b-39b903457e1e(mbeddr.arduino.registers)" version="0" />
+  </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)</extendedLanguage>
   </extendedLanguages>
diff --git a/languages/mbeddr.arduino.statemachine/generator/template/main@generator.mps b/languages/mbeddr.arduino.statemachine/generator/template/main@generator.mps
index 5d50ba0..50f5896 100644
--- a/languages/mbeddr.arduino.statemachine/generator/template/main@generator.mps
+++ b/languages/mbeddr.arduino.statemachine/generator/template/main@generator.mps
@@ -6,11 +6,11 @@
     <use id="028007ba-e266-4d05-ab46-25264b977671" name="mbeddr.arduino.statemachine" version="-1" />
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="-1" />
     <use id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules" version="-1" />
-    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="-1" />
     <use id="564e97d6-8fb7-41f5-bfc1-c7ed376efd62" name="com.mbeddr.ext.statemachines" version="-1" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="-1" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="-1" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
+    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="2" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -83,9 +83,6 @@
       </concept>
     </language>
     <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="17217465924316850" name="com.mbeddr.mpsutil.blutil.structure.FilterOperation" flags="ng" index="2Gpcm3">
-        <reference id="17217465924316851" name="concept" index="2Gpcm2" />
-      </concept>
       <concept id="4481811096721038000" name="com.mbeddr.mpsutil.blutil.structure.RefStep" flags="ng" index="1sh8R2">
         <reference id="4481811096721038001" name="refLink" index="1sh8R3" />
         <child id="4481811096721038002" name="target" index="1sh8R0" />
@@ -134,6 +131,9 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
+      <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
+        <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
+      </concept>
       <concept id="1171315804604" name="jetbrains.mps.lang.smodel.structure.Model_RootsOperation" flags="nn" index="2RRcyG">
         <reference id="1171315804605" name="concept" index="2RRcyH" />
       </concept>
@@ -429,8 +429,10 @@
                         <ref role="3TtcxE" to="x27k:19a6$uAA8hU" />
                       </node>
                     </node>
-                    <node concept="2Gpcm3" id="60mYxM6p6pM" role="2OqNvi">
-                      <ref role="2Gpcm2" to="x27k:3kEjc_WIKGf" resolve="StdHeaderImport" />
+                    <node concept="v3k3i" id="xPyHHTtYTB" role="2OqNvi">
+                      <node concept="chp4Y" id="xPyHHTtYTC" role="v3oSu">
+                        <ref role="cht4Q" to="x27k:3kEjc_WIKGf" resolve="StdHeaderImport" />
+                      </node>
                     </node>
                   </node>
                   <node concept="2HwmR7" id="60mYxM6p6pN" role="2OqNvi">
diff --git a/languages/mbeddr.arduino.statemachine/languageModels/constraints.mps b/languages/mbeddr.arduino.statemachine/languageModels/constraints.mps
index 7b314e2..c228c30 100644
--- a/languages/mbeddr.arduino.statemachine/languageModels/constraints.mps
+++ b/languages/mbeddr.arduino.statemachine/languageModels/constraints.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="-1" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="-1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -58,11 +58,6 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
     </language>
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="17217465924316850" name="com.mbeddr.mpsutil.blutil.structure.FilterOperation" flags="ng" index="2Gpcm3">
-        <reference id="17217465924316851" name="concept" index="2Gpcm2" />
-      </concept>
-    </language>
     <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints">
       <concept id="1148934636683" name="jetbrains.mps.lang.constraints.structure.ConceptParameter_ReferentSearchScope_enclosingNode" flags="nn" index="21POm0" />
       <concept id="8966504967485224688" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_contextNode" flags="nn" index="2rP1CM" />
@@ -93,6 +88,9 @@
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
+        <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
+      </concept>
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="3562215692195599741" name="jetbrains.mps.lang.smodel.structure.SLinkImplicitSelect" flags="nn" index="13MTOL">
         <reference id="3562215692195600259" name="link" index="13MTZf" />
@@ -221,8 +219,10 @@
                                 <ref role="13MTZf" to="x27k:5_l8w1EmTdh" />
                               </node>
                             </node>
-                            <node concept="2Gpcm3" id="2NO1T5RAmre" role="2OqNvi">
-                              <ref role="2Gpcm2" to="x27k:5IYyAOzCrre" resolve="GlobalVariableDeclaration" />
+                            <node concept="v3k3i" id="xPyHHTtYTz" role="2OqNvi">
+                              <node concept="chp4Y" id="xPyHHTtYT$" role="v3oSu">
+                                <ref role="cht4Q" to="x27k:5IYyAOzCrre" resolve="GlobalVariableDeclaration" />
+                              </node>
                             </node>
                           </node>
                           <node concept="3zZkjj" id="2NO1T5RAmrf" role="2OqNvi">
diff --git a/languages/mbeddr.arduino.statemachine/languageModels/editor.mps b/languages/mbeddr.arduino.statemachine/languageModels/editor.mps
index e0bfa6d..6ca274a 100644
--- a/languages/mbeddr.arduino.statemachine/languageModels/editor.mps
+++ b/languages/mbeddr.arduino.statemachine/languageModels/editor.mps
@@ -2,14 +2,14 @@
 <model ref="r:e0ee660a-32fe-4b0d-b08e-ab53b362dcbd(mbeddr.arduino.statemachine.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="-1" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+    <import index="ttha" ref="r:ad7103c9-f253-4cba-81d0-baadf2d307a0(mbeddr.arduino.statemachine.structure)" implicit="true" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="x27k" ref="r:75ecab8a-8931-4140-afc6-4b46398710fc(com.mbeddr.core.modules.structure)" implicit="true" />
-    <import index="ttha" ref="r:ad7103c9-f253-4cba-81d0-baadf2d307a0(mbeddr.arduino.statemachine.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
diff --git a/languages/mbeddr.arduino.statemachine/languageModels/structure.mps b/languages/mbeddr.arduino.statemachine/languageModels/structure.mps
index 052e129..aa600d5 100644
--- a/languages/mbeddr.arduino.statemachine/languageModels/structure.mps
+++ b/languages/mbeddr.arduino.statemachine/languageModels/structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:ad7103c9-f253-4cba-81d0-baadf2d307a0(mbeddr.arduino.statemachine.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="-1" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -17,6 +17,7 @@
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
         <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
+        <property id="1587916991969465369" name="conceptId" index="1pbfSe" />
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
       </concept>
       <concept id="1169127622168" name="jetbrains.mps.lang.structure.structure.InterfaceConceptReference" flags="ig" index="PrWs8">
@@ -42,6 +43,7 @@
   <node concept="1TIwiD" id="2NO1T5RyLIB">
     <property role="TrG5h" value="InterruptInEventTrigger" />
     <property role="34LRSv" value="arduino interrupt" />
+    <property role="1pbfSe" value="1535171784" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2NO1T5RyYTc" role="PzmwI">
       <ref role="PrY4T" to="clqz:41KMvfcjScv" resolve="IInEventBinding" />
@@ -49,6 +51,7 @@
   </node>
   <node concept="1TIwiD" id="2NO1T5Rz3Od">
     <property role="TrG5h" value="ArduinoInterruptInEventBinding" />
+    <property role="1pbfSe" value="1535097698" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="2NO1T5RzgPG" role="1TKVEi">
       <property role="20lmBu" value="reference" />
@@ -71,6 +74,7 @@
   </node>
   <node concept="1TIwiD" id="2NO1T5RDqn0">
     <property role="TrG5h" value="ArduinoStatemachineInterruptConfigItem" />
+    <property role="1pbfSe" value="1533432495" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="2NO1T5REU$T" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
diff --git a/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl b/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl
index 05fb5a5..bac7501 100644
--- a/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl
+++ b/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language namespace="mbeddr.arduino.statemachine" uuid="028007ba-e266-4d05-ab46-25264b977671" version="0">
+<language namespace="mbeddr.arduino.statemachine" uuid="028007ba-e266-4d05-ab46-25264b977671" languageVersion="0" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="languageModels" />
@@ -22,48 +22,34 @@
       <dependencies>
         <dependency reexport="false">3779e7cd-02e4-4dc4-89a1-6e8e31efc854(mbeddr.arduino.platform)</dependency>
       </dependencies>
-      <usedLanguages>
-        <usedLanguage>61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</usedLanguage>
-        <usedLanguage>6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)</usedLanguage>
-        <usedLanguage>564e97d6-8fb7-41f5-bfc1-c7ed376efd62(com.mbeddr.ext.statemachines)</usedLanguage>
-        <usedLanguage>63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)</usedLanguage>
-        <usedLanguage>b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator)</usedLanguage>
-        <usedLanguage>d7706f63-9be2-479c-a3da-ae92af1e64d5(jetbrains.mps.lang.generator.generationContext)</usedLanguage>
-        <usedLanguage>13744753-c81f-424a-9c1b-cf8943bf4e86(jetbrains.mps.lang.sharedConcepts)</usedLanguage>
-        <usedLanguage>3c4c8461-a533-4459-916a-dc0176793b4c(mbeddr.arduino.core)</usedLanguage>
-        <usedLanguage>028007ba-e266-4d05-ab46-25264b977671(mbeddr.arduino.statemachine)</usedLanguage>
-      </usedLanguages>
       <usedDevKits>
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
       </usedDevKits>
       <languageVersions>
-        <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="0" />
+        <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="2" />
         <language id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" fqName="com.mbeddr.core.buildconfig" version="0" />
         <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
-        <language id="783af01f-87a7-412c-be99-293a162652b5" fqName="com.mbeddr.core.embedded" version="0" />
-        <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="0" />
-        <language id="f93d1dbe-bfd1-42dd-932a-f375fa6f5373" fqName="com.mbeddr.core.make" version="0" />
+        <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="2" />
+        <language id="f93d1dbe-bfd1-42dd-932a-f375fa6f5373" fqName="com.mbeddr.core.make" version="1" />
         <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" fqName="com.mbeddr.core.modules" version="0" />
         <language id="62296a07-bc38-46d2-8034-198c24063588" fqName="com.mbeddr.core.modules.gen" version="0" />
         <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" fqName="com.mbeddr.core.pointers" version="0" />
         <language id="a9d69647-0840-491e-bf39-2eb0805d2011" fqName="com.mbeddr.core.statements" version="1" />
         <language id="efda956e-491e-4f00-ba14-36af2f213ecf" fqName="com.mbeddr.core.udt" version="1" />
-        <language id="06d68b77-b699-4918-83b8-857e63787800" fqName="com.mbeddr.core.unittest" version="0" />
+        <language id="06d68b77-b699-4918-83b8-857e63787800" fqName="com.mbeddr.core.unittest" version="1" />
         <language id="2693fc71-9b0e-4b05-ab13-f57227d675f2" fqName="com.mbeddr.core.util" version="0" />
-        <language id="97d24244-51db-4e2e-97fc-7bd73b1f5f40" fqName="com.mbeddr.ext.components" version="0" />
-        <language id="13a36f90-83c5-4bf6-9dd6-70e455f1ef36" fqName="com.mbeddr.ext.components.statemachine" version="0" />
         <language id="564e97d6-8fb7-41f5-bfc1-c7ed376efd62" fqName="com.mbeddr.ext.statemachines" version="0" />
-        <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="0" />
+        <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
         <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
         <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />
         <language id="b4d28e19-7d2d-47e9-943e-3a41f97a0e52" fqName="com.mbeddr.mpsutil.plantuml.node" version="0" />
         <language id="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2" fqName="com.mbeddr.mpsutil.suppresswarning" version="0" />
         <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="1" />
+        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
         <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
         <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
         <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-        <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="1" />
+        <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
         <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
         <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" fqName="jetbrains.mps.core.xml" version="0" />
@@ -73,13 +59,71 @@
         <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" fqName="jetbrains.mps.lang.generator.generationContext" version="0" />
         <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
         <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="0" />
-        <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+        <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
+        <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
         <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
         <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
-        <language id="3c4c8461-a533-4459-916a-dc0176793b4c" fqName="mbeddr.arduino.core" version="0" />
         <language id="028007ba-e266-4d05-ab46-25264b977671" fqName="mbeddr.arduino.statemachine" version="0" />
       </languageVersions>
+      <dependencyVersions>
+        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+        <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+        <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
+        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+        <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+        <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+        <module reference="2764de2d-de8a-48ff-9db3-f78342da5c1a(com.mbeddr.core.base#8626086128958648025)" version="0" />
+        <module reference="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" version="0" />
+        <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
+        <module reference="783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)" version="0" />
+        <module reference="61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)" version="0" />
+        <module reference="984f0332-8a86-4f5c-9184-03eae96b5d16(com.mbeddr.core.expressions.runtime)" version="0" />
+        <module reference="f93d1dbe-bfd1-42dd-932a-f375fa6f5373(com.mbeddr.core.make)" version="0" />
+        <module reference="6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)" version="0" />
+        <module reference="53c31cc6-9e98-4153-905a-a7b5c490ea53(com.mbeddr.core.modules#1758019824472891829)" version="0" />
+        <module reference="62296a07-bc38-46d2-8034-198c24063588(com.mbeddr.core.modules.gen)" version="0" />
+        <module reference="be090156-a678-454c-bd8f-89ebd4a0e6af(com.mbeddr.core.modules.gen#1758019824472882132)" version="0" />
+        <module reference="3bf5377a-e904-4ded-9754-5a516023bfaa(com.mbeddr.core.pointers)" version="0" />
+        <module reference="a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)" version="0" />
+        <module reference="efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt)" version="0" />
+        <module reference="06d68b77-b699-4918-83b8-857e63787800(com.mbeddr.core.unittest)" version="0" />
+        <module reference="2693fc71-9b0e-4b05-ab13-f57227d675f2(com.mbeddr.core.util)" version="0" />
+        <module reference="97d24244-51db-4e2e-97fc-7bd73b1f5f40(com.mbeddr.ext.components)" version="0" />
+        <module reference="13a36f90-83c5-4bf6-9dd6-70e455f1ef36(com.mbeddr.ext.components.statemachine)" version="0" />
+        <module reference="564e97d6-8fb7-41f5-bfc1-c7ed376efd62(com.mbeddr.ext.statemachines)" version="0" />
+        <module reference="ea79507d-33bf-45ac-af32-13a874687ef0(com.mbeddr.ext.statemachines#8836799689252270723)" version="0" />
+        <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
+        <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
+        <module reference="c7a315e6-1d93-4186-85bc-2dfafd1ccc21(com.mbeddr.mpsutil.common)" version="0" />
+        <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
+        <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
+        <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
+        <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
+        <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
+        <module reference="af19274f-5f89-42dd-8f3c-c9932448f7f2(jetbrains.mps.analyzers.runtime)" version="0" />
+        <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+        <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
+        <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+        <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+        <module reference="760a0a8c-eabb-4521-8bfd-65db761a9ba3(jetbrains.mps.baseLanguage.logging)" version="0" />
+        <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+        <module reference="479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)" version="0" />
+        <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
+        <module reference="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
+        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+        <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+        <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+        <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
+        <module reference="3c4c8461-a533-4459-916a-dc0176793b4c(mbeddr.arduino.core)" version="0" />
+        <module reference="336a1564-6617-4b5b-84e7-3d25ed4b8c8c(mbeddr.arduino.header)" version="0" />
+        <module reference="3779e7cd-02e4-4dc4-89a1-6e8e31efc854(mbeddr.arduino.platform)" version="0" />
+        <module reference="028007ba-e266-4d05-ab46-25264b977671(mbeddr.arduino.statemachine)" version="0" />
+        <module reference="0b00f608-4690-4be9-8deb-54ff9a0f2356(mbeddr.arduino.statemachine#7156732329349908700)" version="0" />
+      </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
           <greater-priority-mapping>
@@ -99,47 +143,85 @@
     </generator>
   </generators>
   <sourcePath />
-  <usedLanguages>
-    <usedLanguage>63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)</usedLanguage>
-  </usedLanguages>
   <usedDevKits>
     <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="0" />
+    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="1" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="1" />
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" fqName="jetbrains.mps.baseLanguageInternal" version="0" />
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" fqName="jetbrains.mps.lang.behavior" version="0" />
-    <language id="fe9d76d7-5809-45c9-ae28-a40915b4d6ff" fqName="jetbrains.mps.lang.checkedName" version="0" />
     <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" fqName="jetbrains.mps.lang.constraints" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="7fa12e9c-b949-4976-b4fa-19accbc320b4" fqName="jetbrains.mps.lang.dataFlow" version="0" />
-    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="0" />
-    <language id="64d34fcd-ad02-4e73-aff8-a581124c2e30" fqName="jetbrains.mps.lang.findUsages" version="0" />
-    <language id="b401a680-8325-4110-8fd3-84331ff25bef" fqName="jetbrains.mps.lang.generator" version="0" />
-    <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" fqName="jetbrains.mps.lang.generator.generationContext" version="0" />
-    <language id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" fqName="jetbrains.mps.lang.intentions" version="0" />
-    <language id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" fqName="jetbrains.mps.lang.pattern" version="0" />
+    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="1" />
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
-    <language id="3ecd7c84-cde3-45de-886c-135ecc69b742" fqName="jetbrains.mps.lang.refactoring" version="0" />
-    <language id="0eddeefa-c2d6-4437-bc2c-de50fd4ce470" fqName="jetbrains.mps.lang.script" version="0" />
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="0" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
-    <language id="b83431fe-5c8f-40bc-8a36-65e25f4dd253" fqName="jetbrains.mps.lang.textGen" version="0" />
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
   </languageVersions>
+  <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+    <module reference="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" version="0" />
+    <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
+    <module reference="783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)" version="0" />
+    <module reference="61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)" version="0" />
+    <module reference="984f0332-8a86-4f5c-9184-03eae96b5d16(com.mbeddr.core.expressions.runtime)" version="0" />
+    <module reference="f93d1dbe-bfd1-42dd-932a-f375fa6f5373(com.mbeddr.core.make)" version="0" />
+    <module reference="6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)" version="0" />
+    <module reference="62296a07-bc38-46d2-8034-198c24063588(com.mbeddr.core.modules.gen)" version="0" />
+    <module reference="3bf5377a-e904-4ded-9754-5a516023bfaa(com.mbeddr.core.pointers)" version="0" />
+    <module reference="a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)" version="0" />
+    <module reference="efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt)" version="0" />
+    <module reference="06d68b77-b699-4918-83b8-857e63787800(com.mbeddr.core.unittest)" version="0" />
+    <module reference="2693fc71-9b0e-4b05-ab13-f57227d675f2(com.mbeddr.core.util)" version="0" />
+    <module reference="97d24244-51db-4e2e-97fc-7bd73b1f5f40(com.mbeddr.ext.components)" version="0" />
+    <module reference="13a36f90-83c5-4bf6-9dd6-70e455f1ef36(com.mbeddr.ext.components.statemachine)" version="0" />
+    <module reference="564e97d6-8fb7-41f5-bfc1-c7ed376efd62(com.mbeddr.ext.statemachines)" version="0" />
+    <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
+    <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
+    <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
+    <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
+    <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
+    <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
+    <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
+    <module reference="af19274f-5f89-42dd-8f3c-c9932448f7f2(jetbrains.mps.analyzers.runtime)" version="0" />
+    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
+    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+    <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+    <module reference="760a0a8c-eabb-4521-8bfd-65db761a9ba3(jetbrains.mps.baseLanguage.logging)" version="0" />
+    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)" version="0" />
+    <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
+    <module reference="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+    <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
+    <module reference="3c4c8461-a533-4459-916a-dc0176793b4c(mbeddr.arduino.core)" version="0" />
+    <module reference="336a1564-6617-4b5b-84e7-3d25ed4b8c8c(mbeddr.arduino.header)" version="0" />
+    <module reference="028007ba-e266-4d05-ab46-25264b977671(mbeddr.arduino.statemachine)" version="0" />
+  </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>3c4c8461-a533-4459-916a-dc0176793b4c(mbeddr.arduino.core)</extendedLanguage>
     <extendedLanguage>13a36f90-83c5-4bf6-9dd6-70e455f1ef36(com.mbeddr.ext.components.statemachine)</extendedLanguage>
diff --git a/solutions/arduino.samples/arduino.samples.msd b/solutions/arduino.samples/arduino.samples.msd
index 4986849..cb2ab72 100644
--- a/solutions/arduino.samples/arduino.samples.msd
+++ b/solutions/arduino.samples/arduino.samples.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="arduino.samples" uuid="6641f174-372a-4d9c-becb-c158db4f4770" compileInMPS="true">
+<solution name="arduino.samples" uuid="6641f174-372a-4d9c-becb-c158db4f4770" moduleVersion="0" compileInMPS="true">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,22 +11,6 @@
     <dependency reexport="false">336a1564-6617-4b5b-84e7-3d25ed4b8c8c(mbeddr.arduino.header)</dependency>
     <dependency reexport="false">3779e7cd-02e4-4dc4-89a1-6e8e31efc854(mbeddr.arduino.platform)</dependency>
   </dependencies>
-  <usedLanguages>
-    <usedLanguage>f3ed62ca-3490-40d0-890b-9b3133cc2ead(com.mbeddr.cc.requirements.c)</usedLanguage>
-    <usedLanguage>7a52ca96-9053-41d2-ae13-8cee05f36698(com.mbeddr.cc.requirements.c2doc)</usedLanguage>
-    <usedLanguage>b9f5080f-7f6a-4d86-b994-77d4c982153a(com.mbeddr.cc.requirements.scenario2doc)</usedLanguage>
-    <usedLanguage>d6714220-402d-48cb-a4a2-88223c6257f6(com.mbeddr.cc.requirements.scenarios)</usedLanguage>
-    <usedLanguage>d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</usedLanguage>
-    <usedLanguage>61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</usedLanguage>
-    <usedLanguage>6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)</usedLanguage>
-    <usedLanguage>a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)</usedLanguage>
-    <usedLanguage>2693fc71-9b0e-4b05-ab13-f57227d675f2(com.mbeddr.core.util)</usedLanguage>
-    <usedLanguage>2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)</usedLanguage>
-    <usedLanguage>564e97d6-8fb7-41f5-bfc1-c7ed376efd62(com.mbeddr.ext.statemachines)</usedLanguage>
-    <usedLanguage>92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</usedLanguage>
-    <usedLanguage>3c4c8461-a533-4459-916a-dc0176793b4c(mbeddr.arduino.core)</usedLanguage>
-    <usedLanguage>028007ba-e266-4d05-ab46-25264b977671(mbeddr.arduino.statemachine)</usedLanguage>
-  </usedLanguages>
   <usedDevKits>
     <usedDevKit>a4dac888-0788-4852-b4c0-f386bf6f2c0b(com.mbeddr.cc.reqtrace)</usedDevKit>
     <usedDevKit>b31efd26-898e-4b0e-b5dc-2d7ced06e7f7(com.mbeddr.cc.variability)</usedDevKit>
@@ -50,22 +34,22 @@
     <language id="634736cf-ea73-4eb1-abe9-d2ecc5fcf837" fqName="com.mbeddr.cc.var.c" version="0" />
     <language id="e401b447-8019-4ccd-a72c-bfb0230f5782" fqName="com.mbeddr.cc.var.fm" version="1" />
     <language id="b8eeb935-038d-48d8-ae7f-0c6768b8d4fc" fqName="com.mbeddr.cc.var.rt" version="0" />
-    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="0" />
+    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="2" />
     <language id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" fqName="com.mbeddr.core.buildconfig" version="0" />
     <language id="b2da2e1a-b542-47f5-9be0-4dc21efe74a4" fqName="com.mbeddr.core.checks" version="0" />
     <language id="390de4af-0c8d-4716-8dec-3d05ca751b28" fqName="com.mbeddr.core.cinterpreter" version="0" />
     <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
     <language id="ebb5e132-d298-4649-b320-b3f4d7f3acff" fqName="com.mbeddr.core.debug.blext" version="0" />
     <language id="783af01f-87a7-412c-be99-293a162652b5" fqName="com.mbeddr.core.embedded" version="0" />
-    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="0" />
+    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="2" />
     <language id="ad5e9db1-9600-47c7-86ef-614165b281b8" fqName="com.mbeddr.core.legacy" version="0" />
-    <language id="f93d1dbe-bfd1-42dd-932a-f375fa6f5373" fqName="com.mbeddr.core.make" version="0" />
+    <language id="f93d1dbe-bfd1-42dd-932a-f375fa6f5373" fqName="com.mbeddr.core.make" version="1" />
     <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" fqName="com.mbeddr.core.modules" version="0" />
     <language id="62296a07-bc38-46d2-8034-198c24063588" fqName="com.mbeddr.core.modules.gen" version="0" />
     <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" fqName="com.mbeddr.core.pointers" version="0" />
     <language id="a9d69647-0840-491e-bf39-2eb0805d2011" fqName="com.mbeddr.core.statements" version="1" />
     <language id="efda956e-491e-4f00-ba14-36af2f213ecf" fqName="com.mbeddr.core.udt" version="1" />
-    <language id="06d68b77-b699-4918-83b8-857e63787800" fqName="com.mbeddr.core.unittest" version="0" />
+    <language id="06d68b77-b699-4918-83b8-857e63787800" fqName="com.mbeddr.core.unittest" version="1" />
     <language id="2693fc71-9b0e-4b05-ab13-f57227d675f2" fqName="com.mbeddr.core.util" version="0" />
     <language id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" fqName="com.mbeddr.doc" version="0" />
     <language id="f44f6b9a-bf30-4f73-866e-fac17c177409" fqName="com.mbeddr.doc.gen_latex" version="0" />
@@ -80,7 +64,8 @@
     <language id="41911c23-eb23-4ee6-872f-bc7f7ebce290" fqName="com.mbeddr.ext.components.test" version="0" />
     <language id="54f2a59b-97bb-4c09-af92-928ebf9c5966" fqName="com.mbeddr.ext.compositecomponents" version="0" />
     <language id="564e97d6-8fb7-41f5-bfc1-c7ed376efd62" fqName="com.mbeddr.ext.statemachines" version="0" />
-    <language id="0d04a6cc-773e-4069-b9b0-11884b2ff1c8" fqName="com.mbeddr.ext.units" version="0" />
+    <language id="0d04a6cc-773e-4069-b9b0-11884b2ff1c8" fqName="com.mbeddr.ext.units" version="1" />
+    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
     <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
     <language id="1c897ba5-9d43-4035-ac7f-0306495743ac" fqName="com.mbeddr.mpsutil.interpreter.test" version="0" />
     <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />
@@ -91,23 +76,74 @@
     <language id="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2" fqName="com.mbeddr.mpsutil.suppresswarning" version="0" />
     <language id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" fqName="de.itemis.mps.editor.diagram.layout" version="0" />
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="1" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
+    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" fqName="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" fqName="jetbrains.mps.core.xml" version="0" />
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" fqName="jetbrains.mps.lang.behavior" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
     <language id="86ef8290-12bb-4ca7-947f-093788f263a9" fqName="jetbrains.mps.lang.project" version="0" />
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="0" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
+    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
     <language id="3c4c8461-a533-4459-916a-dc0176793b4c" fqName="mbeddr.arduino.core" version="0" />
     <language id="e562f51e-6403-4857-b773-44632077c67d" fqName="mbeddr.arduino.interrupts" version="0" />
     <language id="3828799d-97c8-48d0-af8b-39b903457e1e" fqName="mbeddr.arduino.registers" version="0" />
     <language id="028007ba-e266-4d05-ab46-25264b977671" fqName="mbeddr.arduino.statemachine" version="0" />
   </languageVersions>
+  <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="6641f174-372a-4d9c-becb-c158db4f4770(arduino.samples)" version="0" />
+    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+    <module reference="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" version="0" />
+    <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
+    <module reference="783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)" version="0" />
+    <module reference="61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)" version="0" />
+    <module reference="984f0332-8a86-4f5c-9184-03eae96b5d16(com.mbeddr.core.expressions.runtime)" version="0" />
+    <module reference="f93d1dbe-bfd1-42dd-932a-f375fa6f5373(com.mbeddr.core.make)" version="0" />
+    <module reference="6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)" version="0" />
+    <module reference="3bf5377a-e904-4ded-9754-5a516023bfaa(com.mbeddr.core.pointers)" version="0" />
+    <module reference="a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)" version="0" />
+    <module reference="efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt)" version="0" />
+    <module reference="2693fc71-9b0e-4b05-ab13-f57227d675f2(com.mbeddr.core.util)" version="0" />
+    <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
+    <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
+    <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
+    <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
+    <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
+    <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
+    <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
+    <module reference="af19274f-5f89-42dd-8f3c-c9932448f7f2(jetbrains.mps.analyzers.runtime)" version="0" />
+    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
+    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+    <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+    <module reference="760a0a8c-eabb-4521-8bfd-65db761a9ba3(jetbrains.mps.baseLanguage.logging)" version="0" />
+    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)" version="0" />
+    <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
+    <module reference="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+    <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
+    <module reference="3c4c8461-a533-4459-916a-dc0176793b4c(mbeddr.arduino.core)" version="0" />
+    <module reference="8e15ed0b-eb5e-477c-a001-d8e231c8fba9(mbeddr.arduino.core.pluginSolution)" version="0" />
+    <module reference="336a1564-6617-4b5b-84e7-3d25ed4b8c8c(mbeddr.arduino.header)" version="0" />
+    <module reference="3779e7cd-02e4-4dc4-89a1-6e8e31efc854(mbeddr.arduino.platform)" version="0" />
+  </dependencyVersions>
 </solution>
 
diff --git a/solutions/arduino.samples/models/arduino/samples/Atomic/TypeSizeConfiguration (a.s.Atomic).mpsr b/solutions/arduino.samples/models/arduino/samples/Atomic/TypeSizeConfiguration (a.s.Atomic).mpsr
index 3b1f0f9..c05ecfa 100644
--- a/solutions/arduino.samples/models/arduino/samples/Atomic/TypeSizeConfiguration (a.s.Atomic).mpsr	
+++ b/solutions/arduino.samples/models/arduino/samples/Atomic/TypeSizeConfiguration (a.s.Atomic).mpsr	
@@ -37,6 +37,8 @@
         <child id="3335993110369805710" name="specifications" index="MXv61" />
         <child id="8863019357864392147" name="sizeTType" index="2O5j3Q" />
         <child id="3813668170744198630" name="pointerDiffType" index="3kxMGo" />
+        <child id="7808382574383152989" name="intPtrType" index="3sasR9" />
+        <child id="7808382574383153001" name="uintPtrType" index="3sasRX" />
         <child id="6658270785788810330" name="minFloatValue" index="3LaRDq" />
         <child id="6658270785788810339" name="maxDoubleValue" index="3LaRDz" />
         <child id="6658270785788810349" name="minDoubleValue" index="3LaRDH" />
@@ -223,6 +225,14 @@
       <property role="3VGQ4h" value="1" />
       <property role="3VGQ4j" value="37" />
     </node>
+    <node concept="1X9cn3" id="xPyHHTtYTF" role="3sasR9">
+      <property role="2caQfQ" value="false" />
+      <property role="2c7vTL" value="false" />
+    </node>
+    <node concept="26VBNf" id="xPyHHTtYTG" role="3sasRX">
+      <property role="2caQfQ" value="false" />
+      <property role="2c7vTL" value="false" />
+    </node>
   </node>
 </model>
 
diff --git a/solutions/arduino.samples/models/arduino/samples/Blinker/TypeSizeConfiguration (a.s.Blinker).mpsr b/solutions/arduino.samples/models/arduino/samples/Blinker/TypeSizeConfiguration (a.s.Blinker).mpsr
index 16b1319..e7a8ea3 100644
--- a/solutions/arduino.samples/models/arduino/samples/Blinker/TypeSizeConfiguration (a.s.Blinker).mpsr	
+++ b/solutions/arduino.samples/models/arduino/samples/Blinker/TypeSizeConfiguration (a.s.Blinker).mpsr	
@@ -37,6 +37,8 @@
         <child id="3335993110369805710" name="specifications" index="MXv61" />
         <child id="8863019357864392147" name="sizeTType" index="2O5j3Q" />
         <child id="3813668170744198630" name="pointerDiffType" index="3kxMGo" />
+        <child id="7808382574383152989" name="intPtrType" index="3sasR9" />
+        <child id="7808382574383153001" name="uintPtrType" index="3sasRX" />
         <child id="6658270785788810330" name="minFloatValue" index="3LaRDq" />
         <child id="6658270785788810339" name="maxDoubleValue" index="3LaRDz" />
         <child id="6658270785788810349" name="minDoubleValue" index="3LaRDH" />
@@ -223,6 +225,14 @@
       <property role="3VGQ4h" value="1" />
       <property role="3VGQ4j" value="37" />
     </node>
+    <node concept="1X9cn3" id="xPyHHTtYTJ" role="3sasR9">
+      <property role="2caQfQ" value="false" />
+      <property role="2c7vTL" value="false" />
+    </node>
+    <node concept="26VBNf" id="xPyHHTtYTK" role="3sasRX">
+      <property role="2caQfQ" value="false" />
+      <property role="2c7vTL" value="false" />
+    </node>
   </node>
 </model>
 
diff --git a/solutions/arduino.samples/models/arduino/samples/Serial/.model b/solutions/arduino.samples/models/arduino/samples/Serial/.model
index 5eff3fe..fc3bedf 100644
--- a/solutions/arduino.samples/models/arduino/samples/Serial/.model
+++ b/solutions/arduino.samples/models/arduino/samples/Serial/.model
@@ -6,8 +6,8 @@
     <use id="2693fc71-9b0e-4b05-ab13-f57227d675f2" name="com.mbeddr.core.util" version="-1" />
     <use id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" name="com.mbeddr.core.buildconfig" version="-1" />
     <use id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules" version="-1" />
-    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="-1" />
     <use id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements" version="1" />
+    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="2" />
     <devkit ref="6845f348-7ea5-449c-ae3b-3d600bc3b73d(mbeddr.arduino)" />
   </languages>
   <imports>
diff --git a/solutions/arduino.samples/models/arduino/samples/Serial/TypeSizeConfiguration (a.s.Serial).mpsr b/solutions/arduino.samples/models/arduino/samples/Serial/TypeSizeConfiguration (a.s.Serial).mpsr
index e2f7ad9..f36682b 100644
--- a/solutions/arduino.samples/models/arduino/samples/Serial/TypeSizeConfiguration (a.s.Serial).mpsr	
+++ b/solutions/arduino.samples/models/arduino/samples/Serial/TypeSizeConfiguration (a.s.Serial).mpsr	
@@ -37,6 +37,8 @@
         <child id="3335993110369805710" name="specifications" index="MXv61" />
         <child id="8863019357864392147" name="sizeTType" index="2O5j3Q" />
         <child id="3813668170744198630" name="pointerDiffType" index="3kxMGo" />
+        <child id="7808382574383152989" name="intPtrType" index="3sasR9" />
+        <child id="7808382574383153001" name="uintPtrType" index="3sasRX" />
         <child id="5598157691785092886" name="vaList" index="3EM3Bk" />
         <child id="6658270785788810330" name="minFloatValue" index="3LaRDq" />
         <child id="6658270785788810339" name="maxDoubleValue" index="3LaRDz" />
@@ -228,6 +230,14 @@
       <property role="3VGQ4h" value="1" />
       <property role="3VGQ4j" value="37" />
     </node>
+    <node concept="1X9cn3" id="xPyHHTtYTH" role="3sasR9">
+      <property role="2caQfQ" value="false" />
+      <property role="2c7vTL" value="false" />
+    </node>
+    <node concept="26VBNf" id="xPyHHTtYTI" role="3sasRX">
+      <property role="2caQfQ" value="false" />
+      <property role="2c7vTL" value="false" />
+    </node>
   </node>
 </model>
 
diff --git a/solutions/arduino.samples/models/arduino/samples/statemachine/.model b/solutions/arduino.samples/models/arduino/samples/statemachine/.model
index 8749357..c0eb8a6 100644
--- a/solutions/arduino.samples/models/arduino/samples/statemachine/.model
+++ b/solutions/arduino.samples/models/arduino/samples/statemachine/.model
@@ -7,11 +7,11 @@
     <use id="564e97d6-8fb7-41f5-bfc1-c7ed376efd62" name="com.mbeddr.ext.statemachines" version="-1" />
     <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="-1" />
     <use id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules" version="-1" />
-    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="-1" />
-    <use id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base" version="-1" />
     <use id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" name="com.mbeddr.core.buildconfig" version="-1" />
     <use id="2693fc71-9b0e-4b05-ab13-f57227d675f2" name="com.mbeddr.core.util" version="-1" />
     <use id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements" version="1" />
+    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="2" />
+    <use id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base" version="2" />
     <devkit ref="6845f348-7ea5-449c-ae3b-3d600bc3b73d(mbeddr.arduino)" />
   </languages>
   <imports>
diff --git a/solutions/arduino.samples/models/arduino/samples/statemachine/TypeSizeConfiguration (a.s.statemachine).mpsr b/solutions/arduino.samples/models/arduino/samples/statemachine/TypeSizeConfiguration (a.s.statemachine).mpsr
index c064e8e..a564408 100644
--- a/solutions/arduino.samples/models/arduino/samples/statemachine/TypeSizeConfiguration (a.s.statemachine).mpsr	
+++ b/solutions/arduino.samples/models/arduino/samples/statemachine/TypeSizeConfiguration (a.s.statemachine).mpsr	
@@ -37,6 +37,8 @@
         <child id="3335993110369805710" name="specifications" index="MXv61" />
         <child id="8863019357864392147" name="sizeTType" index="2O5j3Q" />
         <child id="3813668170744198630" name="pointerDiffType" index="3kxMGo" />
+        <child id="7808382574383152989" name="intPtrType" index="3sasR9" />
+        <child id="7808382574383153001" name="uintPtrType" index="3sasRX" />
       </concept>
       <concept id="4739982148980385695" name="com.mbeddr.core.expressions.structure.FloatType" flags="ng" index="3AreGT" />
       <concept id="8860443239512128054" name="com.mbeddr.core.expressions.structure.Type" flags="ng" index="3TlMgo">
@@ -199,6 +201,14 @@
         <property role="2c7vTL" value="false" />
       </node>
     </node>
+    <node concept="1X9cn3" id="xPyHHTtYTN" role="3sasR9">
+      <property role="2caQfQ" value="false" />
+      <property role="2c7vTL" value="false" />
+    </node>
+    <node concept="26VBNf" id="xPyHHTtYTO" role="3sasRX">
+      <property role="2caQfQ" value="false" />
+      <property role="2c7vTL" value="false" />
+    </node>
   </node>
 </model>
 
diff --git a/solutions/arduino.samples/models/arduino/samples/weather/.model b/solutions/arduino.samples/models/arduino/samples/weather/.model
index 04994cc..eeabcc5 100644
--- a/solutions/arduino.samples/models/arduino/samples/weather/.model
+++ b/solutions/arduino.samples/models/arduino/samples/weather/.model
@@ -4,13 +4,13 @@
   <attribute name="content" value="header" />
   <languages>
     <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="-1" />
-    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="-1" />
-    <use id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base" version="-1" />
     <use id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules" version="-1" />
     <use id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" name="com.mbeddr.core.buildconfig" version="-1" />
     <use id="2693fc71-9b0e-4b05-ab13-f57227d675f2" name="com.mbeddr.core.util" version="-1" />
     <use id="783af01f-87a7-412c-be99-293a162652b5" name="com.mbeddr.core.embedded" version="-1" />
     <use id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements" version="1" />
+    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="2" />
+    <use id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base" version="2" />
     <devkit ref="6845f348-7ea5-449c-ae3b-3d600bc3b73d(mbeddr.arduino)" />
     <devkit ref="1a986be1-0ef0-4f9f-9d8a-81c3ea7227ae(com.mbeddr.physicalunits)" />
     <devkit ref="54c79f9f-f3ba-4167-91f1-eb4e98a9c47c(com.mbeddr.documentation)" />
diff --git a/solutions/arduino.samples/models/arduino/samples/weather/TypeSizeConfiguration (a.s.weather).mpsr b/solutions/arduino.samples/models/arduino/samples/weather/TypeSizeConfiguration (a.s.weather).mpsr
index 03067a6..0878039 100644
--- a/solutions/arduino.samples/models/arduino/samples/weather/TypeSizeConfiguration (a.s.weather).mpsr	
+++ b/solutions/arduino.samples/models/arduino/samples/weather/TypeSizeConfiguration (a.s.weather).mpsr	
@@ -37,6 +37,8 @@
         <child id="3335993110369805710" name="specifications" index="MXv61" />
         <child id="8863019357864392147" name="sizeTType" index="2O5j3Q" />
         <child id="3813668170744198630" name="pointerDiffType" index="3kxMGo" />
+        <child id="7808382574383152989" name="intPtrType" index="3sasR9" />
+        <child id="7808382574383153001" name="uintPtrType" index="3sasRX" />
         <child id="5598157691785092886" name="vaList" index="3EM3Bk" />
       </concept>
       <concept id="4739982148980385695" name="com.mbeddr.core.expressions.structure.FloatType" flags="ng" index="3AreGT" />
@@ -204,6 +206,14 @@
         <property role="2c7vTL" value="false" />
       </node>
     </node>
+    <node concept="1X9cn3" id="xPyHHTtYTL" role="3sasR9">
+      <property role="2caQfQ" value="false" />
+      <property role="2c7vTL" value="false" />
+    </node>
+    <node concept="26VBNf" id="xPyHHTtYTM" role="3sasRX">
+      <property role="2caQfQ" value="false" />
+      <property role="2c7vTL" value="false" />
+    </node>
   </node>
 </model>
 
diff --git a/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd b/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd
index 73777fc..a1963ff 100644
--- a/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd
+++ b/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="mbeddr.arduino.build" uuid="2ce61d63-b3b4-440d-9d3c-f64799660d3f" compileInMPS="true">
+<solution name="mbeddr.arduino.build" uuid="2ce61d63-b3b4-440d-9d3c-f64799660d3f" moduleVersion="0" compileInMPS="true">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,10 +10,6 @@
     <dependency reexport="false">f1fb7b1c-ce0d-423c-9369-4a661d600029(de.slisson.mps.all.build)</dependency>
     <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
   </dependencies>
-  <usedLanguages>
-    <usedLanguage>798100da-4f0a-421a-b991-71f8c50ce5d2(jetbrains.mps.build)</usedLanguage>
-    <usedLanguage>0cf935df-4699-4e9c-a132-fa109541cba3(jetbrains.mps.build.mps)</usedLanguage>
-  </usedLanguages>
   <languageVersions>
     <language id="798100da-4f0a-421a-b991-71f8c50ce5d2" fqName="jetbrains.mps.build" version="0" />
     <language id="0cf935df-4699-4e9c-a132-fa109541cba3" fqName="jetbrains.mps.build.mps" version="1" />
@@ -23,5 +19,10 @@
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
+  <dependencyVersions>
+    <module reference="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.slisson.mps.all.build)" version="0" />
+    <module reference="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" version="0" />
+    <module reference="2ce61d63-b3b4-440d-9d3c-f64799660d3f(mbeddr.arduino.build)" version="0" />
+  </dependencyVersions>
 </solution>
 
diff --git a/solutions/mbeddr.arduino.header/mbeddr.arduino.header.msd b/solutions/mbeddr.arduino.header/mbeddr.arduino.header.msd
index 8ca9d8f..85160a2 100644
--- a/solutions/mbeddr.arduino.header/mbeddr.arduino.header.msd
+++ b/solutions/mbeddr.arduino.header/mbeddr.arduino.header.msd
@@ -1,31 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="mbeddr.arduino.header" uuid="336a1564-6617-4b5b-84e7-3d25ed4b8c8c" compileInMPS="true">
+<solution name="mbeddr.arduino.header" uuid="336a1564-6617-4b5b-84e7-3d25ed4b8c8c" moduleVersion="0" compileInMPS="true">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
   <sourcePath />
-  <usedLanguages>
-    <usedLanguage>d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</usedLanguage>
-    <usedLanguage>61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</usedLanguage>
-    <usedLanguage>6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)</usedLanguage>
-    <usedLanguage>3bf5377a-e904-4ded-9754-5a516023bfaa(com.mbeddr.core.pointers)</usedLanguage>
-    <usedLanguage>a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)</usedLanguage>
-    <usedLanguage>efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt)</usedLanguage>
-  </usedLanguages>
   <usedDevKits>
     <usedDevKit>d2a9c55c-6bdc-4cc2-97e1-4ba7552f5584(com.mbeddr.core)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="0" />
+    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="2" />
     <language id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" fqName="com.mbeddr.core.buildconfig" version="0" />
     <language id="b2da2e1a-b542-47f5-9be0-4dc21efe74a4" fqName="com.mbeddr.core.checks" version="0" />
     <language id="390de4af-0c8d-4716-8dec-3d05ca751b28" fqName="com.mbeddr.core.cinterpreter" version="0" />
     <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
     <language id="ebb5e132-d298-4649-b320-b3f4d7f3acff" fqName="com.mbeddr.core.debug.blext" version="0" />
     <language id="783af01f-87a7-412c-be99-293a162652b5" fqName="com.mbeddr.core.embedded" version="0" />
-    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="1" />
+    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="2" />
     <language id="ad5e9db1-9600-47c7-86ef-614165b281b8" fqName="com.mbeddr.core.legacy" version="0" />
     <language id="f93d1dbe-bfd1-42dd-932a-f375fa6f5373" fqName="com.mbeddr.core.make" version="1" />
     <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" fqName="com.mbeddr.core.modules" version="0" />
@@ -33,8 +25,9 @@
     <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" fqName="com.mbeddr.core.pointers" version="0" />
     <language id="a9d69647-0840-491e-bf39-2eb0805d2011" fqName="com.mbeddr.core.statements" version="1" />
     <language id="efda956e-491e-4f00-ba14-36af2f213ecf" fqName="com.mbeddr.core.udt" version="1" />
-    <language id="06d68b77-b699-4918-83b8-857e63787800" fqName="com.mbeddr.core.unittest" version="0" />
+    <language id="06d68b77-b699-4918-83b8-857e63787800" fqName="com.mbeddr.core.unittest" version="1" />
     <language id="2693fc71-9b0e-4b05-ab13-f57227d675f2" fqName="com.mbeddr.core.util" version="0" />
+    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
     <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
     <language id="1c897ba5-9d43-4035-ac7f-0306495743ac" fqName="com.mbeddr.mpsutil.interpreter.test" version="0" />
     <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />
@@ -44,18 +37,23 @@
     <language id="7a060fae-09e0-4372-be36-6696d6554c0e" fqName="com.mbeddr.mpsutil.review.annotation" version="0" />
     <language id="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2" fqName="com.mbeddr.mpsutil.suppresswarning" version="0" />
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
+    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" fqName="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" fqName="jetbrains.mps.core.xml" version="0" />
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" fqName="jetbrains.mps.lang.behavior" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
+    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
   </languageVersions>
+  <dependencyVersions>
+    <module reference="336a1564-6617-4b5b-84e7-3d25ed4b8c8c(mbeddr.arduino.header)" version="0" />
+  </dependencyVersions>
 </solution>
 
diff --git a/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd b/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd
index 1e91664..5f41dc8 100644
--- a/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd
+++ b/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="mbeddr.arduino.platform" uuid="3779e7cd-02e4-4dc4-89a1-6e8e31efc854" compileInMPS="true">
+<solution name="mbeddr.arduino.platform" uuid="3779e7cd-02e4-4dc4-89a1-6e8e31efc854" moduleVersion="0" compileInMPS="true">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -9,22 +9,19 @@
   <dependencies>
     <dependency reexport="false">336a1564-6617-4b5b-84e7-3d25ed4b8c8c(mbeddr.arduino.header)</dependency>
   </dependencies>
-  <usedLanguages>
-    <usedLanguage>3c4c8461-a533-4459-916a-dc0176793b4c(mbeddr.arduino.core)</usedLanguage>
-  </usedLanguages>
   <usedDevKits>
     <usedDevKit>24565007-e59f-42fc-ac10-da3836deec1c(com.mbeddr.components)</usedDevKit>
     <usedDevKit>d2a9c55c-6bdc-4cc2-97e1-4ba7552f5584(com.mbeddr.core)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="0" />
+    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="2" />
     <language id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" fqName="com.mbeddr.core.buildconfig" version="0" />
     <language id="b2da2e1a-b542-47f5-9be0-4dc21efe74a4" fqName="com.mbeddr.core.checks" version="0" />
     <language id="390de4af-0c8d-4716-8dec-3d05ca751b28" fqName="com.mbeddr.core.cinterpreter" version="0" />
     <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
     <language id="ebb5e132-d298-4649-b320-b3f4d7f3acff" fqName="com.mbeddr.core.debug.blext" version="0" />
     <language id="783af01f-87a7-412c-be99-293a162652b5" fqName="com.mbeddr.core.embedded" version="0" />
-    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="1" />
+    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="2" />
     <language id="ad5e9db1-9600-47c7-86ef-614165b281b8" fqName="com.mbeddr.core.legacy" version="0" />
     <language id="f93d1dbe-bfd1-42dd-932a-f375fa6f5373" fqName="com.mbeddr.core.make" version="1" />
     <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" fqName="com.mbeddr.core.modules" version="0" />
@@ -32,8 +29,9 @@
     <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" fqName="com.mbeddr.core.pointers" version="0" />
     <language id="a9d69647-0840-491e-bf39-2eb0805d2011" fqName="com.mbeddr.core.statements" version="1" />
     <language id="efda956e-491e-4f00-ba14-36af2f213ecf" fqName="com.mbeddr.core.udt" version="1" />
-    <language id="06d68b77-b699-4918-83b8-857e63787800" fqName="com.mbeddr.core.unittest" version="0" />
+    <language id="06d68b77-b699-4918-83b8-857e63787800" fqName="com.mbeddr.core.unittest" version="1" />
     <language id="2693fc71-9b0e-4b05-ab13-f57227d675f2" fqName="com.mbeddr.core.util" version="0" />
+    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
     <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
     <language id="1c897ba5-9d43-4035-ac7f-0306495743ac" fqName="com.mbeddr.mpsutil.interpreter.test" version="0" />
     <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />
@@ -43,19 +41,25 @@
     <language id="7a060fae-09e0-4372-be36-6696d6554c0e" fqName="com.mbeddr.mpsutil.review.annotation" version="0" />
     <language id="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2" fqName="com.mbeddr.mpsutil.suppresswarning" version="0" />
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
+    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" fqName="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" fqName="jetbrains.mps.core.xml" version="0" />
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" fqName="jetbrains.mps.lang.behavior" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
+    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
     <language id="3c4c8461-a533-4459-916a-dc0176793b4c" fqName="mbeddr.arduino.core" version="0" />
   </languageVersions>
+  <dependencyVersions>
+    <module reference="336a1564-6617-4b5b-84e7-3d25ed4b8c8c(mbeddr.arduino.header)" version="0" />
+    <module reference="3779e7cd-02e4-4dc4-89a1-6e8e31efc854(mbeddr.arduino.platform)" version="0" />
+  </dependencyVersions>
 </solution>
 
diff --git a/solutions/mbeddr.arduino.platform/models/mbeddr/arduino/platform/Main.mps b/solutions/mbeddr.arduino.platform/models/mbeddr/arduino/platform/Main.mps
index 0bd0e11..bce89db 100644
--- a/solutions/mbeddr.arduino.platform/models/mbeddr/arduino/platform/Main.mps
+++ b/solutions/mbeddr.arduino.platform/models/mbeddr/arduino/platform/Main.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="3c4c8461-a533-4459-916a-dc0176793b4c" name="mbeddr.arduino.core" version="-1" />
-    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="1" />
+    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="2" />
     <devkit ref="d2a9c55c-6bdc-4cc2-97e1-4ba7552f5584(com.mbeddr.core)" />
   </languages>
   <imports />

From 1c5b945a2dcaf7b7b2391164125728b0d96c9bff Mon Sep 17 00:00:00 2001
From: danielratiu <ratiud@googlemail.com>
Date: Wed, 2 Nov 2016 12:34:45 +0100
Subject: [PATCH 02/48] migrated to MPS 3.4.1

---
 .mps/migration.xml                            |   3 +
 .../generator/template/main@generator.mps     | 510 +++++++++---------
 .../languageModels/behavior.mps               |  90 ++--
 .../languageModels/structure.mps              | 166 ++++--
 .../mbeddr.arduino.core.mpl                   | 214 ++++----
 .../languageModels/editor.mps                 |   2 +-
 .../languageModels/structure.mps              |  10 +-
 .../mbeddr.arduino.interrupts.mpl             |  88 +--
 .../languageModels/editor.mps                 |   2 +-
 .../languageModels/structure.mps              |   4 +-
 .../mbeddr.arduino.registers.mpl              |  68 +--
 .../languageModels/structure.mps              |  13 +-
 .../mbeddr.arduino.statemachine.mpl           | 121 ++---
 solutions/arduino.samples/arduino.samples.msd | 147 ++---
 .../models/arduino/samples/Atomic/.model      |   0
 .../models/arduino/samples/Atomic/Atomic.mpsr |   0
 .../BuildConfiguration (a.s.Atomic).mpsr      |   4 +-
 .../TypeSizeConfiguration (a.s.Atomic).mpsr   |   0
 .../arduino/samples/statemachine/.model       |   0
 ...BuildConfiguration (a.s.statemachine).mpsr |   4 +-
 .../samples/statemachine/Statemachine.mpsr    |   6 +-
 ...eSizeConfiguration (a.s.statemachine).mpsr |   0
 .../models/arduino/samples/weather/.model     |   0
 .../BuildConfiguration (a.s.weather).mpsr     |   4 +-
 .../TypeSizeConfiguration (a.s.weather).mpsr  |   0
 .../mbeddr.arduino.build.msd                  |   8 +-
 .../mbeddr.arduino.header.msd                 |  82 +--
 .../models/mbeddr/arduino/header/Import.mps   |  30 ++
 .../mbeddr.arduino.platform.msd               |  43 +-
 29 files changed, 834 insertions(+), 785 deletions(-)
 mode change 100644 => 100755 .mps/migration.xml
 mode change 100644 => 100755 languages/mbeddr.arduino.core/generator/template/mbeddr/arduino/core/generator/template/main@generator.mps
 mode change 100644 => 100755 languages/mbeddr.arduino.core/languageModels/behavior.mps
 mode change 100644 => 100755 languages/mbeddr.arduino.core/languageModels/structure.mps
 mode change 100644 => 100755 languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl
 mode change 100644 => 100755 languages/mbeddr.arduino.interrupts/languageModels/editor.mps
 mode change 100644 => 100755 languages/mbeddr.arduino.interrupts/languageModels/structure.mps
 mode change 100644 => 100755 languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl
 mode change 100644 => 100755 languages/mbeddr.arduino.registers/languageModels/editor.mps
 mode change 100644 => 100755 languages/mbeddr.arduino.registers/languageModels/structure.mps
 mode change 100644 => 100755 languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl
 mode change 100644 => 100755 languages/mbeddr.arduino.statemachine/languageModels/structure.mps
 mode change 100644 => 100755 languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl
 mode change 100644 => 100755 solutions/arduino.samples/arduino.samples.msd
 mode change 100644 => 100755 solutions/arduino.samples/models/arduino/samples/Atomic/.model
 mode change 100644 => 100755 solutions/arduino.samples/models/arduino/samples/Atomic/Atomic.mpsr
 mode change 100644 => 100755 solutions/arduino.samples/models/arduino/samples/Atomic/BuildConfiguration (a.s.Atomic).mpsr
 mode change 100644 => 100755 solutions/arduino.samples/models/arduino/samples/Atomic/TypeSizeConfiguration (a.s.Atomic).mpsr
 mode change 100644 => 100755 solutions/arduino.samples/models/arduino/samples/statemachine/.model
 mode change 100644 => 100755 solutions/arduino.samples/models/arduino/samples/statemachine/BuildConfiguration (a.s.statemachine).mpsr
 mode change 100644 => 100755 solutions/arduino.samples/models/arduino/samples/statemachine/Statemachine.mpsr
 mode change 100644 => 100755 solutions/arduino.samples/models/arduino/samples/statemachine/TypeSizeConfiguration (a.s.statemachine).mpsr
 mode change 100644 => 100755 solutions/arduino.samples/models/arduino/samples/weather/.model
 mode change 100644 => 100755 solutions/arduino.samples/models/arduino/samples/weather/BuildConfiguration (a.s.weather).mpsr
 mode change 100644 => 100755 solutions/arduino.samples/models/arduino/samples/weather/TypeSizeConfiguration (a.s.weather).mpsr
 mode change 100644 => 100755 solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd
 mode change 100644 => 100755 solutions/mbeddr.arduino.header/mbeddr.arduino.header.msd
 mode change 100644 => 100755 solutions/mbeddr.arduino.header/models/mbeddr/arduino/header/Import.mps
 mode change 100644 => 100755 solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd

diff --git a/.mps/migration.xml b/.mps/migration.xml
old mode 100644
new mode 100755
index 858acbf..9886445
--- a/.mps/migration.xml
+++ b/.mps/migration.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="MigrationProperties">
+    <entry key="jetbrains.mps.cleanExp_3.4" value="executed" />
     <entry key="jetbrains.mps.cleanSrc" value="executed" />
     <entry key="jetbrains.mps.cleanSrc_3.3" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v33.UpdateModuleUsedLang" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v34.EngagedLanguagesImports" value="executed" />
+    <entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
     <entry key="jetbrains.mps.name2id_gen_perroot" value="executed" />
     <entry key="jetbrains.mps.obsoletePropsCleanup" value="executed" />
     <entry key="jetbrains.mps.projectJavaVersionMigration" value="executed" />
diff --git a/languages/mbeddr.arduino.core/generator/template/mbeddr/arduino/core/generator/template/main@generator.mps b/languages/mbeddr.arduino.core/generator/template/mbeddr/arduino/core/generator/template/main@generator.mps
old mode 100644
new mode 100755
index a141d6a..a935be5
--- a/languages/mbeddr.arduino.core/generator/template/mbeddr/arduino/core/generator/template/main@generator.mps
+++ b/languages/mbeddr.arduino.core/generator/template/mbeddr/arduino/core/generator/template/main@generator.mps
@@ -206,7 +206,7 @@
       <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
       </concept>
-      <concept id="3830958861296879113" name="com.mbeddr.core.statements.structure.AbritraryTextItem" flags="ng" index="19_wF0">
+      <concept id="3830958861296879113" name="com.mbeddr.core.statements.structure.ArbitraryTextItem" flags="ng" index="19_wF0">
         <property id="3830958861296879114" name="text" index="19_wF3" />
       </concept>
       <concept id="3830958861296871078" name="com.mbeddr.core.statements.structure.ArbitraryTextExpression" flags="ng" index="19_ADJ">
@@ -522,8 +522,8 @@
         <reference id="1240930444946" name="member" index="3HdYuM" />
       </concept>
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <reference id="1140138128738" name="concept" index="1PxNhF" />
-        <child id="1140138123956" name="leftExpression" index="1PxMeX" />
+        <reference id="1140138128738" name="concept_old" index="1PxNhF" />
+        <child id="1140138123956" name="leftExpression_old" index="1PxMeX" />
       </concept>
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
@@ -852,11 +852,11 @@
                                 <node concept="2OqwBi" id="2mpt1xbRGP5" role="2Oq$k0">
                                   <node concept="30H73N" id="2mpt1xbRGOK" role="2Oq$k0" />
                                   <node concept="3TrEf2" id="2mpt1xbRGPb" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" />
+                                    <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" resolve="pinConfig" />
                                   </node>
                                 </node>
                                 <node concept="3TrEf2" id="2mpt1xbRGPB" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                  <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                 </node>
                               </node>
                               <node concept="3TrcHB" id="2mpt1xbRGQE" role="2OqNvi">
@@ -893,19 +893,19 @@
                                   <node concept="2OqwBi" id="2mpt1xbRGN1" role="2Oq$k0">
                                     <node concept="30H73N" id="2mpt1xbRGMG" role="2Oq$k0" />
                                     <node concept="3TrEf2" id="2mpt1xbRGN7" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" />
+                                      <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" resolve="pinConfig" />
                                     </node>
                                   </node>
                                   <node concept="3TrEf2" id="2mpt1xbRGNz" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                    <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                   </node>
                                 </node>
                                 <node concept="3TrEf2" id="2mpt1xbRGO9" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="koo2:4JsbL6NpKGU" />
+                                  <ref role="3Tt5mk" to="koo2:4JsbL6NpKGU" resolve="inputReg" />
                                 </node>
                               </node>
                               <node concept="3TrEf2" id="5cS3I48Za59" role="2OqNvi">
-                                <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                               </node>
                             </node>
                             <node concept="2qgKlT" id="5cS3I48Za5E" role="2OqNvi">
@@ -1001,17 +1001,17 @@
                                             <node concept="2OqwBi" id="26IgR5b9IvS" role="1PxMeX">
                                               <node concept="30H73N" id="26IgR5b9IvT" role="2Oq$k0" />
                                               <node concept="3TrEf2" id="26IgR5b9IvU" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" />
+                                                <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                                               </node>
                                             </node>
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="26IgR5b9IvV" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" />
+                                          <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" resolve="pinConfig" />
                                         </node>
                                       </node>
                                       <node concept="3TrEf2" id="26IgR5b9IvW" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                        <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                       </node>
                                     </node>
                                     <node concept="3TrcHB" id="26IgR5b9IvX" role="2OqNvi">
@@ -1025,7 +1025,7 @@
                               <node concept="2OqwBi" id="26IgR5b9IvZ" role="2Oq$k0">
                                 <node concept="30H73N" id="26IgR5b9Iw0" role="2Oq$k0" />
                                 <node concept="3TrEf2" id="26IgR5b9Iw1" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" />
+                                  <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                                 </node>
                               </node>
                               <node concept="1mIQ4w" id="26IgR5b9Iw2" role="2OqNvi">
@@ -1049,17 +1049,17 @@
                                               <node concept="2OqwBi" id="26IgR5b9Iwd" role="1PxMeX">
                                                 <node concept="30H73N" id="26IgR5b9Iwe" role="2Oq$k0" />
                                                 <node concept="3TrEf2" id="26IgR5b9Iwf" role="2OqNvi">
-                                                  <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" />
+                                                  <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
                                                 </node>
                                               </node>
                                             </node>
                                           </node>
                                           <node concept="3TrEf2" id="26IgR5b9Iwg" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" />
+                                            <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" resolve="pinConfig" />
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="26IgR5b9Iwh" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                          <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                         </node>
                                       </node>
                                       <node concept="3TrcHB" id="26IgR5b9Iwi" role="2OqNvi">
@@ -1107,25 +1107,25 @@
                                                   <node concept="2OqwBi" id="26IgR5b9Iw$" role="1PxMeX">
                                                     <node concept="30H73N" id="26IgR5b9Iw_" role="2Oq$k0" />
                                                     <node concept="3TrEf2" id="26IgR5b9IwA" role="2OqNvi">
-                                                      <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" />
+                                                      <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                                                     </node>
                                                   </node>
                                                 </node>
                                               </node>
                                               <node concept="3TrEf2" id="26IgR5b9IwB" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" />
+                                                <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" resolve="pinConfig" />
                                               </node>
                                             </node>
                                             <node concept="3TrEf2" id="26IgR5b9IwC" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                              <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                             </node>
                                           </node>
                                           <node concept="3TrEf2" id="26IgR5b9IwD" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:4JsbL6NpKGU" />
+                                            <ref role="3Tt5mk" to="koo2:4JsbL6NpKGU" resolve="inputReg" />
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="5cS3I48Za5H" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                          <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                         </node>
                                       </node>
                                       <node concept="2qgKlT" id="5cS3I48Za6y" role="2OqNvi">
@@ -1139,7 +1139,7 @@
                                 <node concept="2OqwBi" id="26IgR5b9IwG" role="2Oq$k0">
                                   <node concept="30H73N" id="26IgR5b9IwH" role="2Oq$k0" />
                                   <node concept="3TrEf2" id="26IgR5b9IwI" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" />
+                                    <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                                   </node>
                                 </node>
                                 <node concept="1mIQ4w" id="26IgR5b9IwJ" role="2OqNvi">
@@ -1165,25 +1165,25 @@
                                                     <node concept="2OqwBi" id="26IgR5b9IwV" role="1PxMeX">
                                                       <node concept="30H73N" id="26IgR5b9IwW" role="2Oq$k0" />
                                                       <node concept="3TrEf2" id="26IgR5b9IwX" role="2OqNvi">
-                                                        <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" />
+                                                        <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
                                                       </node>
                                                     </node>
                                                   </node>
                                                 </node>
                                                 <node concept="3TrEf2" id="26IgR5b9IwY" role="2OqNvi">
-                                                  <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" />
+                                                  <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" resolve="pinConfig" />
                                                 </node>
                                               </node>
                                               <node concept="3TrEf2" id="26IgR5b9IwZ" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                                <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                               </node>
                                             </node>
                                             <node concept="3TrEf2" id="26IgR5b9Ix0" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="koo2:4JsbL6NpKGU" />
+                                              <ref role="3Tt5mk" to="koo2:4JsbL6NpKGU" resolve="inputReg" />
                                             </node>
                                           </node>
                                           <node concept="3TrEf2" id="5cS3I48Za6A" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                            <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                           </node>
                                         </node>
                                         <node concept="2qgKlT" id="5cS3I48Za7a" role="2OqNvi">
@@ -1225,7 +1225,7 @@
                 <node concept="2OqwBi" id="5OUcg7OCBeE" role="2Oq$k0">
                   <node concept="30H73N" id="5OUcg7OCBel" role="2Oq$k0" />
                   <node concept="3TrEf2" id="5OUcg7OCBeJ" role="2OqNvi">
-                    <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" />
+                    <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
                   </node>
                 </node>
                 <node concept="1mIQ4w" id="5OUcg7OCBfa" role="2OqNvi">
@@ -1238,7 +1238,7 @@
                 <node concept="2OqwBi" id="5OUcg7OCBdy" role="2Oq$k0">
                   <node concept="30H73N" id="5OUcg7OCBdd" role="2Oq$k0" />
                   <node concept="3TrEf2" id="5OUcg7OCBdC" role="2OqNvi">
-                    <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" />
+                    <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                   </node>
                 </node>
                 <node concept="1mIQ4w" id="5OUcg7OCBe5" role="2OqNvi">
@@ -1282,17 +1282,17 @@
                                             <node concept="2OqwBi" id="2mpt1xbRf1T" role="1PxMeX">
                                               <node concept="30H73N" id="2mpt1xbRf1U" role="2Oq$k0" />
                                               <node concept="3TrEf2" id="2mpt1xbRf1V" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" />
+                                                <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                                               </node>
                                             </node>
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="2mpt1xbRf1W" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" />
+                                          <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" resolve="pinConfig" />
                                         </node>
                                       </node>
                                       <node concept="3TrEf2" id="2mpt1xbRf1X" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                        <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                       </node>
                                     </node>
                                     <node concept="3TrcHB" id="2mpt1xbRf1Y" role="2OqNvi">
@@ -1306,7 +1306,7 @@
                               <node concept="2OqwBi" id="2mpt1xbRf20" role="2Oq$k0">
                                 <node concept="30H73N" id="2mpt1xbRf21" role="2Oq$k0" />
                                 <node concept="3TrEf2" id="2mpt1xbRf22" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" />
+                                  <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                                 </node>
                               </node>
                               <node concept="1mIQ4w" id="2mpt1xbRf23" role="2OqNvi">
@@ -1330,17 +1330,17 @@
                                               <node concept="2OqwBi" id="2mpt1xbRf2e" role="1PxMeX">
                                                 <node concept="30H73N" id="2mpt1xbRf2f" role="2Oq$k0" />
                                                 <node concept="3TrEf2" id="2mpt1xbRf2g" role="2OqNvi">
-                                                  <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" />
+                                                  <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
                                                 </node>
                                               </node>
                                             </node>
                                           </node>
                                           <node concept="3TrEf2" id="2mpt1xbRf2h" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" />
+                                            <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" resolve="pinConfig" />
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="2mpt1xbRf2i" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                          <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                         </node>
                                       </node>
                                       <node concept="3TrcHB" id="2mpt1xbRf2j" role="2OqNvi">
@@ -1388,25 +1388,25 @@
                                                   <node concept="2OqwBi" id="4sbNL4NzSLW" role="1PxMeX">
                                                     <node concept="30H73N" id="4sbNL4NzSLX" role="2Oq$k0" />
                                                     <node concept="3TrEf2" id="4sbNL4NzSLY" role="2OqNvi">
-                                                      <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" />
+                                                      <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                                                     </node>
                                                   </node>
                                                 </node>
                                               </node>
                                               <node concept="3TrEf2" id="4sbNL4NzSLZ" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" />
+                                                <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" resolve="pinConfig" />
                                               </node>
                                             </node>
                                             <node concept="3TrEf2" id="4sbNL4NzSM0" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                              <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                             </node>
                                           </node>
                                           <node concept="3TrEf2" id="4sbNL4NzSM1" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:4JsbL6NpKGU" />
+                                            <ref role="3Tt5mk" to="koo2:4JsbL6NpKGU" resolve="inputReg" />
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="4sbNL4NzSM2" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                          <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                         </node>
                                       </node>
                                       <node concept="2qgKlT" id="4sbNL4NzSM3" role="2OqNvi">
@@ -1420,7 +1420,7 @@
                                 <node concept="2OqwBi" id="4sbNL4NzSM5" role="2Oq$k0">
                                   <node concept="30H73N" id="4sbNL4NzSM6" role="2Oq$k0" />
                                   <node concept="3TrEf2" id="4sbNL4NzSM7" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" />
+                                    <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                                   </node>
                                 </node>
                                 <node concept="1mIQ4w" id="4sbNL4NzSM8" role="2OqNvi">
@@ -1446,25 +1446,25 @@
                                                     <node concept="2OqwBi" id="4sbNL4NzSMl" role="1PxMeX">
                                                       <node concept="30H73N" id="4sbNL4NzSMm" role="2Oq$k0" />
                                                       <node concept="3TrEf2" id="4sbNL4NzSMn" role="2OqNvi">
-                                                        <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" />
+                                                        <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
                                                       </node>
                                                     </node>
                                                   </node>
                                                 </node>
                                                 <node concept="3TrEf2" id="4sbNL4NzSMo" role="2OqNvi">
-                                                  <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" />
+                                                  <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" resolve="pinConfig" />
                                                 </node>
                                               </node>
                                               <node concept="3TrEf2" id="4sbNL4NzSMp" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                                <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                               </node>
                                             </node>
                                             <node concept="3TrEf2" id="4sbNL4NzSMq" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="koo2:4JsbL6NpKGU" />
+                                              <ref role="3Tt5mk" to="koo2:4JsbL6NpKGU" resolve="inputReg" />
                                             </node>
                                           </node>
                                           <node concept="3TrEf2" id="4sbNL4NzSMr" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                            <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                           </node>
                                         </node>
                                         <node concept="2qgKlT" id="4sbNL4NzSMs" role="2OqNvi">
@@ -1506,7 +1506,7 @@
                 <node concept="2OqwBi" id="5OUcg7OCBo0" role="2Oq$k0">
                   <node concept="30H73N" id="5OUcg7OCBnx" role="2Oq$k0" />
                   <node concept="3TrEf2" id="5OUcg7OCBo5" role="2OqNvi">
-                    <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" />
+                    <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
                   </node>
                 </node>
                 <node concept="1mIQ4w" id="5OUcg7OCBox" role="2OqNvi">
@@ -1519,7 +1519,7 @@
                 <node concept="2OqwBi" id="5OUcg7OCBmJ" role="2Oq$k0">
                   <node concept="30H73N" id="5OUcg7OCBmq" role="2Oq$k0" />
                   <node concept="3TrEf2" id="5OUcg7OCBmP" role="2OqNvi">
-                    <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" />
+                    <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                   </node>
                 </node>
                 <node concept="1mIQ4w" id="5OUcg7OCBnh" role="2OqNvi">
@@ -1563,25 +1563,25 @@
                                             <node concept="2OqwBi" id="4sbNL4NzU6G" role="1PxMeX">
                                               <node concept="30H73N" id="4sbNL4NzU6H" role="2Oq$k0" />
                                               <node concept="3TrEf2" id="4sbNL4NzU6I" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" />
+                                                <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                                               </node>
                                             </node>
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="4sbNL4NzU6J" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" />
+                                          <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" resolve="pinConfig" />
                                         </node>
                                       </node>
                                       <node concept="3TrEf2" id="4sbNL4NzU6K" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                        <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                       </node>
                                     </node>
                                     <node concept="3TrEf2" id="4sbNL4NzU6L" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="koo2:2mpt1xbR9gV" />
+                                      <ref role="3Tt5mk" to="koo2:2mpt1xbR9gV" resolve="outputReg" />
                                     </node>
                                   </node>
                                   <node concept="3TrEf2" id="4sbNL4NzU6M" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                    <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                   </node>
                                 </node>
                                 <node concept="2qgKlT" id="4sbNL4NzU6N" role="2OqNvi">
@@ -1627,17 +1627,17 @@
                                       <node concept="2OqwBi" id="26IgR5b9HUR" role="1PxMeX">
                                         <node concept="30H73N" id="26IgR5b9HUS" role="2Oq$k0" />
                                         <node concept="3TrEf2" id="26IgR5b9HUT" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" />
+                                          <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                   <node concept="3TrEf2" id="26IgR5b9HUU" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" />
+                                    <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" resolve="pinConfig" />
                                   </node>
                                 </node>
                                 <node concept="3TrEf2" id="26IgR5b9HUV" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                  <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                 </node>
                               </node>
                               <node concept="3TrcHB" id="26IgR5b9HUW" role="2OqNvi">
@@ -1665,7 +1665,7 @@
               <node concept="2OqwBi" id="26IgR5b9Ex9" role="2Oq$k0">
                 <node concept="30H73N" id="26IgR5b9EwO" role="2Oq$k0" />
                 <node concept="3TrEf2" id="26IgR5b9Exg" role="2OqNvi">
-                  <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" />
+                  <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
                 </node>
               </node>
               <node concept="1mIQ4w" id="26IgR5b9Ey1" role="2OqNvi">
@@ -1687,7 +1687,7 @@
               <node concept="2OqwBi" id="26IgR5b9EAc" role="2Oq$k0">
                 <node concept="30H73N" id="26IgR5b9EAd" role="2Oq$k0" />
                 <node concept="3TrEf2" id="26IgR5b9EAe" role="2OqNvi">
-                  <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" />
+                  <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
                 </node>
               </node>
               <node concept="1mIQ4w" id="26IgR5b9EAf" role="2OqNvi">
@@ -1727,25 +1727,25 @@
                                             <node concept="2OqwBi" id="4sbNL4NzV6j" role="1PxMeX">
                                               <node concept="30H73N" id="4sbNL4NzV6k" role="2Oq$k0" />
                                               <node concept="3TrEf2" id="4sbNL4NzV6l" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" />
+                                                <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                                               </node>
                                             </node>
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="4sbNL4NzV6m" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" />
+                                          <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" resolve="pinConfig" />
                                         </node>
                                       </node>
                                       <node concept="3TrEf2" id="4sbNL4NzV6n" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                        <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                       </node>
                                     </node>
                                     <node concept="3TrEf2" id="4sbNL4NzV6o" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="koo2:2mpt1xbR9gV" />
+                                      <ref role="3Tt5mk" to="koo2:2mpt1xbR9gV" resolve="outputReg" />
                                     </node>
                                   </node>
                                   <node concept="3TrEf2" id="4sbNL4NzV6p" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                    <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                   </node>
                                 </node>
                                 <node concept="2qgKlT" id="4sbNL4NzV6q" role="2OqNvi">
@@ -1792,17 +1792,17 @@
                                         <node concept="2OqwBi" id="26IgR5b9HY1" role="1PxMeX">
                                           <node concept="30H73N" id="26IgR5b9HY2" role="2Oq$k0" />
                                           <node concept="3TrEf2" id="26IgR5b9HY3" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" />
+                                            <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                     <node concept="3TrEf2" id="26IgR5b9HY4" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" />
+                                      <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" resolve="pinConfig" />
                                     </node>
                                   </node>
                                   <node concept="3TrEf2" id="26IgR5b9HY5" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                    <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                   </node>
                                 </node>
                                 <node concept="3TrcHB" id="26IgR5b9HY6" role="2OqNvi">
@@ -1849,7 +1849,7 @@
                           <node concept="3clFbF" id="43wskx8gawX" role="3cqZAp">
                             <node concept="2OqwBi" id="43wskx8gawS" role="3clFbG">
                               <node concept="3TrEf2" id="43wskx8gawV" role="2OqNvi">
-                                <ref role="3Tt5mk" to="koo2:26IgR5b9RPe" />
+                                <ref role="3Tt5mk" to="koo2:26IgR5b9RPe" resolve="expression" />
                               </node>
                               <node concept="30H73N" id="43wskx8gawW" role="2Oq$k0" />
                             </node>
@@ -1914,7 +1914,7 @@
                                         <node concept="2OqwBi" id="4sbNL4N_0Wx" role="2Oq$k0">
                                           <node concept="30H73N" id="4sbNL4N_0Wy" role="2Oq$k0" />
                                           <node concept="3TrEf2" id="4sbNL4N_0Wz" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                            <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                           </node>
                                         </node>
                                         <node concept="2qgKlT" id="4sbNL4N_0W$" role="2OqNvi">
@@ -2007,7 +2007,7 @@
                                           <ref role="3cqZAo" node="1pOg3uxnQOM" resolve="bc" />
                                         </node>
                                         <node concept="3Tsc0h" id="1pOg3uxnQP8" role="2OqNvi">
-                                          <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" />
+                                          <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" resolve="configurationItems" />
                                         </node>
                                       </node>
                                       <node concept="UnYns" id="1pOg3uxnQP9" role="2OqNvi">
@@ -2019,7 +2019,7 @@
                                     <node concept="1uHKPH" id="1pOg3uxnQPb" role="2OqNvi" />
                                   </node>
                                   <node concept="3Tsc0h" id="1pOg3uxnQPc" role="2OqNvi">
-                                    <ref role="3TtcxE" to="koo2:3gdl6si6LyV" />
+                                    <ref role="3TtcxE" to="koo2:3gdl6si6LyV" resolve="digitalConfig" />
                                   </node>
                                 </node>
                               </node>
@@ -2046,11 +2046,11 @@
                                                       <ref role="3cqZAo" node="1pOg3uxnQPz" resolve="it" />
                                                     </node>
                                                     <node concept="3TrEf2" id="1pOg3uxnQPs" role="2OqNvi">
-                                                      <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                                      <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                                     </node>
                                                   </node>
                                                   <node concept="3TrEf2" id="1pOg3uxnQPt" role="2OqNvi">
-                                                    <ref role="3Tt5mk" to="koo2:4JsbL6NpKGY" />
+                                                    <ref role="3Tt5mk" to="koo2:4JsbL6NpKGY" resolve="dataDirectionReg" />
                                                   </node>
                                                 </node>
                                                 <node concept="3TrcHB" id="1pOg3uxnQPu" role="2OqNvi">
@@ -2086,7 +2086,7 @@
                                                 <ref role="3cqZAo" node="1pOg3uxnQPI" resolve="it" />
                                               </node>
                                               <node concept="3TrEf2" id="1pOg3uxnQPG" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                                <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                               </node>
                                             </node>
                                             <node concept="3TrcHB" id="1pOg3uxnQPH" role="2OqNvi">
@@ -2211,17 +2211,17 @@
                                           <ref role="3cqZAo" node="26IgR5bai$q" resolve="bc" />
                                         </node>
                                         <node concept="3TrEf2" id="26IgR5bai$E" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                                          <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                   <node concept="3TrEf2" id="26IgR5bai$F" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" />
+                                    <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
                                   </node>
                                 </node>
                                 <node concept="3Tsc0h" id="26IgR5bai$G" role="2OqNvi">
-                                  <ref role="3TtcxE" to="koo2:4JsbL6NpKIN" />
+                                  <ref role="3TtcxE" to="koo2:4JsbL6NpKIN" resolve="digitalPins" />
                                 </node>
                               </node>
                               <node concept="3$u5V9" id="26IgR5bai$H" role="2OqNvi">
@@ -2233,7 +2233,7 @@
                                           <ref role="3cqZAo" node="26IgR5bai$O" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="26IgR5bai$N" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:4JsbL6NpKGY" />
+                                          <ref role="3Tt5mk" to="koo2:4JsbL6NpKGY" resolve="dataDirectionReg" />
                                         </node>
                                       </node>
                                     </node>
@@ -2272,7 +2272,7 @@
                                         <node concept="2OqwBi" id="4sbNL4N_2oU" role="2Oq$k0">
                                           <node concept="30H73N" id="4sbNL4N_2oV" role="2Oq$k0" />
                                           <node concept="3TrEf2" id="4sbNL4N_2oW" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                            <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                           </node>
                                         </node>
                                         <node concept="2qgKlT" id="4sbNL4N_2oX" role="2OqNvi">
@@ -2365,7 +2365,7 @@
                                           <ref role="3cqZAo" node="1qwvy7xGi5E" resolve="bc" />
                                         </node>
                                         <node concept="3Tsc0h" id="1qwvy7xGi60" role="2OqNvi">
-                                          <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" />
+                                          <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" resolve="configurationItems" />
                                         </node>
                                       </node>
                                       <node concept="UnYns" id="1qwvy7xGi61" role="2OqNvi">
@@ -2377,7 +2377,7 @@
                                     <node concept="1uHKPH" id="1qwvy7xGi63" role="2OqNvi" />
                                   </node>
                                   <node concept="3Tsc0h" id="1qwvy7xGi64" role="2OqNvi">
-                                    <ref role="3TtcxE" to="koo2:3gdl6si6LyV" />
+                                    <ref role="3TtcxE" to="koo2:3gdl6si6LyV" resolve="digitalConfig" />
                                   </node>
                                 </node>
                               </node>
@@ -2404,11 +2404,11 @@
                                                       <ref role="3cqZAo" node="1qwvy7xGi6r" resolve="it" />
                                                     </node>
                                                     <node concept="3TrEf2" id="1qwvy7xGi6k" role="2OqNvi">
-                                                      <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                                      <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                                     </node>
                                                   </node>
                                                   <node concept="3TrEf2" id="1qwvy7xGqvI" role="2OqNvi">
-                                                    <ref role="3Tt5mk" to="koo2:2mpt1xbR9gV" />
+                                                    <ref role="3Tt5mk" to="koo2:2mpt1xbR9gV" resolve="outputReg" />
                                                   </node>
                                                 </node>
                                                 <node concept="3TrcHB" id="1qwvy7xGi6m" role="2OqNvi">
@@ -2444,7 +2444,7 @@
                                                 <ref role="3cqZAo" node="1qwvy7xGi6A" resolve="it" />
                                               </node>
                                               <node concept="3TrEf2" id="1qwvy7xGi6$" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                                <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                               </node>
                                             </node>
                                             <node concept="3TrcHB" id="1qwvy7xGi6_" role="2OqNvi">
@@ -2569,17 +2569,17 @@
                                           <ref role="3cqZAo" node="1pOg3uxo2wu" resolve="bc" />
                                         </node>
                                         <node concept="3TrEf2" id="1pOg3uxo2wK" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                                          <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                   <node concept="3TrEf2" id="1pOg3uxo2wL" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" />
+                                    <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
                                   </node>
                                 </node>
                                 <node concept="3Tsc0h" id="1pOg3uxo2wM" role="2OqNvi">
-                                  <ref role="3TtcxE" to="koo2:4JsbL6NpKIN" />
+                                  <ref role="3TtcxE" to="koo2:4JsbL6NpKIN" resolve="digitalPins" />
                                 </node>
                               </node>
                               <node concept="3$u5V9" id="1pOg3uxo2wN" role="2OqNvi">
@@ -2591,7 +2591,7 @@
                                           <ref role="3cqZAo" node="1pOg3uxo2wU" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="1pOg3uxo2xe" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:2mpt1xbR9gV" />
+                                          <ref role="3Tt5mk" to="koo2:2mpt1xbR9gV" resolve="outputReg" />
                                         </node>
                                       </node>
                                     </node>
@@ -2649,15 +2649,15 @@
                                           <node concept="2OqwBi" id="7fU3Y2enYZK" role="2Oq$k0">
                                             <node concept="30H73N" id="7fU3Y2enXy5" role="2Oq$k0" />
                                             <node concept="3TrEf2" id="7fU3Y2eo5Jx" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" />
+                                              <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
                                             </node>
                                           </node>
                                           <node concept="3TrEf2" id="7fU3Y2eocog" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:7fU3Y2ecVh8" />
+                                            <ref role="3Tt5mk" to="koo2:7fU3Y2ecVh8" resolve="UCSRB" />
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="7fU3Y2eofJZ" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                          <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                         </node>
                                       </node>
                                       <node concept="2qgKlT" id="7fU3Y2eokVl" role="2OqNvi">
@@ -3023,15 +3023,15 @@
                                           <node concept="2OqwBi" id="7fU3Y2eoomE" role="2Oq$k0">
                                             <node concept="30H73N" id="7fU3Y2eomT1" role="2Oq$k0" />
                                             <node concept="3TrEf2" id="7fU3Y2eoqGs" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" />
+                                              <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
                                             </node>
                                           </node>
                                           <node concept="3TrEf2" id="7fU3Y2eovXF" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:7fU3Y2ecVhe" />
+                                            <ref role="3Tt5mk" to="koo2:7fU3Y2ecVhe" resolve="UCSRC" />
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="7fU3Y2eozkb" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                          <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                         </node>
                                       </node>
                                       <node concept="2qgKlT" id="7fU3Y2eoB4f" role="2OqNvi">
@@ -3098,7 +3098,7 @@
                                                   <ref role="3cqZAo" node="7fU3Y2ex_II" resolve="bc" />
                                                 </node>
                                                 <node concept="3TrEf2" id="7fU3Y2exDCe" role="2OqNvi">
-                                                  <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                                                  <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                                                 </node>
                                               </node>
                                             </node>
@@ -3151,15 +3151,15 @@
                                           <node concept="2OqwBi" id="7fU3Y2ewbxS" role="2Oq$k0">
                                             <node concept="30H73N" id="7fU3Y2ewa4d" role="2Oq$k0" />
                                             <node concept="3TrEf2" id="7fU3Y2ewfW5" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" />
+                                              <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
                                             </node>
                                           </node>
                                           <node concept="3TrEf2" id="7fU3Y2ewkmV" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:7fU3Y2ecVlc" />
+                                            <ref role="3Tt5mk" to="koo2:7fU3Y2ecVlc" resolve="UBRRH" />
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="7fU3Y2ewmBC" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                          <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                         </node>
                                       </node>
                                       <node concept="2qgKlT" id="7fU3Y2ewq10" role="2OqNvi">
@@ -3222,7 +3222,7 @@
                                                 <ref role="3cqZAo" node="7fU3Y2ezPTG" resolve="bc" />
                                               </node>
                                               <node concept="3TrEf2" id="7fU3Y2ezPTY" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                                                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                                               </node>
                                             </node>
                                           </node>
@@ -3274,15 +3274,15 @@
                                           <node concept="2OqwBi" id="7fU3Y2e$1kn" role="2Oq$k0">
                                             <node concept="30H73N" id="7fU3Y2ezZQG" role="2Oq$k0" />
                                             <node concept="3TrEf2" id="7fU3Y2e$5Lf" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" />
+                                              <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
                                             </node>
                                           </node>
                                           <node concept="3TrEf2" id="7fU3Y2e$akI" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:7fU3Y2eemHw" />
+                                            <ref role="3Tt5mk" to="koo2:7fU3Y2eemHw" resolve="UBRRL" />
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="7fU3Y2e$cJM" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                          <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                         </node>
                                       </node>
                                       <node concept="2qgKlT" id="7fU3Y2e$fZy" role="2OqNvi">
@@ -3328,7 +3328,7 @@
                                 <ref role="3cqZAo" node="7fU3Y2en5hw" resolve="bc" />
                               </node>
                               <node concept="3Tsc0h" id="7fU3Y2enbKr" role="2OqNvi">
-                                <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" />
+                                <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" resolve="configurationItems" />
                               </node>
                             </node>
                             <node concept="v3k3i" id="vfqcI_HarY" role="2OqNvi">
@@ -3366,7 +3366,7 @@
                         <node concept="3clFbF" id="26IgR5bahLB" role="3cqZAp">
                           <node concept="2OqwBi" id="26IgR5bahLC" role="3clFbG">
                             <node concept="3Tsc0h" id="26IgR5bahLD" role="2OqNvi">
-                              <ref role="3TtcxE" to="c4fa:3CmSUB7Fp_m" />
+                              <ref role="3TtcxE" to="c4fa:3CmSUB7Fp_m" resolve="statements" />
                             </node>
                             <node concept="30H73N" id="26IgR5bahLE" role="2Oq$k0" />
                           </node>
@@ -3586,11 +3586,11 @@
                                       <node concept="2OqwBi" id="55_53lUxhYq" role="2Oq$k0">
                                         <node concept="30H73N" id="55_53lUxhY5" role="2Oq$k0" />
                                         <node concept="3TrEf2" id="55_53lUxhYA" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:1qwvy7xGC6t" />
+                                          <ref role="3Tt5mk" to="koo2:1qwvy7xGC6t" resolve="pin" />
                                         </node>
                                       </node>
                                       <node concept="3TrEf2" id="55_53lUxhZr" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:1qwvy7xGC75" />
+                                        <ref role="3Tt5mk" to="koo2:1qwvy7xGC75" resolve="analogPin" />
                                       </node>
                                     </node>
                                     <node concept="3TrcHB" id="55_53lUxhZU" role="2OqNvi">
@@ -3694,21 +3694,21 @@
                                                 <ref role="3cqZAo" node="EvPvZE4eQr" resolve="bc" />
                                               </node>
                                               <node concept="3TrEf2" id="EvPvZE4eQH" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                                                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                                               </node>
                                             </node>
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="EvPvZE4eQI" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" />
+                                          <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
                                         </node>
                                       </node>
                                       <node concept="3TrEf2" id="5cS3I48ZK$0" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:5cS3I48Zmhd" />
+                                        <ref role="3Tt5mk" to="koo2:5cS3I48Zmhd" resolve="sReg" />
                                       </node>
                                     </node>
                                     <node concept="3TrEf2" id="5cS3I48ZK$x" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                      <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                     </node>
                                   </node>
                                   <node concept="2qgKlT" id="5cS3I48ZK_1" role="2OqNvi">
@@ -3725,7 +3725,7 @@
                 </node>
                 <node concept="1_9egQ" id="EvPvZE4eOD" role="3XIRFZ">
                   <node concept="BUAnR" id="25es00MzhOn" role="1_9egR">
-                    <ref role="BUAnL" to="aelz:Yv2B6LBx7c" resolve="cli" />
+                    <ref role="BUAnL" to="aelz:3kpMhm4HV5o" resolve="cli" />
                   </node>
                 </node>
                 <node concept="3XISUE" id="EvPvZE4eOT" role="3XIRFZ" />
@@ -3741,7 +3741,7 @@
                         <node concept="3clFbF" id="EvPvZE4eP4" role="3cqZAp">
                           <node concept="2OqwBi" id="EvPvZE4eP5" role="3clFbG">
                             <node concept="3TrEf2" id="EvPvZE4eP6" role="2OqNvi">
-                              <ref role="3Tt5mk" to="koo2:1pOg3uxo39B" />
+                              <ref role="3Tt5mk" to="koo2:1pOg3uxo39B" resolve="body" />
                             </node>
                             <node concept="30H73N" id="EvPvZE4eP7" role="2Oq$k0" />
                           </node>
@@ -3809,21 +3809,21 @@
                                                   <ref role="3cqZAo" node="EvPvZE4nED" resolve="bc" />
                                                 </node>
                                                 <node concept="3TrEf2" id="EvPvZE4nEU" role="2OqNvi">
-                                                  <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                                                  <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                                                 </node>
                                               </node>
                                             </node>
                                           </node>
                                           <node concept="3TrEf2" id="EvPvZE4nEV" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" />
+                                            <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="5cS3I48ZK_4" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:5cS3I48Zmhd" />
+                                          <ref role="3Tt5mk" to="koo2:5cS3I48Zmhd" resolve="sReg" />
                                         </node>
                                       </node>
                                       <node concept="3TrEf2" id="5cS3I48ZK__" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                        <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                       </node>
                                     </node>
                                     <node concept="2qgKlT" id="5cS3I48ZKA5" role="2OqNvi">
@@ -3849,7 +3849,7 @@
           </node>
           <node concept="3GEVxB" id="66uzewb18xB" role="2OODSX">
             <property role="3GEa6x" value="false" />
-            <ref role="3GEb4d" to="aelz:Yv2B6LBx6Z" resolve="avr_interrupt" />
+            <ref role="3GEb4d" to="aelz:3kpMhm4HRQv" resolve="avr_interrupt" />
           </node>
         </node>
       </node>
@@ -3886,7 +3886,7 @@
                               <node concept="3clFbF" id="6RZtz2l6_I1" role="3cqZAp">
                                 <node concept="2OqwBi" id="6RZtz2l6_HW" role="3clFbG">
                                   <node concept="3TrEf2" id="6RZtz2l6_HZ" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="koo2:6RZtz2kYjen" />
+                                    <ref role="3Tt5mk" to="koo2:6RZtz2kYjen" resolve="mode" />
                                   </node>
                                   <node concept="30H73N" id="6RZtz2l6_I0" role="2Oq$k0" />
                                 </node>
@@ -3926,7 +3926,7 @@
               <node concept="2OqwBi" id="6RZtz2l6n3A" role="2Oq$k0">
                 <node concept="30H73N" id="6RZtz2l6mO8" role="2Oq$k0" />
                 <node concept="3TrEf2" id="6RZtz2l6vT2" role="2OqNvi">
-                  <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" />
+                  <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" resolve="condition" />
                 </node>
               </node>
               <node concept="3w_OXm" id="6RZtz2l6zEy" role="2OqNvi" />
@@ -3969,7 +3969,7 @@
                               <node concept="3clFbF" id="6RZtz2le001" role="3cqZAp">
                                 <node concept="2OqwBi" id="6RZtz2le002" role="3clFbG">
                                   <node concept="3TrEf2" id="6RZtz2le003" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="koo2:6RZtz2kYjen" />
+                                    <ref role="3Tt5mk" to="koo2:6RZtz2kYjen" resolve="mode" />
                                   </node>
                                   <node concept="30H73N" id="6RZtz2le004" role="2Oq$k0" />
                                 </node>
@@ -3986,7 +3986,7 @@
                 </node>
                 <node concept="1_9egQ" id="6RZtz2le0W4" role="3XIRFZ">
                   <node concept="BUAnR" id="6RZtz2le0W3" role="1_9egR">
-                    <ref role="BUAnL" to="aelz:Yv2B6LBx7c" resolve="cli" />
+                    <ref role="BUAnL" to="aelz:3kpMhm4HV5o" resolve="cli" />
                   </node>
                 </node>
                 <node concept="c0U19" id="6RZtz2le158" role="3XIRFZ">
@@ -4001,7 +4001,7 @@
                     </node>
                     <node concept="1_9egQ" id="6RZtz2le67E" role="3XIRFZ">
                       <node concept="BUAnR" id="6RZtz2le67D" role="1_9egR">
-                        <ref role="BUAnL" to="aelz:Yv2B6LBx78" resolve="sei" />
+                        <ref role="BUAnL" to="aelz:3kpMhm4HVKL" resolve="sei" />
                       </node>
                     </node>
                     <node concept="1_9egQ" id="6RZtz2le6Zv" role="3XIRFZ">
@@ -4028,7 +4028,7 @@
                           <node concept="3clFbF" id="6RZtz2le21g" role="3cqZAp">
                             <node concept="2OqwBi" id="6RZtz2le21b" role="3clFbG">
                               <node concept="3TrEf2" id="6RZtz2le21e" role="2OqNvi">
-                                <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" />
+                                <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" resolve="condition" />
                               </node>
                               <node concept="30H73N" id="6RZtz2le21f" role="2Oq$k0" />
                             </node>
@@ -4040,7 +4040,7 @@
                 </node>
                 <node concept="1_9egQ" id="6RZtz2le39k" role="3XIRFZ">
                   <node concept="BUAnR" id="6RZtz2le39j" role="1_9egR">
-                    <ref role="BUAnL" to="aelz:Yv2B6LBx78" resolve="sei" />
+                    <ref role="BUAnL" to="aelz:3kpMhm4HVKL" resolve="sei" />
                   </node>
                 </node>
                 <node concept="raruj" id="6RZtz2lfOAF" role="lGtFl" />
@@ -4053,7 +4053,7 @@
           </node>
           <node concept="3GEVxB" id="66uzewb1f2Q" role="2OODSX">
             <property role="3GEa6x" value="false" />
-            <ref role="3GEb4d" to="aelz:Yv2B6LBx6Z" resolve="avr_interrupt" />
+            <ref role="3GEb4d" to="aelz:3kpMhm4HRQv" resolve="avr_interrupt" />
           </node>
         </node>
       </node>
@@ -4064,7 +4064,7 @@
               <node concept="2OqwBi" id="6RZtz2l6UIO" role="2Oq$k0">
                 <node concept="30H73N" id="6RZtz2l6UsD" role="2Oq$k0" />
                 <node concept="3TrEf2" id="6RZtz2l6Xi6" role="2OqNvi">
-                  <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" />
+                  <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" resolve="condition" />
                 </node>
               </node>
               <node concept="3x8VRR" id="6RZtz2l6ZTJ" role="2OqNvi" />
@@ -4094,7 +4094,7 @@
                       <node concept="3clFbF" id="1Jb2EkobvPL" role="3cqZAp">
                         <node concept="2OqwBi" id="1Jb2EkobvPG" role="3clFbG">
                           <node concept="3TrEf2" id="1Jb2EkobvPJ" role="2OqNvi">
-                            <ref role="3Tt5mk" to="koo2:1Jb2EknHMaW" />
+                            <ref role="3Tt5mk" to="koo2:1Jb2EknHMaW" resolve="body" />
                           </node>
                           <node concept="30H73N" id="1Jb2EkobvPK" role="2Oq$k0" />
                         </node>
@@ -4120,7 +4120,7 @@
                     <node concept="3clFbF" id="1Jb2EkobvYp" role="3cqZAp">
                       <node concept="2OqwBi" id="1Jb2EkobvYk" role="3clFbG">
                         <node concept="3Tsc0h" id="1Jb2EkobvYn" role="2OqNvi">
-                          <ref role="3TtcxE" to="x27k:4WTYg$PUiX5" />
+                          <ref role="3TtcxE" to="x27k:4WTYg$PUiX5" resolve="arguments" />
                         </node>
                         <node concept="30H73N" id="1Jb2EkobvYo" role="2Oq$k0" />
                       </node>
@@ -4196,7 +4196,7 @@
                 <ref role="3cqZAo" node="22vbFi$tUcq" resolve="bc" />
               </node>
               <node concept="3TrEf2" id="otWcsA_eBc" role="2OqNvi">
-                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
               </node>
             </node>
           </node>
@@ -4208,7 +4208,7 @@
                 <ref role="3cqZAo" node="22vbFi$tUcq" resolve="bc" />
               </node>
               <node concept="3TrEf2" id="otWcsA_eBh" role="2OqNvi">
-                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
               </node>
             </node>
             <node concept="1mIQ4w" id="otWcsA_eBi" role="2OqNvi">
@@ -4260,7 +4260,7 @@
                       <node concept="2OqwBi" id="2uTv4B9jFxe" role="1PxMeX">
                         <node concept="30H73N" id="2uTv4B9jFxf" role="2Oq$k0" />
                         <node concept="3TrEf2" id="2uTv4B9jFxg" role="2OqNvi">
-                          <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                          <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                         </node>
                       </node>
                     </node>
@@ -4406,7 +4406,7 @@
               <node concept="2OqwBi" id="4o9sgv8R7w1" role="3clFbG">
                 <node concept="30H73N" id="4o9sgv8R7w3" role="2Oq$k0" />
                 <node concept="3Tsc0h" id="6s2SAyopFsW" role="2OqNvi">
-                  <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" />
+                  <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" resolve="binaries" />
                 </node>
               </node>
             </node>
@@ -4445,7 +4445,7 @@
             <node concept="3clFbF" id="4o9sgv8R7x0" role="3cqZAp">
               <node concept="2OqwBi" id="4o9sgv8R7x1" role="3clFbG">
                 <node concept="3Tsc0h" id="6s2SAyopFtp" role="2OqNvi">
-                  <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" />
+                  <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" resolve="binaries" />
                 </node>
                 <node concept="30H73N" id="4o9sgv8R7x3" role="2Oq$k0" />
               </node>
@@ -4530,7 +4530,7 @@
                 <node concept="2OqwBi" id="6s2SAyopK4U" role="2GsD0m">
                   <node concept="30H73N" id="6s2SAyopK4T" role="2Oq$k0" />
                   <node concept="3Tsc0h" id="6s2SAyopK4Y" role="2OqNvi">
-                    <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" />
+                    <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" resolve="binaries" />
                   </node>
                 </node>
                 <node concept="3clFbS" id="6s2SAyopK4S" role="2LFqv$">
@@ -4662,7 +4662,7 @@
                           <node concept="2OqwBi" id="22vbFi$tUjQ" role="1PxMeX">
                             <node concept="30H73N" id="22vbFi$tUjn" role="2Oq$k0" />
                             <node concept="3TrEf2" id="22vbFi$tUjV" role="2OqNvi">
-                              <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                              <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                             </node>
                           </node>
                         </node>
@@ -4693,7 +4693,7 @@
                           <node concept="2OqwBi" id="22vbFi$tUlV" role="1PxMeX">
                             <node concept="30H73N" id="22vbFi$tUlA" role="2Oq$k0" />
                             <node concept="3TrEf2" id="22vbFi$tUm0" role="2OqNvi">
-                              <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                              <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                             </node>
                           </node>
                         </node>
@@ -4730,7 +4730,7 @@
                           <node concept="2OqwBi" id="55_53lUxi1s" role="1PxMeX">
                             <node concept="30H73N" id="55_53lUxi1t" role="2Oq$k0" />
                             <node concept="3TrEf2" id="55_53lUxi1u" role="2OqNvi">
-                              <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                              <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                             </node>
                           </node>
                         </node>
@@ -4760,7 +4760,7 @@
                         <node concept="2OqwBi" id="22vbFi$uiiM" role="1PxMeX">
                           <node concept="30H73N" id="22vbFi$uiit" role="2Oq$k0" />
                           <node concept="3TrEf2" id="22vbFi$uiiR" role="2OqNvi">
-                            <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                            <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                           </node>
                         </node>
                       </node>
@@ -4794,7 +4794,7 @@
                         <node concept="2OqwBi" id="4oh1JoZBOnd" role="2Oq$k0">
                           <node concept="30H73N" id="4oh1JoZBOne" role="2Oq$k0" />
                           <node concept="3Tsc0h" id="4oh1JoZBOnf" role="2OqNvi">
-                            <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" />
+                            <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" resolve="binaries" />
                           </node>
                         </node>
                         <node concept="v3k3i" id="vfqcI_Has0" role="2OqNvi">
@@ -4812,7 +4812,7 @@
                                   <ref role="3cqZAo" node="4oh1JoZBOnp" resolve="it" />
                                 </node>
                                 <node concept="3Tsc0h" id="4oh1JoZBOno" role="2OqNvi">
-                                  <ref role="3TtcxE" to="51wr:2kkumeGQBlk" />
+                                  <ref role="3TtcxE" to="51wr:2kkumeGQBlk" resolve="referencedLibs" />
                                 </node>
                               </node>
                             </node>
@@ -4948,7 +4948,7 @@
                       <node concept="2OqwBi" id="2nSRgleEQTR" role="1PxMeX">
                         <node concept="30H73N" id="2nSRgleEQTQ" role="2Oq$k0" />
                         <node concept="3TrEf2" id="2nSRgleEQTV" role="2OqNvi">
-                          <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                          <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                         </node>
                       </node>
                     </node>
@@ -4977,7 +4977,7 @@
                       <node concept="2OqwBi" id="2nSRgleEQUp" role="1PxMeX">
                         <node concept="30H73N" id="2nSRgleEQUo" role="2Oq$k0" />
                         <node concept="3TrEf2" id="2nSRgleEQUt" role="2OqNvi">
-                          <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                          <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                         </node>
                       </node>
                     </node>
@@ -4991,7 +4991,7 @@
                   <node concept="2OqwBi" id="2nSRgleEQU9" role="2Oq$k0">
                     <node concept="30H73N" id="2nSRgleEQU8" role="2Oq$k0" />
                     <node concept="3TrEf2" id="2nSRgleEQUd" role="2OqNvi">
-                      <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                      <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                     </node>
                   </node>
                   <node concept="1mIQ4w" id="2nSRgleEQUi" role="2OqNvi">
@@ -5021,7 +5021,7 @@
                   <node concept="2OqwBi" id="2nSRgleEQUU" role="2Oq$k0">
                     <node concept="30H73N" id="2nSRgleEQUV" role="2Oq$k0" />
                     <node concept="3Tsc0h" id="2nSRgleEQUW" role="2OqNvi">
-                      <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" />
+                      <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" resolve="binaries" />
                     </node>
                   </node>
                   <node concept="v3k3i" id="vfqcI_Has2" role="2OqNvi">
@@ -5063,7 +5063,7 @@
                       <node concept="2OqwBi" id="2nSRgleEQVu" role="1PxMeX">
                         <node concept="30H73N" id="2nSRgleEQVv" role="2Oq$k0" />
                         <node concept="3TrEf2" id="2nSRgleEQVw" role="2OqNvi">
-                          <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                          <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                         </node>
                       </node>
                     </node>
@@ -5077,7 +5077,7 @@
                   <node concept="2OqwBi" id="2nSRgleEQV$" role="2Oq$k0">
                     <node concept="30H73N" id="2nSRgleEQV_" role="2Oq$k0" />
                     <node concept="3TrEf2" id="2nSRgleEQVA" role="2OqNvi">
-                      <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                      <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                     </node>
                   </node>
                   <node concept="1mIQ4w" id="2nSRgleEQVB" role="2OqNvi">
@@ -5101,7 +5101,7 @@
               <node concept="2OqwBi" id="2kkumeGQtCv" role="3clFbG">
                 <node concept="30H73N" id="2kkumeGQtCu" role="2Oq$k0" />
                 <node concept="3Tsc0h" id="2kkumeGQ_us" role="2OqNvi">
-                  <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" />
+                  <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" resolve="binaries" />
                 </node>
               </node>
             </node>
@@ -5120,7 +5120,7 @@
                   <node concept="2OqwBi" id="2kkumeGQB00" role="2Oq$k0">
                     <node concept="30H73N" id="2kkumeGQAZZ" role="2Oq$k0" />
                     <node concept="3Tsc0h" id="2kkumeGQB04" role="2OqNvi">
-                      <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" />
+                      <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" resolve="binaries" />
                     </node>
                   </node>
                   <node concept="v3k3i" id="vfqcI_Has4" role="2OqNvi">
@@ -5165,7 +5165,7 @@
                     <node concept="2OqwBi" id="4oh1JoZ_Q1z" role="2Oq$k0">
                       <node concept="30H73N" id="4oh1JoZ_Q1$" role="2Oq$k0" />
                       <node concept="3Tsc0h" id="4oh1JoZ_Q1_" role="2OqNvi">
-                        <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" />
+                        <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" resolve="binaries" />
                       </node>
                     </node>
                     <node concept="v3k3i" id="vfqcI_Has6" role="2OqNvi">
@@ -5228,7 +5228,7 @@
                       <node concept="2OqwBi" id="Dp4TemBOs7" role="2Oq$k0">
                         <node concept="30H73N" id="Dp4TemBOs6" role="2Oq$k0" />
                         <node concept="3Tsc0h" id="2kkumeGQ_uH" role="2OqNvi">
-                          <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" />
+                          <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" resolve="binaries" />
                         </node>
                       </node>
                       <node concept="v3k3i" id="vfqcI_Has8" role="2OqNvi">
@@ -5318,7 +5318,7 @@
                       <node concept="2OqwBi" id="6JYjBlsQCj2" role="2Oq$k0">
                         <node concept="30H73N" id="6JYjBlsQC9R" role="2Oq$k0" />
                         <node concept="3Tsc0h" id="6JYjBlsQDlk" role="2OqNvi">
-                          <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" />
+                          <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" resolve="binaries" />
                         </node>
                       </node>
                       <node concept="1uHKPH" id="6JYjBlsQSmh" role="2OqNvi" />
@@ -5352,7 +5352,7 @@
                         <node concept="2OqwBi" id="1ZYgP9nkuNm" role="1PxMeX">
                           <node concept="30H73N" id="1ZYgP9nkuNn" role="2Oq$k0" />
                           <node concept="3TrEf2" id="1ZYgP9nkuNo" role="2OqNvi">
-                            <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                            <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                           </node>
                         </node>
                       </node>
@@ -5384,7 +5384,7 @@
                         <node concept="2OqwBi" id="5eVJx9Df3qU" role="1PxMeX">
                           <node concept="30H73N" id="5eVJx9Df3qV" role="2Oq$k0" />
                           <node concept="3TrEf2" id="5eVJx9Df3qW" role="2OqNvi">
-                            <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                            <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                           </node>
                         </node>
                       </node>
@@ -5408,7 +5408,7 @@
                         <node concept="2OqwBi" id="5eVJx9Df6mf" role="1PxMeX">
                           <node concept="30H73N" id="5eVJx9Df6mg" role="2Oq$k0" />
                           <node concept="3TrEf2" id="5eVJx9Df6mh" role="2OqNvi">
-                            <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                            <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                           </node>
                         </node>
                       </node>
@@ -5447,7 +5447,7 @@
                           <node concept="2OqwBi" id="6JYjBlsNnZW" role="2Oq$k0">
                             <node concept="30H73N" id="6JYjBlsNnEd" role="2Oq$k0" />
                             <node concept="3Tsc0h" id="6JYjBlsNpaS" role="2OqNvi">
-                              <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" />
+                              <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" resolve="binaries" />
                             </node>
                           </node>
                           <node concept="1uHKPH" id="6JYjBlsNDME" role="2OqNvi" />
@@ -5473,7 +5473,7 @@
             <node concept="3clFbF" id="5siC38Rscum" role="3cqZAp">
               <node concept="2OqwBi" id="5siC38Rscun" role="3clFbG">
                 <node concept="3Tsc0h" id="5siC38Rscuo" role="2OqNvi">
-                  <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" />
+                  <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" resolve="binaries" />
                 </node>
                 <node concept="30H73N" id="5siC38Rscup" role="2Oq$k0" />
               </node>
@@ -5722,11 +5722,11 @@
                   <node concept="2OqwBi" id="66BDmZRgGjG" role="2Oq$k0">
                     <node concept="30H73N" id="66BDmZRgGjH" role="2Oq$k0" />
                     <node concept="3TrEf2" id="66BDmZRgGjI" role="2OqNvi">
-                      <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" />
+                      <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" resolve="msgref" />
                     </node>
                   </node>
                   <node concept="3TrEf2" id="66BDmZRgGjJ" role="2OqNvi">
-                    <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" />
+                    <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" resolve="msg" />
                   </node>
                 </node>
                 <node concept="3TrcHB" id="66BDmZRgGjK" role="2OqNvi">
@@ -5918,15 +5918,15 @@
                       <node concept="2OqwBi" id="4Mvxa96ucyb" role="2Oq$k0">
                         <node concept="30H73N" id="4Mvxa96ubTC" role="2Oq$k0" />
                         <node concept="3TrEf2" id="4Mvxa96ufmW" role="2OqNvi">
-                          <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" />
+                          <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" resolve="msgref" />
                         </node>
                       </node>
                       <node concept="3TrEf2" id="4Mvxa96ujpG" role="2OqNvi">
-                        <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" />
+                        <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" resolve="msg" />
                       </node>
                     </node>
                     <node concept="3Tsc0h" id="4Mvxa96uo0P" role="2OqNvi">
-                      <ref role="3TtcxE" to="k146:EAKPqgNfBU" />
+                      <ref role="3TtcxE" to="k146:EAKPqgNfBU" resolve="properties" />
                     </node>
                   </node>
                   <node concept="34oBXx" id="4Mvxa96uLRX" role="2OqNvi" />
@@ -5938,11 +5938,11 @@
                     <node concept="2OqwBi" id="2lgwE2U3MB5" role="2Oq$k0">
                       <node concept="30H73N" id="2lgwE2U3MB6" role="2Oq$k0" />
                       <node concept="3TrEf2" id="2lgwE2U3MB7" role="2OqNvi">
-                        <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" />
+                        <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" resolve="msgref" />
                       </node>
                     </node>
                     <node concept="3TrEf2" id="2lgwE2U3MB8" role="2OqNvi">
-                      <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" />
+                      <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" resolve="msg" />
                     </node>
                   </node>
                   <node concept="3TrcHB" id="2lgwE2U3MB9" role="2OqNvi">
@@ -5953,7 +5953,7 @@
                   <node concept="2OqwBi" id="2lgwE2U3MBe" role="2Oq$k0">
                     <node concept="30H73N" id="2lgwE2U3MBd" role="2Oq$k0" />
                     <node concept="3TrEf2" id="2lgwE2U3MBi" role="2OqNvi">
-                      <ref role="3Tt5mk" to="k146:2lgwE2U3hII" />
+                      <ref role="3Tt5mk" to="k146:2lgwE2U3hII" resolve="check" />
                     </node>
                   </node>
                   <node concept="3w_OXm" id="2lgwE2U3MBn" role="2OqNvi" />
@@ -6005,15 +6005,15 @@
                                             <node concept="2OqwBi" id="7fU3Y2_gpLm" role="2Oq$k0">
                                               <node concept="30H73N" id="7fU3Y2_gpa4" role="2Oq$k0" />
                                               <node concept="3TrEf2" id="7fU3Y2_g$JK" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" />
+                                                <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" resolve="msgref" />
                                               </node>
                                             </node>
                                             <node concept="3TrEf2" id="7fU3Y2_gDCJ" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" />
+                                              <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" resolve="msg" />
                                             </node>
                                           </node>
                                           <node concept="3Tsc0h" id="7fU3Y2_gI3B" role="2OqNvi">
-                                            <ref role="3TtcxE" to="k146:EAKPqgNfBU" />
+                                            <ref role="3TtcxE" to="k146:EAKPqgNfBU" resolve="properties" />
                                           </node>
                                         </node>
                                         <node concept="2S7cBI" id="7fU3Y2_h8yz" role="2OqNvi">
@@ -6176,11 +6176,11 @@
                                                 <node concept="2OqwBi" id="7fU3Y2eOgak" role="2Oq$k0">
                                                   <node concept="30H73N" id="7fU3Y2eO7VA" role="2Oq$k0" />
                                                   <node concept="3TrEf2" id="7fU3Y2eOl$3" role="2OqNvi">
-                                                    <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" />
+                                                    <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" resolve="msgref" />
                                                   </node>
                                                 </node>
                                                 <node concept="3TrEf2" id="7fU3Y2eOqvQ" role="2OqNvi">
-                                                  <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" />
+                                                  <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" resolve="msg" />
                                                 </node>
                                               </node>
                                               <node concept="1mfA1w" id="7fU3Y2eO7VB" role="2OqNvi" />
@@ -6200,11 +6200,11 @@
                                         <node concept="2OqwBi" id="7fU3Y2eO7VE" role="2Oq$k0">
                                           <node concept="30H73N" id="7fU3Y2eO7VF" role="2Oq$k0" />
                                           <node concept="3TrEf2" id="7fU3Y2eOwqL" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" />
+                                            <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" resolve="msgref" />
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="7fU3Y2eO_1n" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" />
+                                          <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" resolve="msg" />
                                         </node>
                                       </node>
                                       <node concept="3TrcHB" id="7fU3Y2eOE8_" role="2OqNvi">
@@ -6312,7 +6312,7 @@
                                   <node concept="2OqwBi" id="7fU3Y2_nZi2" role="2Oq$k0">
                                     <node concept="30H73N" id="7fU3Y2_nXMd" role="2Oq$k0" />
                                     <node concept="3TrEf2" id="7fU3Y2_o4dR" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="mj1l:hEaDaGor64" />
+                                      <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
                                     </node>
                                   </node>
                                   <node concept="2qgKlT" id="7fU3Y2_o9SF" role="2OqNvi">
@@ -6361,7 +6361,7 @@
                                         <ref role="3cqZAo" node="7fU3Y2_oRgH" resolve="messageRef" />
                                       </node>
                                       <node concept="3Tsc0h" id="7fU3Y2_oRgT" role="2OqNvi">
-                                        <ref role="3TtcxE" to="k146:EAKPqgNjFs" />
+                                        <ref role="3TtcxE" to="k146:EAKPqgNjFs" resolve="propVals" />
                                       </node>
                                     </node>
                                     <node concept="34jXtK" id="7fU3Y2_oRgU" role="2OqNvi">
@@ -6410,7 +6410,7 @@
                           <node concept="2OqwBi" id="7fU3Y2_kBes" role="3clFbG">
                             <node concept="30H73N" id="7fU3Y2_kAX1" role="2Oq$k0" />
                             <node concept="3TrEf2" id="7fU3Y2_kG6j" role="2OqNvi">
-                              <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" />
+                              <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" resolve="msgref" />
                             </node>
                           </node>
                         </node>
@@ -6426,15 +6426,15 @@
                               <node concept="2OqwBi" id="7fU3Y2_kQ5g" role="2Oq$k0">
                                 <node concept="30H73N" id="7fU3Y2_kPNT" role="2Oq$k0" />
                                 <node concept="3TrEf2" id="7fU3Y2_kW1w" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" />
+                                  <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" resolve="msgref" />
                                 </node>
                               </node>
                               <node concept="3TrEf2" id="7fU3Y2_lcjY" role="2OqNvi">
-                                <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" />
+                                <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" resolve="msg" />
                               </node>
                             </node>
                             <node concept="3Tsc0h" id="7fU3Y2_li8g" role="2OqNvi">
-                              <ref role="3TtcxE" to="k146:EAKPqgNfBU" />
+                              <ref role="3TtcxE" to="k146:EAKPqgNfBU" resolve="properties" />
                             </node>
                           </node>
                         </node>
@@ -6464,11 +6464,11 @@
                                   <node concept="2OqwBi" id="5oFMniD7$Zc" role="2Oq$k0">
                                     <node concept="30H73N" id="5oFMniD7$Zb" role="2Oq$k0" />
                                     <node concept="3TrEf2" id="5oFMniD7$Zg" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" />
+                                      <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" resolve="msgref" />
                                     </node>
                                   </node>
                                   <node concept="3TrEf2" id="5oFMniD7$Zl" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" />
+                                    <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" resolve="msg" />
                                   </node>
                                 </node>
                                 <node concept="2qgKlT" id="5oFMniD7$Zr" role="2OqNvi">
@@ -6490,11 +6490,11 @@
                               <node concept="2OqwBi" id="5oFMniD7$YS" role="2Oq$k0">
                                 <node concept="30H73N" id="5oFMniD7$YR" role="2Oq$k0" />
                                 <node concept="3TrEf2" id="5oFMniD7$YW" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" />
+                                  <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" resolve="msgref" />
                                 </node>
                               </node>
                               <node concept="3TrEf2" id="5oFMniD7$Z1" role="2OqNvi">
-                                <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" />
+                                <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" resolve="msg" />
                               </node>
                             </node>
                             <node concept="3TrcHB" id="5oFMniD7$Z6" role="2OqNvi">
@@ -6570,11 +6570,11 @@
                                                 <node concept="2OqwBi" id="4Mvxa96veKG" role="2Oq$k0">
                                                   <node concept="30H73N" id="4Mvxa96veKH" role="2Oq$k0" />
                                                   <node concept="3TrEf2" id="4Mvxa96veKI" role="2OqNvi">
-                                                    <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" />
+                                                    <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" resolve="msgref" />
                                                   </node>
                                                 </node>
                                                 <node concept="3TrEf2" id="4Mvxa96veKJ" role="2OqNvi">
-                                                  <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" />
+                                                  <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" resolve="msg" />
                                                 </node>
                                               </node>
                                               <node concept="1mfA1w" id="4Mvxa96veKK" role="2OqNvi" />
@@ -6594,11 +6594,11 @@
                                         <node concept="2OqwBi" id="4Mvxa96veKP" role="2Oq$k0">
                                           <node concept="30H73N" id="4Mvxa96veKQ" role="2Oq$k0" />
                                           <node concept="3TrEf2" id="4Mvxa96veKR" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" />
+                                            <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" resolve="msgref" />
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="4Mvxa96veKS" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" />
+                                          <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" resolve="msg" />
                                         </node>
                                       </node>
                                       <node concept="3TrcHB" id="4Mvxa96veKT" role="2OqNvi">
@@ -6640,11 +6640,11 @@
                                   <node concept="2OqwBi" id="4Mvxa96veMx" role="2Oq$k0">
                                     <node concept="30H73N" id="4Mvxa96veMy" role="2Oq$k0" />
                                     <node concept="3TrEf2" id="4Mvxa96veMz" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" />
+                                      <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" resolve="msgref" />
                                     </node>
                                   </node>
                                   <node concept="3TrEf2" id="4Mvxa96veM$" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" />
+                                    <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" resolve="msg" />
                                   </node>
                                 </node>
                                 <node concept="2qgKlT" id="4Mvxa96veM_" role="2OqNvi">
@@ -6666,11 +6666,11 @@
                               <node concept="2OqwBi" id="4Mvxa96veMG" role="2Oq$k0">
                                 <node concept="30H73N" id="4Mvxa96veMH" role="2Oq$k0" />
                                 <node concept="3TrEf2" id="4Mvxa96veMI" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" />
+                                  <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" resolve="msgref" />
                                 </node>
                               </node>
                               <node concept="3TrEf2" id="4Mvxa96veMJ" role="2OqNvi">
-                                <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" />
+                                <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" resolve="msg" />
                               </node>
                             </node>
                             <node concept="3TrcHB" id="4Mvxa96veMK" role="2OqNvi">
@@ -6704,15 +6704,15 @@
                       <node concept="2OqwBi" id="4Mvxa96vdf_" role="2Oq$k0">
                         <node concept="30H73N" id="4Mvxa96vdfA" role="2Oq$k0" />
                         <node concept="3TrEf2" id="4Mvxa96vdfB" role="2OqNvi">
-                          <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" />
+                          <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" resolve="msgref" />
                         </node>
                       </node>
                       <node concept="3TrEf2" id="4Mvxa96vdfC" role="2OqNvi">
-                        <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" />
+                        <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" resolve="msg" />
                       </node>
                     </node>
                     <node concept="3Tsc0h" id="4Mvxa96vdfD" role="2OqNvi">
-                      <ref role="3TtcxE" to="k146:EAKPqgNfBU" />
+                      <ref role="3TtcxE" to="k146:EAKPqgNfBU" resolve="properties" />
                     </node>
                   </node>
                   <node concept="34oBXx" id="4Mvxa96vdfE" role="2OqNvi" />
@@ -6727,11 +6727,11 @@
                     <node concept="2OqwBi" id="4Mvxa96vcv$" role="2Oq$k0">
                       <node concept="30H73N" id="4Mvxa96vcv_" role="2Oq$k0" />
                       <node concept="3TrEf2" id="4Mvxa96vcvA" role="2OqNvi">
-                        <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" />
+                        <ref role="3Tt5mk" to="k146:2lgwE2U3eIp" resolve="msgref" />
                       </node>
                     </node>
                     <node concept="3TrEf2" id="4Mvxa96vcvB" role="2OqNvi">
-                      <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" />
+                      <ref role="3Tt5mk" to="k146:2lgwE2U3cEp" resolve="msg" />
                     </node>
                   </node>
                   <node concept="3TrcHB" id="4Mvxa96vcvC" role="2OqNvi">
@@ -6742,7 +6742,7 @@
                   <node concept="2OqwBi" id="4Mvxa96vcvE" role="2Oq$k0">
                     <node concept="30H73N" id="4Mvxa96vcvF" role="2Oq$k0" />
                     <node concept="3TrEf2" id="4Mvxa96vcvG" role="2OqNvi">
-                      <ref role="3Tt5mk" to="k146:2lgwE2U3hII" />
+                      <ref role="3Tt5mk" to="k146:2lgwE2U3hII" resolve="check" />
                     </node>
                   </node>
                   <node concept="3w_OXm" id="4Mvxa96vcvH" role="2OqNvi" />
@@ -6806,7 +6806,7 @@
                 </node>
               </node>
               <node concept="3TrEf2" id="78Ts1skpDGg" role="2OqNvi">
-                <ref role="3Tt5mk" to="k146:3R$6B6bKEUv" />
+                <ref role="3Tt5mk" to="k146:3R$6B6bKEUv" resolve="strategy" />
               </node>
             </node>
             <node concept="1mIQ4w" id="78Ts1skpDGh" role="2OqNvi">
@@ -6866,7 +6866,7 @@
                     <node concept="2OqwBi" id="5zHSh8Vjl68" role="2Oq$k0">
                       <node concept="30H73N" id="5zHSh8Vjl69" role="2Oq$k0" />
                       <node concept="3TrEf2" id="5zHSh8Vjl6a" role="2OqNvi">
-                        <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" />
+                        <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" resolve="expression" />
                       </node>
                     </node>
                     <node concept="3JvlWi" id="5zHSh8Vjl6b" role="2OqNvi" />
@@ -6906,7 +6906,7 @@
                             <node concept="2OqwBi" id="5zHSh8Vjl6r" role="2Oq$k0">
                               <node concept="30H73N" id="5zHSh8Vjl6s" role="2Oq$k0" />
                               <node concept="3TrEf2" id="5zHSh8Vjl6t" role="2OqNvi">
-                                <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" />
+                                <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" resolve="expression" />
                               </node>
                             </node>
                             <node concept="3JvlWi" id="5zHSh8Vjl6u" role="2OqNvi" />
@@ -6940,7 +6940,7 @@
                 <node concept="2OqwBi" id="4Mvxa97GfS$" role="2Oq$k0">
                   <node concept="30H73N" id="4Mvxa97GfHd" role="2Oq$k0" />
                   <node concept="3TrEf2" id="4Mvxa97Gk8r" role="2OqNvi">
-                    <ref role="3Tt5mk" to="koo2:4Mvxa96AcG1" />
+                    <ref role="3Tt5mk" to="koo2:4Mvxa96AcG1" resolve="target" />
                   </node>
                 </node>
                 <node concept="1mIQ4w" id="4Mvxa97Gr4j" role="2OqNvi">
@@ -7042,7 +7042,7 @@
                                   <node concept="2OqwBi" id="5zHSh8V9cYg" role="2Oq$k0">
                                     <node concept="30H73N" id="5zHSh8V98uR" role="2Oq$k0" />
                                     <node concept="3TrEf2" id="5zHSh8V9fqa" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" />
+                                      <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" resolve="expression" />
                                     </node>
                                   </node>
                                   <node concept="3JvlWi" id="5zHSh8VfZYR" role="2OqNvi" />
@@ -7077,7 +7077,7 @@
                             <node concept="2OqwBi" id="5zHSh8V9SCl" role="3GDnbk">
                               <node concept="30H73N" id="5zHSh8V9Stf" role="2Oq$k0" />
                               <node concept="3TrEf2" id="5zHSh8V9X$$" role="2OqNvi">
-                                <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" />
+                                <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" resolve="expression" />
                               </node>
                             </node>
                           </node>
@@ -7161,7 +7161,7 @@
                     <node concept="2OqwBi" id="5zHSh8Vi7gD" role="2Oq$k0">
                       <node concept="30H73N" id="5zHSh8Vi75$" role="2Oq$k0" />
                       <node concept="3TrEf2" id="5zHSh8Vic8P" role="2OqNvi">
-                        <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" />
+                        <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" resolve="expression" />
                       </node>
                     </node>
                     <node concept="3JvlWi" id="5zHSh8Viho0" role="2OqNvi" />
@@ -7201,7 +7201,7 @@
                             <node concept="2OqwBi" id="5zHSh8ViAh3" role="2Oq$k0">
                               <node concept="30H73N" id="5zHSh8ViA5Y" role="2Oq$k0" />
                               <node concept="3TrEf2" id="5zHSh8ViDcJ" role="2OqNvi">
-                                <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" />
+                                <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" resolve="expression" />
                               </node>
                             </node>
                             <node concept="3JvlWi" id="5zHSh8ViIzJ" role="2OqNvi" />
@@ -7227,7 +7227,7 @@
                   <node concept="2OqwBi" id="5zHSh8V5QqO" role="2Oq$k0">
                     <node concept="30H73N" id="5zHSh8V5QqP" role="2Oq$k0" />
                     <node concept="3TrEf2" id="5zHSh8V5QqQ" role="2OqNvi">
-                      <ref role="3Tt5mk" to="koo2:4Mvxa96AcG1" />
+                      <ref role="3Tt5mk" to="koo2:4Mvxa96AcG1" resolve="target" />
                     </node>
                   </node>
                   <node concept="1mIQ4w" id="5zHSh8V5QqR" role="2OqNvi">
@@ -7296,7 +7296,7 @@
                 <ref role="3cqZAo" node="4Mvxa97FP4t" resolve="bc" />
               </node>
               <node concept="3TrEf2" id="4Mvxa97FP4H" role="2OqNvi">
-                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
               </node>
             </node>
           </node>
@@ -7308,7 +7308,7 @@
                 <ref role="3cqZAo" node="4Mvxa97FP4t" resolve="bc" />
               </node>
               <node concept="3TrEf2" id="4Mvxa97FP4M" role="2OqNvi">
-                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
               </node>
             </node>
             <node concept="1mIQ4w" id="4Mvxa97FP4N" role="2OqNvi">
@@ -7343,7 +7343,7 @@
                   <node concept="3clFbF" id="7pMSfLXdvMN" role="3cqZAp">
                     <node concept="2OqwBi" id="7pMSfLXdvMI" role="3clFbG">
                       <node concept="3TrEf2" id="7pMSfLXdvML" role="2OqNvi">
-                        <ref role="3Tt5mk" to="koo2:3dH4JopctrO" />
+                        <ref role="3Tt5mk" to="koo2:3dH4JopctrO" resolve="body" />
                       </node>
                       <node concept="30H73N" id="7pMSfLXdvMM" role="2Oq$k0" />
                     </node>
@@ -7413,7 +7413,7 @@
                                     <node concept="2OqwBi" id="4sbNL4NBjc1" role="2Oq$k0">
                                       <node concept="30H73N" id="4sbNL4NBjc2" role="2Oq$k0" />
                                       <node concept="3TrEf2" id="4sbNL4NBjc3" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                        <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                       </node>
                                     </node>
                                     <node concept="2qgKlT" id="4sbNL4NBjc4" role="2OqNvi">
@@ -7511,7 +7511,7 @@
                                       <ref role="3cqZAo" node="7pMSfLXvjjG" resolve="bc" />
                                     </node>
                                     <node concept="3Tsc0h" id="7pMSfLXvjk2" role="2OqNvi">
-                                      <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" />
+                                      <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" resolve="configurationItems" />
                                     </node>
                                   </node>
                                   <node concept="v3k3i" id="3vlJV9esEGn" role="2OqNvi">
@@ -7523,7 +7523,7 @@
                                 <node concept="1uHKPH" id="7pMSfLXvjk5" role="2OqNvi" />
                               </node>
                               <node concept="3Tsc0h" id="7pMSfLXvjk6" role="2OqNvi">
-                                <ref role="3TtcxE" to="koo2:3gdl6si6LyV" />
+                                <ref role="3TtcxE" to="koo2:3gdl6si6LyV" resolve="digitalConfig" />
                               </node>
                             </node>
                           </node>
@@ -7553,11 +7553,11 @@
                                                   <ref role="3cqZAo" node="4vmikwH3DsT" resolve="it" />
                                                 </node>
                                                 <node concept="3TrEf2" id="4vmikwH3DsM" role="2OqNvi">
-                                                  <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                                  <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                                 </node>
                                               </node>
                                               <node concept="3TrEf2" id="4vmikwH3DsN" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="koo2:4JsbL6NpKGY" />
+                                                <ref role="3Tt5mk" to="koo2:4JsbL6NpKGY" resolve="dataDirectionReg" />
                                               </node>
                                             </node>
                                             <node concept="3TrcHB" id="4vmikwH3DsO" role="2OqNvi">
@@ -7590,7 +7590,7 @@
                                             <ref role="3cqZAo" node="4vmikwH3Dt4" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="4vmikwH3Dt2" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                            <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                           </node>
                                         </node>
                                         <node concept="3TrcHB" id="4vmikwH3Dt3" role="2OqNvi">
@@ -7633,7 +7633,7 @@
                                         <ref role="3M$S_o" node="7pMSfLXvjk9" resolve="item" />
                                       </node>
                                       <node concept="3TrEf2" id="5eVJx9DhwRr" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                        <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                       </node>
                                     </node>
                                     <node concept="3TrcHB" id="5eVJx9DhyF4" role="2OqNvi">
@@ -7763,17 +7763,17 @@
                                       <ref role="3cqZAo" node="7pMSfLXvjl9" resolve="bc" />
                                     </node>
                                     <node concept="3TrEf2" id="7pMSfLXvjlr" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                                      <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                               <node concept="3TrEf2" id="7pMSfLXvjls" role="2OqNvi">
-                                <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" />
+                                <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
                               </node>
                             </node>
                             <node concept="3Tsc0h" id="7pMSfLXvjlt" role="2OqNvi">
-                              <ref role="3TtcxE" to="koo2:4JsbL6NpKIN" />
+                              <ref role="3TtcxE" to="koo2:4JsbL6NpKIN" resolve="digitalPins" />
                             </node>
                           </node>
                           <node concept="3$u5V9" id="7pMSfLXvjlu" role="2OqNvi">
@@ -7785,7 +7785,7 @@
                                       <ref role="3cqZAo" node="7pMSfLXvjl_" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="7pMSfLXvjl$" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="koo2:4JsbL6NpKGY" />
+                                      <ref role="3Tt5mk" to="koo2:4JsbL6NpKGY" resolve="dataDirectionReg" />
                                     </node>
                                   </node>
                                 </node>
@@ -7824,7 +7824,7 @@
                                     <node concept="2OqwBi" id="4sbNL4NBlD0" role="2Oq$k0">
                                       <node concept="30H73N" id="4sbNL4NBlD1" role="2Oq$k0" />
                                       <node concept="3TrEf2" id="4sbNL4NBlD2" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                        <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                       </node>
                                     </node>
                                     <node concept="2qgKlT" id="4sbNL4NBlD3" role="2OqNvi">
@@ -7904,7 +7904,7 @@
                                       <ref role="3cqZAo" node="7pMSfLXvjlY" resolve="bc" />
                                     </node>
                                     <node concept="3Tsc0h" id="7pMSfLXvjmk" role="2OqNvi">
-                                      <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" />
+                                      <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" resolve="configurationItems" />
                                     </node>
                                   </node>
                                   <node concept="v3k3i" id="3vlJV9etNkq" role="2OqNvi">
@@ -7916,7 +7916,7 @@
                                 <node concept="1uHKPH" id="7pMSfLXvjmn" role="2OqNvi" />
                               </node>
                               <node concept="3Tsc0h" id="7pMSfLXvjmo" role="2OqNvi">
-                                <ref role="3TtcxE" to="koo2:3gdl6si6LyV" />
+                                <ref role="3TtcxE" to="koo2:3gdl6si6LyV" resolve="digitalConfig" />
                               </node>
                             </node>
                           </node>
@@ -7946,11 +7946,11 @@
                                                   <ref role="3cqZAo" node="4vmikwH3YxQ" resolve="it" />
                                                 </node>
                                                 <node concept="3TrEf2" id="4vmikwH3YxJ" role="2OqNvi">
-                                                  <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                                  <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                                 </node>
                                               </node>
                                               <node concept="3TrEf2" id="4vmikwH3YxK" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="koo2:2mpt1xbR9gV" />
+                                                <ref role="3Tt5mk" to="koo2:2mpt1xbR9gV" resolve="outputReg" />
                                               </node>
                                             </node>
                                             <node concept="3TrcHB" id="4vmikwH3YxL" role="2OqNvi">
@@ -7983,7 +7983,7 @@
                                             <ref role="3cqZAo" node="4vmikwH3Yy1" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="4vmikwH3YxZ" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                            <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                           </node>
                                         </node>
                                         <node concept="3TrcHB" id="4vmikwH3Yy0" role="2OqNvi">
@@ -8044,7 +8044,7 @@
                                         <ref role="3M$S_o" node="5eVJx9DjZHy" resolve="item" />
                                       </node>
                                       <node concept="3TrEf2" id="5eVJx9DjZHG" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                                        <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                       </node>
                                     </node>
                                     <node concept="3TrcHB" id="5eVJx9DjZHH" role="2OqNvi">
@@ -8176,17 +8176,17 @@
                                       <ref role="3cqZAo" node="7pMSfLXvjnr" resolve="bc" />
                                     </node>
                                     <node concept="3TrEf2" id="7pMSfLXvjnH" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                                      <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                               <node concept="3TrEf2" id="7pMSfLXvjnI" role="2OqNvi">
-                                <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" />
+                                <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
                               </node>
                             </node>
                             <node concept="3Tsc0h" id="7pMSfLXvjnJ" role="2OqNvi">
-                              <ref role="3TtcxE" to="koo2:4JsbL6NpKIN" />
+                              <ref role="3TtcxE" to="koo2:4JsbL6NpKIN" resolve="digitalPins" />
                             </node>
                           </node>
                           <node concept="3$u5V9" id="7pMSfLXvjnK" role="2OqNvi">
@@ -8198,7 +8198,7 @@
                                       <ref role="3cqZAo" node="7pMSfLXvjnR" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="7pMSfLXvjnQ" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="koo2:2mpt1xbR9gV" />
+                                      <ref role="3Tt5mk" to="koo2:2mpt1xbR9gV" resolve="outputReg" />
                                     </node>
                                   </node>
                                 </node>
@@ -8256,15 +8256,15 @@
                                       <node concept="2OqwBi" id="7pMSfLXvjog" role="2Oq$k0">
                                         <node concept="30H73N" id="7pMSfLXvjoh" role="2Oq$k0" />
                                         <node concept="3TrEf2" id="7pMSfLXvjoi" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" />
+                                          <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
                                         </node>
                                       </node>
                                       <node concept="3TrEf2" id="7pMSfLXvjoj" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:7fU3Y2ecVh8" />
+                                        <ref role="3Tt5mk" to="koo2:7fU3Y2ecVh8" resolve="UCSRB" />
                                       </node>
                                     </node>
                                     <node concept="3TrEf2" id="7pMSfLXvjok" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                      <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                     </node>
                                   </node>
                                   <node concept="2qgKlT" id="7pMSfLXvjol" role="2OqNvi">
@@ -8630,15 +8630,15 @@
                                       <node concept="2OqwBi" id="7pMSfLXvjqK" role="2Oq$k0">
                                         <node concept="30H73N" id="7pMSfLXvjqL" role="2Oq$k0" />
                                         <node concept="3TrEf2" id="7pMSfLXvjqM" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" />
+                                          <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
                                         </node>
                                       </node>
                                       <node concept="3TrEf2" id="7pMSfLXvjqN" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:7fU3Y2ecVhe" />
+                                        <ref role="3Tt5mk" to="koo2:7fU3Y2ecVhe" resolve="UCSRC" />
                                       </node>
                                     </node>
                                     <node concept="3TrEf2" id="7pMSfLXvjqO" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                      <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                     </node>
                                   </node>
                                   <node concept="2qgKlT" id="7pMSfLXvjqP" role="2OqNvi">
@@ -8705,7 +8705,7 @@
                                               <ref role="3cqZAo" node="7pMSfLXvjr2" resolve="bc" />
                                             </node>
                                             <node concept="3TrEf2" id="7pMSfLXvjrk" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                                              <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                                             </node>
                                           </node>
                                         </node>
@@ -8758,15 +8758,15 @@
                                       <node concept="2OqwBi" id="7pMSfLXvjrC" role="2Oq$k0">
                                         <node concept="30H73N" id="7pMSfLXvjrD" role="2Oq$k0" />
                                         <node concept="3TrEf2" id="7pMSfLXvjrE" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" />
+                                          <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
                                         </node>
                                       </node>
                                       <node concept="3TrEf2" id="7pMSfLXvjrF" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:7fU3Y2ecVlc" />
+                                        <ref role="3Tt5mk" to="koo2:7fU3Y2ecVlc" resolve="UBRRH" />
                                       </node>
                                     </node>
                                     <node concept="3TrEf2" id="7pMSfLXvjrG" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                      <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                     </node>
                                   </node>
                                   <node concept="2qgKlT" id="7pMSfLXvjrH" role="2OqNvi">
@@ -8829,7 +8829,7 @@
                                             <ref role="3cqZAo" node="7pMSfLXvjrS" resolve="bc" />
                                           </node>
                                           <node concept="3TrEf2" id="7pMSfLXvjsa" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                                            <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                                           </node>
                                         </node>
                                       </node>
@@ -8881,15 +8881,15 @@
                                       <node concept="2OqwBi" id="7pMSfLXvjsu" role="2Oq$k0">
                                         <node concept="30H73N" id="7pMSfLXvjsv" role="2Oq$k0" />
                                         <node concept="3TrEf2" id="7pMSfLXvjsw" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" />
+                                          <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
                                         </node>
                                       </node>
                                       <node concept="3TrEf2" id="7pMSfLXvjsx" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:7fU3Y2eemHw" />
+                                        <ref role="3Tt5mk" to="koo2:7fU3Y2eemHw" resolve="UBRRL" />
                                       </node>
                                     </node>
                                     <node concept="3TrEf2" id="7pMSfLXvjsy" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                      <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                     </node>
                                   </node>
                                   <node concept="2qgKlT" id="7pMSfLXvjsz" role="2OqNvi">
@@ -8935,7 +8935,7 @@
                             <ref role="3cqZAo" node="7pMSfLXvjsE" resolve="bc" />
                           </node>
                           <node concept="3Tsc0h" id="7pMSfLXvjsR" role="2OqNvi">
-                            <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" />
+                            <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" resolve="configurationItems" />
                           </node>
                         </node>
                         <node concept="v3k3i" id="vfqcI_Hasa" role="2OqNvi">
@@ -9047,7 +9047,7 @@
                       <node concept="3clFbF" id="7pMSfLXvjtD" role="3cqZAp">
                         <node concept="2OqwBi" id="7pMSfLXvjtE" role="3clFbG">
                           <node concept="3TrEf2" id="7pMSfLXvjtF" role="2OqNvi">
-                            <ref role="3Tt5mk" to="koo2:3dH4Jopl$nI" />
+                            <ref role="3Tt5mk" to="koo2:3dH4Jopl$nI" resolve="body" />
                           </node>
                           <node concept="30H73N" id="7pMSfLXvjtG" role="2Oq$k0" />
                         </node>
@@ -9199,7 +9199,7 @@
                   <node concept="3clFbF" id="1Jb2Eko8NgV" role="3cqZAp">
                     <node concept="2OqwBi" id="1Jb2Eko8NgQ" role="3clFbG">
                       <node concept="3TrEf2" id="1Jb2Eko8NgT" role="2OqNvi">
-                        <ref role="3Tt5mk" to="mj1l:hEaDaGor64" />
+                        <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
                       </node>
                       <node concept="30H73N" id="1Jb2Eko8NgU" role="2Oq$k0" />
                     </node>
@@ -9214,7 +9214,7 @@
                 <node concept="3clFbF" id="1Jb2Eko8LV_" role="3cqZAp">
                   <node concept="2OqwBi" id="1Jb2Eko8LVw" role="3clFbG">
                     <node concept="3Tsc0h" id="1Jb2Eko8LVz" role="2OqNvi">
-                      <ref role="3TtcxE" to="x27k:4WTYg$PUiX5" />
+                      <ref role="3TtcxE" to="x27k:4WTYg$PUiX5" resolve="arguments" />
                     </node>
                     <node concept="30H73N" id="1Jb2Eko8LV$" role="2Oq$k0" />
                   </node>
@@ -9299,7 +9299,7 @@
                                               <ref role="3cqZAo" node="1Jb2Eko7MBH" resolve="it" />
                                             </node>
                                             <node concept="3Tsc0h" id="1Jb2Eko83pb" role="2OqNvi">
-                                              <ref role="3TtcxE" to="x27k:4WTYg$PUiX5" />
+                                              <ref role="3TtcxE" to="x27k:4WTYg$PUiX5" resolve="arguments" />
                                             </node>
                                           </node>
                                           <node concept="3GX2aA" id="1Jb2Eko8A3F" role="2OqNvi" />
@@ -9682,7 +9682,7 @@
                                   </node>
                                 </node>
                                 <node concept="3TrEf2" id="1pOg3uxo00Q" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                                  <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                                 </node>
                               </node>
                             </node>
@@ -9788,7 +9788,7 @@
                                 </node>
                               </node>
                               <node concept="3TrEf2" id="55_53lUxyQy" role="2OqNvi">
-                                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                               </node>
                             </node>
                           </node>
@@ -9875,7 +9875,7 @@
                       <node concept="2OqwBi" id="2kkumeGQS1S" role="3clFbG">
                         <node concept="30H73N" id="2kkumeGQS1R" role="2Oq$k0" />
                         <node concept="3Tsc0h" id="2kkumeGQS1W" role="2OqNvi">
-                          <ref role="3TtcxE" to="51wr:2kkumeGQBlk" />
+                          <ref role="3TtcxE" to="51wr:2kkumeGQBlk" resolve="referencedLibs" />
                         </node>
                       </node>
                     </node>
@@ -9893,7 +9893,7 @@
                           <node concept="2OqwBi" id="2kkumeGQSPr" role="2Oq$k0">
                             <node concept="30H73N" id="2kkumeGQSPo" role="2Oq$k0" />
                             <node concept="3TrEf2" id="2kkumeGQSPy" role="2OqNvi">
-                              <ref role="3Tt5mk" to="51wr:2kkumeGQBhZ" />
+                              <ref role="3Tt5mk" to="51wr:2kkumeGQBhZ" resolve="lib" />
                             </node>
                           </node>
                           <node concept="3TrcHB" id="2kkumeGQSPD" role="2OqNvi">
@@ -9931,7 +9931,7 @@
                       <node concept="2OqwBi" id="4aYGoLbxeHz" role="3clFbG">
                         <node concept="30H73N" id="4aYGoLbxeH$" role="2Oq$k0" />
                         <node concept="3Tsc0h" id="4aYGoLbxeHW" role="2OqNvi">
-                          <ref role="3TtcxE" to="51wr:4aYGoLbxbV6" />
+                          <ref role="3TtcxE" to="51wr:4aYGoLbxbV6" resolve="linkables" />
                         </node>
                       </node>
                     </node>
@@ -10079,7 +10079,7 @@
                 <ref role="3cqZAo" node="exHFgzQ90w" resolve="bc" />
               </node>
               <node concept="3TrEf2" id="exHFgzQ90K" role="2OqNvi">
-                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
               </node>
             </node>
           </node>
@@ -10091,7 +10091,7 @@
                 <ref role="3cqZAo" node="exHFgzQ90w" resolve="bc" />
               </node>
               <node concept="3TrEf2" id="exHFgzQ90P" role="2OqNvi">
-                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
               </node>
             </node>
             <node concept="1mIQ4w" id="exHFgzQ90Q" role="2OqNvi">
diff --git a/languages/mbeddr.arduino.core/languageModels/behavior.mps b/languages/mbeddr.arduino.core/languageModels/behavior.mps
old mode 100644
new mode 100755
index 9be0441..dfad0bd
--- a/languages/mbeddr.arduino.core/languageModels/behavior.mps
+++ b/languages/mbeddr.arduino.core/languageModels/behavior.mps
@@ -8,7 +8,7 @@
   <imports>
     <import index="koo2" ref="r:3c7790ca-a687-4dfa-a94e-7b5e9848d78c(mbeddr.arduino.core.structure)" />
     <import index="51wr" ref="r:b31f1c3c-99aa-4f1e-a329-cba27efb1a6b(com.mbeddr.core.buildconfig.structure)" />
-    <import index="fxg7" ref="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.io(java.io@java_stub)" />
+    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="x27k" ref="r:75ecab8a-8931-4140-afc6-4b46398710fc(com.mbeddr.core.modules.structure)" />
     <import index="ahli" ref="r:44ccebce-f3a6-4238-afbf-c4a18f6348c1(com.mbeddr.core.buildconfig.behavior)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
@@ -17,8 +17,8 @@
     <import index="c4fa" ref="r:9f0e84b6-2ec7-4f9e-83e0-feedc77b63a3(com.mbeddr.core.statements.structure)" />
     <import index="hwgx" ref="r:fd2980c8-676c-4b19-b524-18c70e02f8b7(com.mbeddr.core.base.behavior)" />
     <import index="mj1l" ref="r:c371cf98-dcc8-4a43-8eb8-8a8096de18b2(com.mbeddr.core.expressions.structure)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
-    <import index="e2lb" ref="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.lang(JDK/java.lang@java_stub)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
@@ -155,8 +155,8 @@
         <reference id="1219352800908" name="referentNode" index="3B5MYn" />
       </concept>
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <reference id="1140138128738" name="concept" index="1PxNhF" />
-        <child id="1140138123956" name="leftExpression" index="1PxMeX" />
+        <reference id="1140138128738" name="concept_old" index="1PxNhF" />
+        <child id="1140138123956" name="leftExpression_old" index="1PxMeX" />
       </concept>
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
@@ -258,7 +258,7 @@
             <node concept="2OqwBi" id="4JsbL6Nq5eS" role="2Oq$k0">
               <node concept="13iPFW" id="4JsbL6Nq5ez" role="2Oq$k0" />
               <node concept="3TrEf2" id="4JsbL6Nq5eX" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" />
+                <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
               </node>
             </node>
             <node concept="3TrcHB" id="4JsbL6Nq5fp" role="2OqNvi">
@@ -282,8 +282,8 @@
               <property role="Xl_RC" value="UL" />
             </node>
             <node concept="2YIFZM" id="4JsbL6Nq5gk" role="3uHU7B">
-              <ref role="1Pybhc" to="e2lb:~String" resolve="String" />
-              <ref role="37wK5l" to="e2lb:~String.valueOf(int):java.lang.String" resolve="valueOf" />
+              <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+              <ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
               <node concept="17qRlL" id="4JsbL6Nq5hK" role="37wK5m">
                 <node concept="3cmrfG" id="4JsbL6Nq5hQ" role="3uHU7w">
                   <property role="3cmrfH" value="1000000" />
@@ -292,7 +292,7 @@
                   <node concept="2OqwBi" id="4JsbL6Nq5gE" role="2Oq$k0">
                     <node concept="13iPFW" id="4JsbL6Nq5gl" role="2Oq$k0" />
                     <node concept="3TrEf2" id="4JsbL6Nq5gQ" role="2OqNvi">
-                      <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" />
+                      <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
                     </node>
                   </node>
                   <node concept="3TrcHB" id="4JsbL6Nq5hq" role="2OqNvi">
@@ -368,7 +368,7 @@
               <node concept="2OqwBi" id="7fU3Y2exStn" role="2Oq$k0">
                 <node concept="13iPFW" id="7fU3Y2exSeP" role="2Oq$k0" />
                 <node concept="3TrEf2" id="7fU3Y2exVbU" role="2OqNvi">
-                  <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" />
+                  <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
                 </node>
               </node>
               <node concept="3TrcHB" id="7fU3Y2exXHn" role="2OqNvi">
@@ -416,8 +416,8 @@
         <node concept="3cpWs6" id="3gdl6si72dN" role="3cqZAp">
           <node concept="3cpWs3" id="3gdl6si72e0" role="3cqZAk">
             <node concept="2YIFZM" id="3gdl6si72e4" role="3uHU7w">
-              <ref role="1Pybhc" to="e2lb:~String" resolve="String" />
-              <ref role="37wK5l" to="e2lb:~String.valueOf(int):java.lang.String" resolve="valueOf" />
+              <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+              <ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
               <node concept="2OqwBi" id="3gdl6si72eq" role="37wK5m">
                 <node concept="13iPFW" id="3gdl6si72e5" role="2Oq$k0" />
                 <node concept="3TrcHB" id="3gdl6si72ez" role="2OqNvi">
@@ -473,7 +473,7 @@
                 <ref role="3cqZAo" node="3gdl6si73N6" resolve="config" />
               </node>
               <node concept="3TrEf2" id="3gdl6si73NE" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
               </node>
             </node>
           </node>
@@ -482,8 +482,8 @@
           <node concept="37vLTI" id="4EC9auLEL5B" role="3clFbG">
             <node concept="3cpWs3" id="4EC9auLEL5Z" role="37vLTx">
               <node concept="2YIFZM" id="4EC9auLELuR" role="3uHU7w">
-                <ref role="1Pybhc" to="e2lb:~String" resolve="String" />
-                <ref role="37wK5l" to="e2lb:~String.valueOf(int):java.lang.String" resolve="valueOf" />
+                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
                 <node concept="2OqwBi" id="4EC9auLELvf" role="37wK5m">
                   <node concept="37vLTw" id="2GeljgL485Q" role="2Oq$k0">
                     <ref role="3cqZAo" node="3gdl6si73N3" resolve="pin" />
@@ -555,7 +555,7 @@
                 <ref role="3cqZAo" node="1qwvy7xHbQ1" resolve="config" />
               </node>
               <node concept="3TrEf2" id="1qwvy7xHbQK" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:1qwvy7xGC75" />
+                <ref role="3Tt5mk" to="koo2:1qwvy7xGC75" resolve="analogPin" />
               </node>
             </node>
           </node>
@@ -564,8 +564,8 @@
           <node concept="37vLTI" id="1qwvy7xHbRB" role="3clFbG">
             <node concept="3cpWs3" id="1qwvy7xHbRZ" role="37vLTx">
               <node concept="2YIFZM" id="1qwvy7xHbS4" role="3uHU7w">
-                <ref role="1Pybhc" to="e2lb:~String" resolve="String" />
-                <ref role="37wK5l" to="e2lb:~String.valueOf(int):java.lang.String" resolve="valueOf" />
+                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
                 <node concept="2OqwBi" id="1qwvy7xHbSs" role="37wK5m">
                   <node concept="37vLTw" id="2GeljgL485G" role="2Oq$k0">
                     <ref role="3cqZAo" node="1qwvy7xHbPX" resolve="pin" />
@@ -611,7 +611,7 @@
                 <node concept="2OqwBi" id="3gdl6si74oV" role="2Oq$k0">
                   <node concept="13iPFW" id="3gdl6si74os" role="2Oq$k0" />
                   <node concept="3Tsc0h" id="3gdl6si74p1" role="2OqNvi">
-                    <ref role="3TtcxE" to="koo2:3gdl6si6LyV" />
+                    <ref role="3TtcxE" to="koo2:3gdl6si6LyV" resolve="digitalConfig" />
                   </node>
                 </node>
                 <node concept="TSZUe" id="3gdl6si74pV" role="2OqNvi">
@@ -647,17 +647,17 @@
                       <node concept="1uHKPH" id="4EC9auLEKI8" role="2OqNvi" />
                     </node>
                     <node concept="3TrEf2" id="4EC9auLEKI$" role="2OqNvi">
-                      <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                      <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                     </node>
                   </node>
                 </node>
               </node>
               <node concept="3TrEf2" id="3gdl6si73JM" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" />
+                <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
               </node>
             </node>
             <node concept="3Tsc0h" id="3gdl6si73Ke" role="2OqNvi">
-              <ref role="3TtcxE" to="koo2:4JsbL6NpKIN" />
+              <ref role="3TtcxE" to="koo2:4JsbL6NpKIN" resolve="digitalPins" />
             </node>
           </node>
         </node>
@@ -671,7 +671,7 @@
                 <node concept="2OqwBi" id="1qwvy7xHbPu" role="2Oq$k0">
                   <node concept="13iPFW" id="1qwvy7xHbPv" role="2Oq$k0" />
                   <node concept="3Tsc0h" id="1qwvy7xHbSL" role="2OqNvi">
-                    <ref role="3TtcxE" to="koo2:1qwvy7xGKCQ" />
+                    <ref role="3TtcxE" to="koo2:1qwvy7xGKCQ" resolve="analogPinConfiguration" />
                   </node>
                 </node>
                 <node concept="TSZUe" id="1qwvy7xHbPx" role="2OqNvi">
@@ -707,17 +707,17 @@
                       <node concept="1uHKPH" id="1qwvy7xHbPL" role="2OqNvi" />
                     </node>
                     <node concept="3TrEf2" id="1qwvy7xHbPM" role="2OqNvi">
-                      <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                      <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                     </node>
                   </node>
                 </node>
               </node>
               <node concept="3TrEf2" id="1qwvy7xHbPN" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" />
+                <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
               </node>
             </node>
             <node concept="3Tsc0h" id="1qwvy7xHbPR" role="2OqNvi">
-              <ref role="3TtcxE" to="koo2:3gdl6si6AgN" />
+              <ref role="3TtcxE" to="koo2:3gdl6si6AgN" resolve="analogPins" />
             </node>
           </node>
         </node>
@@ -751,7 +751,7 @@
             <node concept="2OqwBi" id="4tlTGsRcZf1" role="2Oq$k0">
               <node concept="13iPFW" id="4tlTGsRcZeG" role="2Oq$k0" />
               <node concept="3TrEf2" id="4tlTGsRcZf7" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" />
+                <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" resolve="pinConfig" />
               </node>
             </node>
             <node concept="2qgKlT" id="4tlTGsRcZh7" role="2OqNvi">
@@ -779,7 +779,7 @@
               </node>
             </node>
             <node concept="liA8E" id="26IgR5b9E9P" role="2OqNvi">
-              <ref role="37wK5l" to="e2lb:~String.equals(java.lang.Object):boolean" resolve="equals" />
+              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
               <node concept="Xl_RD" id="26IgR5b9E9Q" role="37wK5m">
                 <property role="Xl_RC" value="output" />
               </node>
@@ -896,11 +896,11 @@
               <node concept="2OqwBi" id="5cS3I48Zbai" role="2Oq$k0">
                 <node concept="13iPFW" id="5cS3I48Zb9X" role="2Oq$k0" />
                 <node concept="3TrEf2" id="5cS3I48Zbao" role="2OqNvi">
-                  <ref role="3Tt5mk" to="koo2:cDLCOYiq1v" />
+                  <ref role="3Tt5mk" to="koo2:cDLCOYiq1v" resolve="reg" />
                 </node>
               </node>
               <node concept="3TrEf2" id="5cS3I48Zetq" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
               </node>
             </node>
             <node concept="2qgKlT" id="5cS3I48ZetP" role="2OqNvi">
@@ -910,7 +910,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="5cS3I48Zb9R" role="3clF45">
-        <ref role="3uigEE" to="e2lb:~Object" resolve="Object" />
+        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
     </node>
     <node concept="13i0hz" id="60mYxM6xXIv" role="13h7CS">
@@ -999,8 +999,8 @@
         <node concept="3clFbF" id="66BDmZRcTGl" role="3cqZAp">
           <node concept="3cpWs3" id="66BDmZRcU0x" role="3clFbG">
             <node concept="2YIFZM" id="66BDmZRcVCL" role="3uHU7w">
-              <ref role="1Pybhc" to="e2lb:~String" resolve="String" />
-              <ref role="37wK5l" to="e2lb:~String.valueOf(int):java.lang.String" resolve="valueOf" />
+              <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+              <ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
               <node concept="2OqwBi" id="66BDmZRcWqK" role="37wK5m">
                 <node concept="13iPFW" id="66BDmZRcVJB" role="2Oq$k0" />
                 <node concept="3TrcHB" id="66BDmZRcZCo" role="2OqNvi">
@@ -1051,7 +1051,7 @@
             <node concept="2OqwBi" id="7fU3Y2ekayY" role="2Oq$k0">
               <node concept="13iPFW" id="7fU3Y2ekapC" role="2Oq$k0" />
               <node concept="3TrEf2" id="7fU3Y2ekcSF" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" />
+                <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
               </node>
             </node>
             <node concept="3TrcHB" id="7fU3Y2ekf1v" role="2OqNvi">
@@ -1085,7 +1085,7 @@
             <node concept="2OqwBi" id="3dH4Jophl8Y" role="2Oq$k0">
               <node concept="13iPFW" id="3dH4JophkJ6" role="2Oq$k0" />
               <node concept="3TrEf2" id="3dH4JophuTJ" role="2OqNvi">
-                <ref role="3Tt5mk" to="mj1l:hEaDaGor64" />
+                <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
               </node>
             </node>
             <node concept="2oxUTD" id="3dH4Joph_TX" role="2OqNvi">
@@ -1104,7 +1104,7 @@
             <node concept="2OqwBi" id="3dH4JopgA_i" role="2Oq$k0">
               <node concept="13iPFW" id="3dH4JopgAiP" role="2Oq$k0" />
               <node concept="3TrEf2" id="3dH4JopgF7k" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:3dH4JopctrO" />
+                <ref role="3Tt5mk" to="koo2:3dH4JopctrO" resolve="body" />
               </node>
             </node>
             <node concept="zfrQC" id="3dH4JopgW2Z" role="2OqNvi" />
@@ -1116,11 +1116,11 @@
               <node concept="2OqwBi" id="3dH4JopgXfm" role="2Oq$k0">
                 <node concept="13iPFW" id="3dH4JopgWTc" role="2Oq$k0" />
                 <node concept="3TrEf2" id="3dH4JopgZw$" role="2OqNvi">
-                  <ref role="3Tt5mk" to="koo2:3dH4JopctrO" />
+                  <ref role="3Tt5mk" to="koo2:3dH4JopctrO" resolve="body" />
                 </node>
               </node>
               <node concept="3Tsc0h" id="3dH4Joph3wv" role="2OqNvi">
-                <ref role="3TtcxE" to="c4fa:3CmSUB7Fp_m" />
+                <ref role="3TtcxE" to="c4fa:3CmSUB7Fp_m" resolve="statements" />
               </node>
             </node>
             <node concept="WFELt" id="3dH4JophjY3" role="2OqNvi" />
@@ -1139,7 +1139,7 @@
           <node concept="2OqwBi" id="3dH4JopgxGP" role="3clFbG">
             <node concept="13iPFW" id="3dH4Jopgxn8" role="2Oq$k0" />
             <node concept="3TrEf2" id="3dH4JopgAeR" role="2OqNvi">
-              <ref role="3Tt5mk" to="koo2:3dH4JopctrO" />
+              <ref role="3Tt5mk" to="koo2:3dH4JopctrO" resolve="body" />
             </node>
           </node>
         </node>
@@ -1171,7 +1171,7 @@
             <node concept="2OqwBi" id="3dH4JoplEST" role="2Oq$k0">
               <node concept="13iPFW" id="3dH4JoplESU" role="2Oq$k0" />
               <node concept="3TrEf2" id="3dH4JoplESV" role="2OqNvi">
-                <ref role="3Tt5mk" to="mj1l:hEaDaGor64" />
+                <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
               </node>
             </node>
             <node concept="2oxUTD" id="3dH4JoplESW" role="2OqNvi">
@@ -1190,7 +1190,7 @@
             <node concept="2OqwBi" id="3dH4JoplET2" role="2Oq$k0">
               <node concept="13iPFW" id="3dH4JoplET3" role="2Oq$k0" />
               <node concept="3TrEf2" id="3dH4JoplItv" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:3dH4Jopl$nI" />
+                <ref role="3Tt5mk" to="koo2:3dH4Jopl$nI" resolve="body" />
               </node>
             </node>
             <node concept="zfrQC" id="3dH4JoplET5" role="2OqNvi" />
@@ -1202,11 +1202,11 @@
               <node concept="2OqwBi" id="3dH4JoplET9" role="2Oq$k0">
                 <node concept="13iPFW" id="3dH4JoplETa" role="2Oq$k0" />
                 <node concept="3TrEf2" id="3dH4JoplKVo" role="2OqNvi">
-                  <ref role="3Tt5mk" to="koo2:3dH4Jopl$nI" />
+                  <ref role="3Tt5mk" to="koo2:3dH4Jopl$nI" resolve="body" />
                 </node>
               </node>
               <node concept="3Tsc0h" id="3dH4JoplETc" role="2OqNvi">
-                <ref role="3TtcxE" to="c4fa:3CmSUB7Fp_m" />
+                <ref role="3TtcxE" to="c4fa:3CmSUB7Fp_m" resolve="statements" />
               </node>
             </node>
             <node concept="WFELt" id="3dH4JoplETd" role="2OqNvi" />
@@ -1240,7 +1240,7 @@
           <node concept="2OqwBi" id="3dH4Jopl$Yx" role="3clFbG">
             <node concept="13iPFW" id="3dH4Jopl$BI" role="2Oq$k0" />
             <node concept="3TrEf2" id="3dH4JoplDJl" role="2OqNvi">
-              <ref role="3Tt5mk" to="koo2:3dH4Jopl$nI" />
+              <ref role="3Tt5mk" to="koo2:3dH4Jopl$nI" resolve="body" />
             </node>
           </node>
         </node>
@@ -1547,7 +1547,7 @@
             <node concept="2OqwBi" id="1Jb2EknOeFC" role="37vLTJ">
               <node concept="13iPFW" id="1Jb2EknOeu9" role="2Oq$k0" />
               <node concept="3TrEf2" id="1Jb2EknOja6" role="2OqNvi">
-                <ref role="3Tt5mk" to="mj1l:hEaDaGor64" />
+                <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
               </node>
             </node>
           </node>
@@ -1565,7 +1565,7 @@
           <node concept="2OqwBi" id="1Jb2EknJgd3" role="3clFbG">
             <node concept="13iPFW" id="1Jb2EknJfWi" role="2Oq$k0" />
             <node concept="3TrEf2" id="1Jb2EknJist" role="2OqNvi">
-              <ref role="3Tt5mk" to="koo2:1Jb2EknHMaW" />
+              <ref role="3Tt5mk" to="koo2:1Jb2EknHMaW" resolve="body" />
             </node>
           </node>
         </node>
diff --git a/languages/mbeddr.arduino.core/languageModels/structure.mps b/languages/mbeddr.arduino.core/languageModels/structure.mps
old mode 100644
new mode 100755
index 2dfa8ce..0d1e0fe
--- a/languages/mbeddr.arduino.core/languageModels/structure.mps
+++ b/languages/mbeddr.arduino.core/languageModels/structure.mps
@@ -37,10 +37,10 @@
         <child id="7588428831947959310" name="attributed" index="EQaZv" />
       </concept>
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
+        <property id="6714410169261853888" name="conceptId" index="EcuMT" />
         <property id="4628067390765907488" name="conceptShortDescription" index="R4oN_" />
         <property id="4628067390765956802" name="abstract" index="R5$K7" />
         <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
-        <property id="1587916991969465369" name="conceptId" index="1pbfSe" />
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
         <child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
       </concept>
@@ -56,12 +56,14 @@
         <child id="1169129564478" name="implements" index="PzmwI" />
       </concept>
       <concept id="1071489288299" name="jetbrains.mps.lang.structure.structure.PropertyDeclaration" flags="ig" index="1TJgyi">
+        <property id="241647608299431129" name="propertyId" index="IQ2nx" />
         <reference id="1082985295845" name="dataType" index="AX2Wp" />
       </concept>
       <concept id="1071489288298" name="jetbrains.mps.lang.structure.structure.LinkDeclaration" flags="ig" index="1TJgyj">
         <property id="1071599776563" name="role" index="20kJfa" />
         <property id="1071599893252" name="sourceCardinality" index="20lbJX" />
         <property id="1071599937831" name="metaClass" index="20lmBu" />
+        <property id="241647608299431140" name="linkId" index="IQ2ns" />
         <reference id="1071599976176" name="target" index="20lvS9" />
       </concept>
     </language>
@@ -79,24 +81,28 @@
     <property role="TrG5h" value="ArduinoPlatform" />
     <property role="3GE5qa" value="platform" />
     <property role="34LRSv" value="arduino" />
-    <property role="1pbfSe" value="988530998" />
+    <property role="EcuMT" value="2350648883898812438" />
     <ref role="1TJDcQ" to="51wr:4BxItZJ4BoF" resolve="Platform" />
     <node concept="1TJgyj" id="4JsbL6NpX5B" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="description" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="5466295800791814503" />
       <ref role="20lvS9" node="4JsbL6NpngK" resolve="ArduinoDescription" />
     </node>
     <node concept="1TJgyi" id="22vbFi$uihO" role="1TKVEl">
       <property role="TrG5h" value="compilerOptions" />
+      <property role="IQ2nx" value="2350648883899081844" />
       <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
     </node>
     <node concept="1TJgyi" id="55_53lUxdKT" role="1TKVEl">
       <property role="TrG5h" value="libPath" />
+      <property role="IQ2nx" value="5865116309641288761" />
       <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
     </node>
     <node concept="1TJgyi" id="6JYjBlsLOqI" role="1TKVEl">
       <property role="TrG5h" value="serialPort" />
+      <property role="IQ2nx" value="7781743472117499566" />
       <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
     </node>
     <node concept="PrWs8" id="22vbFi$tHdA" role="PzmwI">
@@ -109,84 +115,96 @@
   <node concept="PlHQZ" id="22vbFi$tHds">
     <property role="TrG5h" value="IMcuAwareComponent" />
     <property role="3GE5qa" value="platform" />
-    <property role="1pbfSe" value="988413424" />
+    <property role="EcuMT" value="2350648883898930012" />
   </node>
   <node concept="PlHQZ" id="22vbFi$tHdB">
     <property role="TrG5h" value="ICpuSpeedAwareComponent" />
     <property role="3GE5qa" value="platform" />
-    <property role="1pbfSe" value="988413413" />
+    <property role="EcuMT" value="2350648883898930023" />
   </node>
   <node concept="1TIwiD" id="4JsbL6NpngK">
     <property role="TrG5h" value="ArduinoDescription" />
     <property role="19KtqR" value="true" />
-    <property role="1pbfSe" value="12475583" />
+    <property role="EcuMT" value="5466295800791659568" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="5cS3I48Zmhd" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="sReg" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="5996559263525069901" />
       <ref role="20lvS9" node="4JsbL6NpngT" resolve="Register" />
     </node>
     <node concept="1TJgyj" id="5cS3I48Zmhe" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="ADMUX" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="5996559263525069902" />
       <ref role="20lvS9" node="4JsbL6NpngT" resolve="Register" />
     </node>
     <node concept="1TJgyj" id="5cS3I48Zmhf" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="ADCSRA" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="5996559263525069903" />
       <ref role="20lvS9" node="4JsbL6NpngT" resolve="Register" />
     </node>
     <node concept="1TJgyj" id="5cS3I48Zmhg" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="ADCL" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="5996559263525069904" />
       <ref role="20lvS9" node="4JsbL6NpngT" resolve="Register" />
     </node>
     <node concept="1TJgyj" id="5cS3I48Zmhi" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="ADCH" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="5996559263525069906" />
       <ref role="20lvS9" node="4JsbL6NpngT" resolve="Register" />
     </node>
     <node concept="1TJgyi" id="4JsbL6Nq0mZ" role="1TKVEl">
       <property role="TrG5h" value="mcu" />
+      <property role="IQ2nx" value="5466295800791827903" />
       <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
     </node>
     <node concept="1TJgyi" id="4JsbL6Nq0n0" role="1TKVEl">
       <property role="TrG5h" value="cpuSpeed" />
+      <property role="IQ2nx" value="5466295800791827904" />
       <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
     </node>
     <node concept="1TJgyj" id="4JsbL6NpKIN" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="digitalPins" />
       <property role="20lbJX" value="0..n" />
+      <property role="IQ2ns" value="5466295800791763891" />
       <ref role="20lvS9" node="4JsbL6NpngL" resolve="DigitalPin" />
     </node>
     <node concept="1TJgyj" id="3gdl6si6AgN" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="analogPins" />
       <property role="20lbJX" value="0..n" />
+      <property role="IQ2ns" value="3750746866331575347" />
       <ref role="20lvS9" node="4JsbL6NpTFx" resolve="AnalogPin" />
     </node>
     <node concept="1TJgyj" id="5TY7OGK$Adi" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="registers" />
       <property role="20lbJX" value="0..n" />
+      <property role="IQ2ns" value="6808914094428676946" />
       <ref role="20lvS9" node="4JsbL6NpngT" resolve="Register" />
     </node>
     <node concept="1TJgyj" id="5TY7OGKAIiS" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="interrupts" />
       <property role="20lbJX" value="0..n" />
+      <property role="IQ2ns" value="6808914094429234360" />
       <ref role="20lvS9" node="1ZYgP9n4r$2" resolve="Interrupt" />
     </node>
     <node concept="1TJgyj" id="1ZYgP9n4Cc$" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="serialPorts" />
       <property role="20lbJX" value="0..n" />
+      <property role="IQ2ns" value="2305354080187482916" />
       <ref role="20lvS9" node="3gQUTJ3y88i" resolve="SerialPort" />
     </node>
     <node concept="PrWs8" id="4JsbL6NpKIO" role="PzmwI">
@@ -202,36 +220,42 @@
   <node concept="1TIwiD" id="4JsbL6NpngL">
     <property role="TrG5h" value="DigitalPin" />
     <property role="3GE5qa" value="pin" />
-    <property role="1pbfSe" value="12475582" />
+    <property role="EcuMT" value="5466295800791659569" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="4JsbL6NpKGV" role="1TKVEl">
       <property role="TrG5h" value="bit" />
+      <property role="IQ2nx" value="5466295800791763771" />
       <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
     </node>
     <node concept="1TJgyi" id="4JsbL6NpKIo" role="1TKVEl">
       <property role="TrG5h" value="configBit" />
+      <property role="IQ2nx" value="5466295800791763864" />
       <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
     </node>
     <node concept="1TJgyi" id="4JsbL6NpKGW" role="1TKVEl">
       <property role="TrG5h" value="canBePWM" />
+      <property role="IQ2nx" value="5466295800791763772" />
       <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
     </node>
     <node concept="1TJgyj" id="4JsbL6NpKGU" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="inputReg" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="5466295800791763770" />
       <ref role="20lvS9" node="4JsbL6NpGeD" resolve="ByteRegister" />
     </node>
     <node concept="1TJgyj" id="4JsbL6NpKGY" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="dataDirectionReg" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="5466295800791763774" />
       <ref role="20lvS9" node="4JsbL6NpGeD" resolve="ByteRegister" />
     </node>
     <node concept="1TJgyj" id="2mpt1xbR9gV" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="outputReg" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="2709324298540848187" />
       <ref role="20lvS9" node="4JsbL6NpGeD" resolve="ByteRegister" />
     </node>
     <node concept="PrWs8" id="4JsbL6NpngS" role="PzmwI">
@@ -241,17 +265,20 @@
   <node concept="PlHQZ" id="4JsbL6NpngN">
     <property role="TrG5h" value="IPin" />
     <property role="3GE5qa" value="pin" />
-    <property role="1pbfSe" value="12475580" />
+    <property role="EcuMT" value="5466295800791659571" />
     <node concept="1TJgyi" id="4JsbL6NpngO" role="1TKVEl">
       <property role="TrG5h" value="canBeInput" />
+      <property role="IQ2nx" value="5466295800791659572" />
       <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
     </node>
     <node concept="1TJgyi" id="4JsbL6NpngP" role="1TKVEl">
       <property role="TrG5h" value="canBeOutput" />
+      <property role="IQ2nx" value="5466295800791659573" />
       <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
     </node>
     <node concept="1TJgyi" id="4JsbL6NpKH4" role="1TKVEl">
       <property role="TrG5h" value="number" />
+      <property role="IQ2nx" value="5466295800791763780" />
       <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
     </node>
   </node>
@@ -259,12 +286,13 @@
     <property role="TrG5h" value="Register" />
     <property role="3GE5qa" value="register" />
     <property role="R5$K7" value="true" />
-    <property role="1pbfSe" value="12475574" />
+    <property role="EcuMT" value="5466295800791659577" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="5cS3I48YO7u" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="address" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="5996559263524930014" />
       <ref role="20lvS9" to="mj1l:7FQByU3CrCM" resolve="Expression" />
     </node>
     <node concept="PrWs8" id="4JsbL6NpKkx" role="PzmwI">
@@ -276,20 +304,22 @@
     <property role="3GE5qa" value="register" />
     <property role="R4oN_" value="a byte register" />
     <property role="34LRSv" value="register8" />
-    <property role="1pbfSe" value="12389702" />
+    <property role="EcuMT" value="5466295800791745449" />
     <ref role="1TJDcQ" node="4JsbL6NpngT" resolve="Register" />
   </node>
   <node concept="1TIwiD" id="4JsbL6NpTFx">
     <property role="TrG5h" value="AnalogPin" />
     <property role="3GE5qa" value="pin" />
-    <property role="1pbfSe" value="12334606" />
+    <property role="EcuMT" value="5466295800791800545" />
     <ref role="1TJDcQ" to="mj1l:7FQByU3CrCQ" resolve="Type" />
     <node concept="1TJgyi" id="4JsbL6NpTF_" role="1TKVEl">
       <property role="TrG5h" value="muxSelector" />
+      <property role="IQ2nx" value="5466295800791800549" />
       <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
     </node>
     <node concept="1TJgyi" id="4JsbL6NpTFA" role="1TKVEl">
       <property role="TrG5h" value="resolution" />
+      <property role="IQ2nx" value="5466295800791800550" />
       <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
     </node>
     <node concept="PrWs8" id="4JsbL6NpTFy" role="PzmwI">
@@ -299,18 +329,20 @@
   <node concept="1TIwiD" id="3gdl6si6JD4">
     <property role="3GE5qa" value="platform" />
     <property role="TrG5h" value="ArduinoConfiguration" />
-    <property role="1pbfSe" value="1177046699" />
+    <property role="EcuMT" value="3750746866331613764" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="3gdl6si6LyV" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="digitalConfig" />
       <property role="20lbJX" value="0..n" />
+      <property role="IQ2ns" value="3750746866331621563" />
       <ref role="20lvS9" node="3gdl6si6JD6" resolve="DigitalPinConfiguration" />
     </node>
     <node concept="1TJgyj" id="1qwvy7xGKCQ" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="analogPinConfiguration" />
       <property role="20lbJX" value="0..n" />
+      <property role="IQ2ns" value="1630441749093747254" />
       <ref role="20lvS9" node="1qwvy7xGC73" resolve="AnalogPinConfiguration" />
     </node>
     <node concept="PrWs8" id="3gdl6si6JD5" role="PzmwI">
@@ -320,16 +352,18 @@
   <node concept="1TIwiD" id="3gdl6si6JD6">
     <property role="3GE5qa" value="platform" />
     <property role="TrG5h" value="DigitalPinConfiguration" />
-    <property role="1pbfSe" value="1177046701" />
+    <property role="EcuMT" value="3750746866331613766" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="3gdl6si6JDf" role="1TKVEl">
       <property role="TrG5h" value="configuration" />
+      <property role="IQ2nx" value="3750746866331613775" />
       <ref role="AX2Wp" node="3gdl6si6JD9" resolve="PinConfiguration" />
     </node>
     <node concept="1TJgyj" id="3gdl6si6JD8" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="pin" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="3750746866331613768" />
       <ref role="20lvS9" node="4JsbL6NpngL" resolve="DigitalPin" />
     </node>
     <node concept="PrWs8" id="3gdl6si6JD7" role="PzmwI">
@@ -360,7 +394,7 @@
   <node concept="1TIwiD" id="4EC9auLEQrA">
     <property role="3GE5qa" value="pin" />
     <property role="TrG5h" value="InitializePinsAnnotation" />
-    <property role="1pbfSe" value="61633651" />
+    <property role="EcuMT" value="5379590057552996070" />
     <ref role="1TJDcQ" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
     <node concept="M6xJ_" id="6qOINfCPivy" role="lGtFl">
       <property role="Hh88m" value="pinInit" />
@@ -372,7 +406,7 @@
   <node concept="1TIwiD" id="4EC9auLFa7I">
     <property role="3GE5qa" value="pin" />
     <property role="TrG5h" value="DigitalPinType" />
-    <property role="1pbfSe" value="61553003" />
+    <property role="EcuMT" value="5379590057553076718" />
     <ref role="1TJDcQ" to="mj1l:7FQByU3CrCQ" resolve="Type" />
     <node concept="PrWs8" id="4EC9auLFa7J" role="PzmwI">
       <ref role="PrY4T" to="vs0r:65XyadYMMYC" resolve="ICommentable" />
@@ -382,18 +416,19 @@
     <property role="3GE5qa" value="pin" />
     <property role="TrG5h" value="DigitalValueLiteral" />
     <property role="R5$K7" value="true" />
-    <property role="1pbfSe" value="61553001" />
+    <property role="EcuMT" value="5379590057553076720" />
     <ref role="1TJDcQ" to="mj1l:7FQByU3CrDq" resolve="Literal" />
   </node>
   <node concept="1TIwiD" id="4EC9auLFa7N">
     <property role="3GE5qa" value="pin" />
     <property role="TrG5h" value="DigitalPinRefExpression" />
-    <property role="1pbfSe" value="61552998" />
+    <property role="EcuMT" value="5379590057553076723" />
     <ref role="1TJDcQ" to="mj1l:7FQByU3CrCM" resolve="Expression" />
     <node concept="1TJgyj" id="4EC9auLFa7O" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="pinConfig" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="5379590057553076724" />
       <ref role="20lvS9" node="3gdl6si6JD6" resolve="DigitalPinConfiguration" />
     </node>
   </node>
@@ -401,25 +436,26 @@
     <property role="3GE5qa" value="pin" />
     <property role="TrG5h" value="HighLiteral" />
     <property role="34LRSv" value="high" />
-    <property role="1pbfSe" value="2122968864" />
+    <property role="EcuMT" value="5140268293012326489" />
     <ref role="1TJDcQ" node="4EC9auLFa7K" resolve="DigitalValueLiteral" />
   </node>
   <node concept="1TIwiD" id="4tlTGsRdcXl">
     <property role="3GE5qa" value="pin" />
     <property role="TrG5h" value="LowLiteral" />
     <property role="34LRSv" value="low" />
-    <property role="1pbfSe" value="2123019804" />
+    <property role="EcuMT" value="5140268293012377429" />
     <ref role="1TJDcQ" node="4EC9auLFa7K" resolve="DigitalValueLiteral" />
   </node>
   <node concept="1TIwiD" id="cDLCOYiq1u">
     <property role="3GE5qa" value="register" />
     <property role="TrG5h" value="RegisterRefExpression" />
-    <property role="1pbfSe" value="1098082027" />
+    <property role="EcuMT" value="227931566096621662" />
     <ref role="1TJDcQ" to="mj1l:7FQByU3CrCM" resolve="Expression" />
     <node concept="1TJgyj" id="cDLCOYiq1v" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="reg" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="227931566096621663" />
       <ref role="20lvS9" node="4JsbL6NpngT" resolve="Register" />
     </node>
     <node concept="PrWs8" id="60mYxM6zCKq" role="PzmwI">
@@ -429,19 +465,20 @@
   <node concept="1TIwiD" id="26IgR5b9LNZ">
     <property role="TrG5h" value="DelayExpression" />
     <property role="34LRSv" value="delay" />
-    <property role="1pbfSe" value="1825923184" />
+    <property role="EcuMT" value="2426951403070495999" />
     <ref role="1TJDcQ" to="mj1l:7FQByU3CrCM" resolve="Expression" />
     <node concept="1TJgyj" id="26IgR5b9RPe" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="expression" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="2426951403070520654" />
       <ref role="20lvS9" to="mj1l:7FQByU3CrCM" resolve="Expression" />
     </node>
   </node>
   <node concept="1TIwiD" id="1pOg3uxo38n">
     <property role="TrG5h" value="AtomicExpression" />
     <property role="34LRSv" value="atomic" />
-    <property role="1pbfSe" value="1210813874" />
+    <property role="EcuMT" value="1617988773807665687" />
     <ref role="1TJDcQ" to="c4fa:3CmSUB7FmO3" resolve="Statement" />
     <node concept="PrWs8" id="zSFqGmbfWz" role="PzmwI">
       <ref role="PrY4T" to="c4fa:1OcdQnySJNS" resolve="ILocalVarScopeProvider" />
@@ -450,30 +487,33 @@
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="body" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="1617988773807665767" />
       <ref role="20lvS9" to="c4fa:3CmSUB7Fp_l" resolve="StatementList" />
     </node>
   </node>
   <node concept="1TIwiD" id="1qwvy7xGC6o">
     <property role="3GE5qa" value="pin" />
     <property role="TrG5h" value="AnalogPinRefExpression" />
-    <property role="1pbfSe" value="128778311" />
+    <property role="EcuMT" value="1630441749093712280" />
     <ref role="1TJDcQ" to="mj1l:7FQByU3CrCM" resolve="Expression" />
     <node concept="1TJgyj" id="1qwvy7xGC6t" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="pin" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="1630441749093712285" />
       <ref role="20lvS9" node="1qwvy7xGC73" resolve="AnalogPinConfiguration" />
     </node>
   </node>
   <node concept="1TIwiD" id="1qwvy7xGC73">
     <property role="3GE5qa" value="platform" />
     <property role="TrG5h" value="AnalogPinConfiguration" />
-    <property role="1pbfSe" value="128778268" />
+    <property role="EcuMT" value="1630441749093712323" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="1qwvy7xGC75" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="analogPin" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="1630441749093712325" />
       <ref role="20lvS9" node="4JsbL6NpTFx" resolve="AnalogPin" />
     </node>
     <node concept="PrWs8" id="1qwvy7xGC74" role="PzmwI">
@@ -484,19 +524,20 @@
     <property role="TrG5h" value="ArduinoExecutale" />
     <property role="R4oN_" value="an arduino executable binary" />
     <property role="34LRSv" value="arduino executalbe" />
-    <property role="1pbfSe" value="1451612430" />
+    <property role="EcuMT" value="1885912986662341396" />
     <ref role="1TJDcQ" to="51wr:4o9sgv8QoKi" resolve="Executable" />
   </node>
   <node concept="1TIwiD" id="5QG4IuautVs">
     <property role="TrG5h" value="SerialReportingStrategy" />
     <property role="R4oN_" value="reporting via UART" />
     <property role="34LRSv" value="serial" />
-    <property role="1pbfSe" value="400166461" />
+    <property role="EcuMT" value="6749790727191518940" />
     <ref role="1TJDcQ" to="k146:3R$6B6bKEUa" resolve="ReportingStrategy" />
     <node concept="1TJgyj" id="7fU3Y2eiWVo" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="serialConfig" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="8357009515673800408" />
       <ref role="20lvS9" node="3gQUTJ3xQ1A" resolve="SerialConfiguration" />
     </node>
   </node>
@@ -517,28 +558,33 @@
     <property role="TrG5h" value="SerialConfiguration" />
     <property role="34LRSv" value="serial" />
     <property role="R4oN_" value="UART setup" />
-    <property role="1pbfSe" value="138523647" />
+    <property role="EcuMT" value="3762453592947515494" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="3gQUTJ3y9pO" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="port" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="3762453592947594868" />
       <ref role="20lvS9" node="3gQUTJ3y88i" resolve="SerialPort" />
     </node>
     <node concept="1TJgyi" id="3WnQADV6jCp" role="1TKVEl">
       <property role="TrG5h" value="baud" />
+      <property role="IQ2nx" value="4546342499720444441" />
       <ref role="AX2Wp" node="3WnQADV6jaP" resolve="Baudrate" />
     </node>
     <node concept="1TJgyi" id="3WnQADV6jCu" role="1TKVEl">
       <property role="TrG5h" value="parity" />
+      <property role="IQ2nx" value="4546342499720444446" />
       <ref role="AX2Wp" node="3WnQADV6jz9" resolve="Parity" />
     </node>
     <node concept="1TJgyi" id="3WnQADV6jC_" role="1TKVEl">
       <property role="TrG5h" value="stopbits" />
+      <property role="IQ2nx" value="4546342499720444453" />
       <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
     </node>
     <node concept="1TJgyi" id="3WnQADV6jCI" role="1TKVEl">
       <property role="TrG5h" value="databits" />
+      <property role="IQ2nx" value="4546342499720444462" />
       <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
     </node>
     <node concept="PrWs8" id="7fU3Y2ebt_B" role="PzmwI">
@@ -550,42 +596,48 @@
     <property role="TrG5h" value="SerialPort" />
     <property role="34LRSv" value="serial port" />
     <property role="R4oN_" value="a serial port" />
-    <property role="1pbfSe" value="138449491" />
+    <property role="EcuMT" value="3762453592947589650" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="7fU3Y2ecVfa" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="UCSRA" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="8357009515672220618" />
       <ref role="20lvS9" node="4JsbL6NpngT" resolve="Register" />
     </node>
     <node concept="1TJgyj" id="7fU3Y2ecVh8" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="UCSRB" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="8357009515672220744" />
       <ref role="20lvS9" node="4JsbL6NpngT" resolve="Register" />
     </node>
     <node concept="1TJgyj" id="7fU3Y2ecVhe" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="UCSRC" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="8357009515672220750" />
       <ref role="20lvS9" node="4JsbL6NpngT" resolve="Register" />
     </node>
     <node concept="1TJgyj" id="7fU3Y2ecVjc" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="UDR" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="8357009515672220876" />
       <ref role="20lvS9" node="4JsbL6NpngT" resolve="Register" />
     </node>
     <node concept="1TJgyj" id="7fU3Y2ecVlc" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="UBRRH" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="8357009515672221004" />
       <ref role="20lvS9" node="4JsbL6NpngT" resolve="Register" />
     </node>
     <node concept="1TJgyj" id="7fU3Y2eemHw" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="UBRRL" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="8357009515672595296" />
       <ref role="20lvS9" node="4JsbL6NpngT" resolve="Register" />
     </node>
     <node concept="PrWs8" id="3gQUTJ3y88j" role="PzmwI">
@@ -673,12 +725,12 @@
     <property role="3GE5qa" value="register" />
     <property role="R4oN_" value="a word register" />
     <property role="34LRSv" value="register16" />
-    <property role="1pbfSe" value="426927465" />
+    <property role="EcuMT" value="6923996477550665851" />
     <ref role="1TJDcQ" node="4JsbL6NpngT" resolve="Register" />
   </node>
   <node concept="PlHQZ" id="4Mvxa96Acs8">
     <property role="TrG5h" value="IWriteTarget" />
-    <property role="1pbfSe" value="1825027158" />
+    <property role="EcuMT" value="5521277500683503368" />
     <node concept="PrWs8" id="4Mvxa96Af43" role="PrDN$">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
@@ -687,18 +739,20 @@
     <property role="TrG5h" value="WriteStatement" />
     <property role="34LRSv" value="write" />
     <property role="R4oN_" value="writes data to a given target" />
-    <property role="1pbfSe" value="1825026142" />
+    <property role="EcuMT" value="5521277500683504384" />
     <ref role="1TJDcQ" to="c4fa:3CmSUB7FmO3" resolve="Statement" />
     <node concept="1TJgyj" id="4Mvxa96AcG3" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="expression" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="5521277500683504387" />
       <ref role="20lvS9" to="mj1l:7FQByU3CrCM" resolve="Expression" />
     </node>
     <node concept="1TJgyj" id="4Mvxa96AcG1" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="target" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="5521277500683504385" />
       <ref role="20lvS9" node="4Mvxa96Acs8" resolve="IWriteTarget" />
     </node>
   </node>
@@ -706,7 +760,7 @@
     <property role="TrG5h" value="SetUpVoid" />
     <property role="34LRSv" value="setup" />
     <property role="R4oN_" value="setup function called before the mainloop is executed" />
-    <property role="1pbfSe" value="1285482730" />
+    <property role="EcuMT" value="3705638916589737460" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="3dH4JopctrM" role="PzmwI">
       <ref role="PrY4T" to="x27k:5_l8w1EmTdf" resolve="IModuleContent" />
@@ -724,6 +778,7 @@
       <property role="20lmBu" value="aggregation" />
       <property role="20lbJX" value="1" />
       <property role="20kJfa" value="body" />
+      <property role="IQ2ns" value="3705638916589737716" />
       <ref role="20lvS9" to="c4fa:3CmSUB7Fp_l" resolve="StatementList" />
     </node>
   </node>
@@ -731,12 +786,13 @@
     <property role="TrG5h" value="MainLoop" />
     <property role="34LRSv" value="mainLoop" />
     <property role="R4oN_" value="main loop that is called in an infinite loop" />
-    <property role="1pbfSe" value="1287865659" />
+    <property role="EcuMT" value="3705638916592120389" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="3dH4Jopl$nI" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="body" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="3705638916592125422" />
       <ref role="20lvS9" to="c4fa:3CmSUB7Fp_l" resolve="StatementList" />
     </node>
     <node concept="PrWs8" id="3dH4Joplzd9" role="PzmwI">
@@ -760,24 +816,26 @@
     <property role="R5$K7" value="true" />
     <property role="34LRSv" value="sleep mode" />
     <property role="3GE5qa" value="sleep" />
-    <property role="1pbfSe" value="49839446" />
+    <property role="EcuMT" value="7926183820225218342" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
   </node>
   <node concept="1TIwiD" id="6RZtz2kYjem">
     <property role="TrG5h" value="SleepStatement" />
     <property role="34LRSv" value="sleep" />
     <property role="3GE5qa" value="sleep" />
-    <property role="1pbfSe" value="49850822" />
+    <property role="EcuMT" value="7926183820225229718" />
     <ref role="1TJDcQ" to="c4fa:3CmSUB7FmO3" resolve="Statement" />
     <node concept="1TJgyj" id="6RZtz2kYjen" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="mode" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="7926183820225229719" />
       <ref role="20lvS9" node="6RZtz2kYgsA" resolve="SleepMode" />
     </node>
     <node concept="1TJgyj" id="6RZtz2l5VS8" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="condition" />
+      <property role="IQ2ns" value="7926183820227231240" />
       <ref role="20lvS9" to="mj1l:7FQByU3CrCM" resolve="Expression" />
     </node>
   </node>
@@ -785,52 +843,53 @@
     <property role="TrG5h" value="SleepModeIdle" />
     <property role="34LRSv" value="Idle Mode" />
     <property role="3GE5qa" value="sleep" />
-    <property role="1pbfSe" value="49855636" />
+    <property role="EcuMT" value="7926183820225234532" />
     <ref role="1TJDcQ" node="6RZtz2kYgsA" resolve="SleepMode" />
   </node>
   <node concept="1TIwiD" id="6RZtz2kYliE">
     <property role="3GE5qa" value="sleep" />
     <property role="TrG5h" value="SleepModeADC" />
     <property role="34LRSv" value="ADC Noise Reduction Mode" />
-    <property role="1pbfSe" value="49859290" />
+    <property role="EcuMT" value="7926183820225238186" />
     <ref role="1TJDcQ" node="6RZtz2kYgsA" resolve="SleepMode" />
   </node>
   <node concept="1TIwiD" id="6RZtz2kYl_y">
     <property role="3GE5qa" value="sleep" />
     <property role="TrG5h" value="SleepModePwrDown" />
     <property role="34LRSv" value="Power-Down Mode" />
-    <property role="1pbfSe" value="49860498" />
+    <property role="EcuMT" value="7926183820225239394" />
     <ref role="1TJDcQ" node="6RZtz2kYgsA" resolve="SleepMode" />
   </node>
   <node concept="1TIwiD" id="6RZtz2kYl_z">
     <property role="3GE5qa" value="sleep" />
     <property role="TrG5h" value="SleepModePwrSave" />
     <property role="34LRSv" value="Power-Save-Mode" />
-    <property role="1pbfSe" value="49860499" />
+    <property role="EcuMT" value="7926183820225239395" />
     <ref role="1TJDcQ" node="6RZtz2kYgsA" resolve="SleepMode" />
   </node>
   <node concept="1TIwiD" id="6RZtz2kYlEU">
     <property role="3GE5qa" value="sleep" />
     <property role="TrG5h" value="SleepModeStdBy" />
     <property role="34LRSv" value="Standby-Mode" />
-    <property role="1pbfSe" value="49860842" />
+    <property role="EcuMT" value="7926183820225239738" />
     <ref role="1TJDcQ" node="6RZtz2kYgsA" resolve="SleepMode" />
   </node>
   <node concept="1TIwiD" id="2$_w8oMMBHX">
     <property role="TrG5h" value="Time" />
     <property role="R5$K7" value="true" />
     <property role="3GE5qa" value="time" />
-    <property role="1pbfSe" value="1542454275" />
+    <property role="EcuMT" value="2964917243559443325" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="2$_w8oMMC12" role="1TKVEl">
       <property role="TrG5h" value="amount" />
+      <property role="IQ2nx" value="2964917243559444546" />
       <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
     </node>
   </node>
   <node concept="1TIwiD" id="2$_w8oMMCQf">
     <property role="3GE5qa" value="time" />
     <property role="TrG5h" value="TimeConfiguration" />
-    <property role="1pbfSe" value="1542458901" />
+    <property role="EcuMT" value="2964917243559447951" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2$_w8oMMCQ$" role="PzmwI">
       <ref role="PrY4T" to="vs0r:3R$6B6bKw0C" resolve="IConfigurationItem" />
@@ -839,64 +898,66 @@
   <node concept="PlHQZ" id="2$_w8oMMCRk">
     <property role="3GE5qa" value="time" />
     <property role="TrG5h" value="ITimeConfiguration" />
-    <property role="1pbfSe" value="1542458970" />
+    <property role="EcuMT" value="2964917243559448020" />
   </node>
   <node concept="1TIwiD" id="1Jb2EknEKI_">
     <property role="3GE5qa" value="time" />
     <property role="TrG5h" value="NanoSecond" />
     <property role="34LRSv" value="ns" />
-    <property role="1pbfSe" value="863376970" />
+    <property role="EcuMT" value="2002706163479284645" />
     <ref role="1TJDcQ" node="2$_w8oMMBHX" resolve="Time" />
   </node>
   <node concept="1TIwiD" id="1Jb2EknEY6Q">
     <property role="3GE5qa" value="time" />
     <property role="TrG5h" value="MicroSecond" />
     <property role="34LRSv" value="µs" />
-    <property role="1pbfSe" value="863431771" />
+    <property role="EcuMT" value="2002706163479339446" />
     <ref role="1TJDcQ" node="2$_w8oMMBHX" resolve="Time" />
   </node>
   <node concept="1TIwiD" id="1Jb2EknEYch">
     <property role="3GE5qa" value="time" />
     <property role="TrG5h" value="MilliSecond" />
     <property role="34LRSv" value="ms" />
-    <property role="1pbfSe" value="863432118" />
+    <property role="EcuMT" value="2002706163479339793" />
     <ref role="1TJDcQ" node="2$_w8oMMBHX" resolve="Time" />
   </node>
   <node concept="1TIwiD" id="1Jb2EknEYhI">
     <property role="3GE5qa" value="time" />
     <property role="TrG5h" value="Second" />
     <property role="34LRSv" value="s" />
-    <property role="1pbfSe" value="863432467" />
+    <property role="EcuMT" value="2002706163479340142" />
     <ref role="1TJDcQ" node="2$_w8oMMBHX" resolve="Time" />
   </node>
   <node concept="1TIwiD" id="1Jb2EknEYhJ">
     <property role="3GE5qa" value="time" />
     <property role="TrG5h" value="Minute" />
     <property role="34LRSv" value="m" />
-    <property role="1pbfSe" value="863432468" />
+    <property role="EcuMT" value="2002706163479340143" />
     <ref role="1TJDcQ" node="2$_w8oMMBHX" resolve="Time" />
   </node>
   <node concept="1TIwiD" id="1Jb2EknEYhK">
     <property role="3GE5qa" value="time" />
     <property role="TrG5h" value="Hour" />
     <property role="34LRSv" value="h" />
-    <property role="1pbfSe" value="863432469" />
+    <property role="EcuMT" value="2002706163479340144" />
     <ref role="1TJDcQ" node="2$_w8oMMBHX" resolve="Time" />
   </node>
   <node concept="1TIwiD" id="1Jb2EknHM2o">
     <property role="TrG5h" value="Task" />
     <property role="3GE5qa" value="scheduling" />
     <property role="34LRSv" value="task" />
-    <property role="1pbfSe" value="864168765" />
+    <property role="EcuMT" value="2002706163480076440" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="1Jb2EknJfAJ" role="1TKVEl">
       <property role="TrG5h" value="proi" />
+      <property role="IQ2nx" value="2002706163480459695" />
       <ref role="AX2Wp" node="1Jb2EknIUki" resolve="TaskPriority" />
     </node>
     <node concept="1TJgyj" id="1Jb2EknHMaW" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="body" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="2002706163480076988" />
       <ref role="20lvS9" to="c4fa:3CmSUB7Fp_l" resolve="StatementList" />
     </node>
     <node concept="PrWs8" id="1Jb2EknHM7l" role="PzmwI">
@@ -937,27 +998,30 @@
     <property role="TrG5h" value="ScheduleStatement" />
     <property role="34LRSv" value="schdule" />
     <property role="R4oN_" value="schedule a task" />
-    <property role="1pbfSe" value="866361413" />
+    <property role="EcuMT" value="2002706163482269088" />
     <ref role="1TJDcQ" to="c4fa:3CmSUB7FmO3" resolve="Statement" />
     <node concept="1TJgyj" id="1Jb2EknQ9mz" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="when" />
       <property role="20lbJX" value="0..1" />
+      <property role="IQ2ns" value="2002706163482269091" />
       <ref role="20lvS9" node="2$_w8oMMBHX" resolve="Time" />
     </node>
     <node concept="1TJgyj" id="1Jb2EknQ9mx" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="task" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="2002706163482269089" />
       <ref role="20lvS9" node="1Jb2EknHM2o" resolve="Task" />
     </node>
   </node>
   <node concept="1TIwiD" id="1ZYgP9n4r$2">
     <property role="TrG5h" value="Interrupt" />
-    <property role="1pbfSe" value="1997536340" />
+    <property role="EcuMT" value="2305354080187431170" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="1ZYgP9n4uno" role="1TKVEl">
       <property role="TrG5h" value="vector" />
+      <property role="IQ2nx" value="2305354080187442648" />
       <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
     </node>
     <node concept="PrWs8" id="1ZYgP9n4u24" role="PzmwI">
diff --git a/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl b/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl
old mode 100644
new mode 100755
index a899bba..b3563ec
--- a/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl
+++ b/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl
@@ -44,54 +44,54 @@
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
       </usedDevKits>
       <languageVersions>
-        <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="2" />
-        <language id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" fqName="com.mbeddr.core.buildconfig" version="0" />
-        <language id="b2da2e1a-b542-47f5-9be0-4dc21efe74a4" fqName="com.mbeddr.core.checks" version="0" />
-        <language id="390de4af-0c8d-4716-8dec-3d05ca751b28" fqName="com.mbeddr.core.cinterpreter" version="0" />
-        <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
-        <language id="ebb5e132-d298-4649-b320-b3f4d7f3acff" fqName="com.mbeddr.core.debug.blext" version="0" />
-        <language id="783af01f-87a7-412c-be99-293a162652b5" fqName="com.mbeddr.core.embedded" version="0" />
-        <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="2" />
-        <language id="ad5e9db1-9600-47c7-86ef-614165b281b8" fqName="com.mbeddr.core.legacy" version="0" />
-        <language id="f93d1dbe-bfd1-42dd-932a-f375fa6f5373" fqName="com.mbeddr.core.make" version="1" />
-        <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" fqName="com.mbeddr.core.modules" version="0" />
-        <language id="62296a07-bc38-46d2-8034-198c24063588" fqName="com.mbeddr.core.modules.gen" version="0" />
-        <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" fqName="com.mbeddr.core.pointers" version="0" />
-        <language id="a9d69647-0840-491e-bf39-2eb0805d2011" fqName="com.mbeddr.core.statements" version="1" />
-        <language id="efda956e-491e-4f00-ba14-36af2f213ecf" fqName="com.mbeddr.core.udt" version="1" />
-        <language id="06d68b77-b699-4918-83b8-857e63787800" fqName="com.mbeddr.core.unittest" version="1" />
-        <language id="2693fc71-9b0e-4b05-ab13-f57227d675f2" fqName="com.mbeddr.core.util" version="0" />
-        <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
-        <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
-        <language id="b67a6ca0-735e-4903-b238-4b525bddf96a" fqName="com.mbeddr.mpsutil.genutil" version="0" />
-        <language id="1c897ba5-9d43-4035-ac7f-0306495743ac" fqName="com.mbeddr.mpsutil.interpreter.test" version="0" />
-        <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />
-        <language id="92f195b6-a209-4804-ad65-f5248ecd5873" fqName="com.mbeddr.mpsutil.margincell" version="0" />
-        <language id="b4d28e19-7d2d-47e9-943e-3a41f97a0e52" fqName="com.mbeddr.mpsutil.plantuml.node" version="0" />
-        <language id="c788b046-2019-4656-8b60-8bb9bbb177b5" fqName="com.mbeddr.mpsutil.review" version="0" />
-        <language id="7a060fae-09e0-4372-be36-6696d6554c0e" fqName="com.mbeddr.mpsutil.review.annotation" version="0" />
-        <language id="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2" fqName="com.mbeddr.mpsutil.suppresswarning" version="0" />
-        <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
-        <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-        <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
-        <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-        <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
-        <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" fqName="jetbrains.mps.baseLanguage.unitTest" version="0" />
-        <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" fqName="jetbrains.mps.core.xml" version="0" />
-        <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
-        <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" fqName="jetbrains.mps.lang.behavior" version="0" />
-        <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-        <language id="b401a680-8325-4110-8fd3-84331ff25bef" fqName="jetbrains.mps.lang.generator" version="0" />
-        <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" fqName="jetbrains.mps.lang.generator.generationContext" version="0" />
-        <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
-        <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-        <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
-        <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
-        <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
+        <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="2" />
+        <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="0" />
+        <language slang="l:b2da2e1a-b542-47f5-9be0-4dc21efe74a4:com.mbeddr.core.checks" version="0" />
+        <language slang="l:390de4af-0c8d-4716-8dec-3d05ca751b28:com.mbeddr.core.cinterpreter" version="0" />
+        <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
+        <language slang="l:ebb5e132-d298-4649-b320-b3f4d7f3acff:com.mbeddr.core.debug.blext" version="0" />
+        <language slang="l:783af01f-87a7-412c-be99-293a162652b5:com.mbeddr.core.embedded" version="0" />
+        <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="2" />
+        <language slang="l:ad5e9db1-9600-47c7-86ef-614165b281b8:com.mbeddr.core.legacy" version="0" />
+        <language slang="l:f93d1dbe-bfd1-42dd-932a-f375fa6f5373:com.mbeddr.core.make" version="1" />
+        <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="0" />
+        <language slang="l:62296a07-bc38-46d2-8034-198c24063588:com.mbeddr.core.modules.gen" version="0" />
+        <language slang="l:3bf5377a-e904-4ded-9754-5a516023bfaa:com.mbeddr.core.pointers" version="0" />
+        <language slang="l:a9d69647-0840-491e-bf39-2eb0805d2011:com.mbeddr.core.statements" version="1" />
+        <language slang="l:efda956e-491e-4f00-ba14-36af2f213ecf:com.mbeddr.core.udt" version="1" />
+        <language slang="l:06d68b77-b699-4918-83b8-857e63787800:com.mbeddr.core.unittest" version="1" />
+        <language slang="l:2693fc71-9b0e-4b05-ab13-f57227d675f2:com.mbeddr.core.util" version="0" />
+        <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+        <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
+        <language slang="l:b67a6ca0-735e-4903-b238-4b525bddf96a:com.mbeddr.mpsutil.genutil" version="0" />
+        <language slang="l:1c897ba5-9d43-4035-ac7f-0306495743ac:com.mbeddr.mpsutil.interpreter.test" version="0" />
+        <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
+        <language slang="l:92f195b6-a209-4804-ad65-f5248ecd5873:com.mbeddr.mpsutil.margincell" version="0" />
+        <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
+        <language slang="l:c788b046-2019-4656-8b60-8bb9bbb177b5:com.mbeddr.mpsutil.review" version="0" />
+        <language slang="l:7a060fae-09e0-4372-be36-6696d6554c0e:com.mbeddr.mpsutil.review.annotation" version="0" />
+        <language slang="l:c1c2a88a-323c-4605-a37d-9ab77a2ccbd2:com.mbeddr.mpsutil.suppresswarning" version="0" />
+        <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
+        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+        <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+        <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="0" />
+        <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
+        <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
+        <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="2" />
+        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="1" />
+        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+        <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
       </languageVersions>
       <dependencyVersions>
         <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -212,64 +212,64 @@
     <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="2" />
-    <language id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" fqName="com.mbeddr.core.buildconfig" version="0" />
-    <language id="b2da2e1a-b542-47f5-9be0-4dc21efe74a4" fqName="com.mbeddr.core.checks" version="0" />
-    <language id="390de4af-0c8d-4716-8dec-3d05ca751b28" fqName="com.mbeddr.core.cinterpreter" version="0" />
-    <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
-    <language id="ebb5e132-d298-4649-b320-b3f4d7f3acff" fqName="com.mbeddr.core.debug.blext" version="0" />
-    <language id="783af01f-87a7-412c-be99-293a162652b5" fqName="com.mbeddr.core.embedded" version="0" />
-    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="2" />
-    <language id="ad5e9db1-9600-47c7-86ef-614165b281b8" fqName="com.mbeddr.core.legacy" version="0" />
-    <language id="f93d1dbe-bfd1-42dd-932a-f375fa6f5373" fqName="com.mbeddr.core.make" version="1" />
-    <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" fqName="com.mbeddr.core.modules" version="0" />
-    <language id="62296a07-bc38-46d2-8034-198c24063588" fqName="com.mbeddr.core.modules.gen" version="0" />
-    <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" fqName="com.mbeddr.core.pointers" version="0" />
-    <language id="a9d69647-0840-491e-bf39-2eb0805d2011" fqName="com.mbeddr.core.statements" version="1" />
-    <language id="efda956e-491e-4f00-ba14-36af2f213ecf" fqName="com.mbeddr.core.udt" version="1" />
-    <language id="06d68b77-b699-4918-83b8-857e63787800" fqName="com.mbeddr.core.unittest" version="1" />
-    <language id="2693fc71-9b0e-4b05-ab13-f57227d675f2" fqName="com.mbeddr.core.util" version="0" />
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
-    <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
-    <language id="1c897ba5-9d43-4035-ac7f-0306495743ac" fqName="com.mbeddr.mpsutil.interpreter.test" version="0" />
-    <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />
-    <language id="92f195b6-a209-4804-ad65-f5248ecd5873" fqName="com.mbeddr.mpsutil.margincell" version="0" />
-    <language id="b4d28e19-7d2d-47e9-943e-3a41f97a0e52" fqName="com.mbeddr.mpsutil.plantuml.node" version="0" />
-    <language id="c788b046-2019-4656-8b60-8bb9bbb177b5" fqName="com.mbeddr.mpsutil.review" version="0" />
-    <language id="7a060fae-09e0-4372-be36-6696d6554c0e" fqName="com.mbeddr.mpsutil.review.annotation" version="0" />
-    <language id="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2" fqName="com.mbeddr.mpsutil.suppresswarning" version="0" />
-    <language id="f89904fb-9486-43a1-865e-5ad0375a8a88" fqName="de.itemis.mps.editor.bool" version="0" />
-    <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-    <language id="7e450f4e-1ac3-41ef-a851-4598161bdb94" fqName="de.slisson.mps.tables" version="0" />
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
-    <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" fqName="jetbrains.mps.baseLanguage.checkedDots" version="0" />
-    <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
-    <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" fqName="jetbrains.mps.baseLanguage.unitTest" version="0" />
-    <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" fqName="jetbrains.mps.core.xml" version="0" />
-    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
-    <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
-    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" fqName="jetbrains.mps.lang.behavior" version="0" />
-    <language id="fe9d76d7-5809-45c9-ae28-a40915b4d6ff" fqName="jetbrains.mps.lang.checkedName" version="0" />
-    <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" fqName="jetbrains.mps.lang.constraints" version="0" />
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="1" />
-    <language id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" fqName="jetbrains.mps.lang.intentions" version="0" />
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
-    <language id="d8f591ec-4d86-4af2-9f92-a9e93c803ffa" fqName="jetbrains.mps.lang.scopes" version="0" />
-    <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
-    <language id="b83431fe-5c8f-40bc-8a36-65e25f4dd253" fqName="jetbrains.mps.lang.textGen" version="0" />
-    <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
-    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
-    <language id="3c4c8461-a533-4459-916a-dc0176793b4c" fqName="mbeddr.arduino.core" version="0" />
+    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="2" />
+    <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="0" />
+    <language slang="l:b2da2e1a-b542-47f5-9be0-4dc21efe74a4:com.mbeddr.core.checks" version="0" />
+    <language slang="l:390de4af-0c8d-4716-8dec-3d05ca751b28:com.mbeddr.core.cinterpreter" version="0" />
+    <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
+    <language slang="l:ebb5e132-d298-4649-b320-b3f4d7f3acff:com.mbeddr.core.debug.blext" version="0" />
+    <language slang="l:783af01f-87a7-412c-be99-293a162652b5:com.mbeddr.core.embedded" version="0" />
+    <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="2" />
+    <language slang="l:ad5e9db1-9600-47c7-86ef-614165b281b8:com.mbeddr.core.legacy" version="0" />
+    <language slang="l:f93d1dbe-bfd1-42dd-932a-f375fa6f5373:com.mbeddr.core.make" version="1" />
+    <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="0" />
+    <language slang="l:62296a07-bc38-46d2-8034-198c24063588:com.mbeddr.core.modules.gen" version="0" />
+    <language slang="l:3bf5377a-e904-4ded-9754-5a516023bfaa:com.mbeddr.core.pointers" version="0" />
+    <language slang="l:a9d69647-0840-491e-bf39-2eb0805d2011:com.mbeddr.core.statements" version="1" />
+    <language slang="l:efda956e-491e-4f00-ba14-36af2f213ecf:com.mbeddr.core.udt" version="1" />
+    <language slang="l:06d68b77-b699-4918-83b8-857e63787800:com.mbeddr.core.unittest" version="1" />
+    <language slang="l:2693fc71-9b0e-4b05-ab13-f57227d675f2:com.mbeddr.core.util" version="0" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
+    <language slang="l:1c897ba5-9d43-4035-ac7f-0306495743ac:com.mbeddr.mpsutil.interpreter.test" version="0" />
+    <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
+    <language slang="l:92f195b6-a209-4804-ad65-f5248ecd5873:com.mbeddr.mpsutil.margincell" version="0" />
+    <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
+    <language slang="l:c788b046-2019-4656-8b60-8bb9bbb177b5:com.mbeddr.mpsutil.review" version="0" />
+    <language slang="l:7a060fae-09e0-4372-be36-6696d6554c0e:com.mbeddr.mpsutil.review.annotation" version="0" />
+    <language slang="l:c1c2a88a-323c-4605-a37d-9ab77a2ccbd2:com.mbeddr.mpsutil.suppresswarning" version="0" />
+    <language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
+    <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
+    <language slang="l:7e450f4e-1ac3-41ef-a851-4598161bdb94:de.slisson.mps.tables" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
+    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="0" />
+    <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
+    <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="0" />
+    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
+    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="1" />
+    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
+    <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="2" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="1" />
+    <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="0" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
+    <language slang="l:3c4c8461-a533-4459-916a-dc0176793b4c:mbeddr.arduino.core" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -279,7 +279,6 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-    <module reference="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" version="0" />
     <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
     <module reference="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" version="0" />
     <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
@@ -297,6 +296,7 @@
     <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
     <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
     <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
+    <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
diff --git a/languages/mbeddr.arduino.interrupts/languageModels/editor.mps b/languages/mbeddr.arduino.interrupts/languageModels/editor.mps
old mode 100644
new mode 100755
index 2a486cc..02f0fe0
--- a/languages/mbeddr.arduino.interrupts/languageModels/editor.mps
+++ b/languages/mbeddr.arduino.interrupts/languageModels/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:a392ba58-d039-4eb9-97de-dbfd5d1cf77b(mbeddr.arduino.interrupts.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="1" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="4" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports />
diff --git a/languages/mbeddr.arduino.interrupts/languageModels/structure.mps b/languages/mbeddr.arduino.interrupts/languageModels/structure.mps
old mode 100644
new mode 100755
index 111a8f4..37abc7b
--- a/languages/mbeddr.arduino.interrupts/languageModels/structure.mps
+++ b/languages/mbeddr.arduino.interrupts/languageModels/structure.mps
@@ -15,8 +15,8 @@
   <registry>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
+        <property id="6714410169261853888" name="conceptId" index="EcuMT" />
         <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
-        <property id="1587916991969465369" name="conceptId" index="1pbfSe" />
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
         <child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
       </concept>
@@ -28,12 +28,14 @@
         <child id="1169129564478" name="implements" index="PzmwI" />
       </concept>
       <concept id="1071489288299" name="jetbrains.mps.lang.structure.structure.PropertyDeclaration" flags="ig" index="1TJgyi">
+        <property id="241647608299431129" name="propertyId" index="IQ2nx" />
         <reference id="1082985295845" name="dataType" index="AX2Wp" />
       </concept>
       <concept id="1071489288298" name="jetbrains.mps.lang.structure.structure.LinkDeclaration" flags="ig" index="1TJgyj">
         <property id="1071599776563" name="role" index="20kJfa" />
         <property id="1071599893252" name="sourceCardinality" index="20lbJX" />
         <property id="1071599937831" name="metaClass" index="20lmBu" />
+        <property id="241647608299431140" name="linkId" index="IQ2ns" />
         <reference id="1071599976176" name="target" index="20lvS9" />
       </concept>
     </language>
@@ -49,7 +51,7 @@
   <node concept="1TIwiD" id="4u2wEbSxlZT">
     <property role="3GE5qa" value="platform" />
     <property role="TrG5h" value="ArduinoIsr" />
-    <property role="1pbfSe" value="1074258587" />
+    <property role="EcuMT" value="5152824560131071993" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="SwwM9UHwwL" role="PzmwI">
       <ref role="PrY4T" to="x27k:5_l8w1EmTdf" resolve="IModuleContent" />
@@ -64,10 +66,12 @@
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="body" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="5152824560131071995" />
       <ref role="20lvS9" to="c4fa:3CmSUB7Fp_l" resolve="StatementList" />
     </node>
     <node concept="1TJgyi" id="4u2wEbS$dnP" role="1TKVEl">
       <property role="TrG5h" value="isrName" />
+      <property role="IQ2nx" value="5152824560131823093" />
       <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
     </node>
   </node>
@@ -75,7 +79,7 @@
     <property role="3GE5qa" value="platform" />
     <property role="TrG5h" value="ArduinoInterruptKind" />
     <property role="34LRSv" value="arduino" />
-    <property role="1pbfSe" value="1074722032" />
+    <property role="EcuMT" value="5152824560131535438" />
     <ref role="1TJDcQ" to="nbyu:7X9xw2qCZP5" resolve="AbstractInterruptKind" />
   </node>
 </model>
diff --git a/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl b/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl
old mode 100644
new mode 100755
index ca67445..eb8ee70
--- a/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl
+++ b/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl
@@ -34,21 +34,39 @@
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
       </usedDevKits>
       <languageVersions>
-        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
-        <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-        <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
-        <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-        <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
-        <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-        <language id="b401a680-8325-4110-8fd3-84331ff25bef" fqName="jetbrains.mps.lang.generator" version="0" />
-        <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" fqName="jetbrains.mps.lang.generator.generationContext" version="0" />
-        <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
-        <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-        <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
-        <language id="e562f51e-6403-4857-b773-44632077c67d" fqName="mbeddr.arduino.interrupts" version="0" />
+        <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
+        <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
+        <language slang="l:783af01f-87a7-412c-be99-293a162652b5:com.mbeddr.core.embedded" version="0" />
+        <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="3" />
+        <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="4" />
+        <language slang="l:3bf5377a-e904-4ded-9754-5a516023bfaa:com.mbeddr.core.pointers" version="0" />
+        <language slang="l:a9d69647-0840-491e-bf39-2eb0805d2011:com.mbeddr.core.statements" version="1" />
+        <language slang="l:efda956e-491e-4f00-ba14-36af2f213ecf:com.mbeddr.core.udt" version="1" />
+        <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+        <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
+        <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
+        <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
+        <language slang="l:c1c2a88a-323c-4605-a37d-9ab77a2ccbd2:com.mbeddr.mpsutil.suppresswarning" version="0" />
+        <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
+        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+        <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+        <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
+        <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="2" />
+        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
+        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+        <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
+        <language slang="l:e562f51e-6403-4857-b773-44632077c67d:mbeddr.arduino.interrupts" version="0" />
       </languageVersions>
       <dependencyVersions>
         <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -128,26 +146,26 @@
     <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
-    <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
-    <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
-    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" fqName="jetbrains.mps.lang.behavior" version="0" />
-    <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" fqName="jetbrains.mps.lang.constraints" version="0" />
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="1" />
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
-    <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
-    <language id="b83431fe-5c8f-40bc-8a36-65e25f4dd253" fqName="jetbrains.mps.lang.textGen" version="0" />
-    <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
-    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="0" />
+    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="1" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="2" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="1" />
+    <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="0" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/languages/mbeddr.arduino.registers/languageModels/editor.mps b/languages/mbeddr.arduino.registers/languageModels/editor.mps
old mode 100644
new mode 100755
index 85c2b51..3bff6ca
--- a/languages/mbeddr.arduino.registers/languageModels/editor.mps
+++ b/languages/mbeddr.arduino.registers/languageModels/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:8b3f9793-7cc3-4ec8-a378-8e489d99fd48(mbeddr.arduino.registers.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="1" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="4" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports />
diff --git a/languages/mbeddr.arduino.registers/languageModels/structure.mps b/languages/mbeddr.arduino.registers/languageModels/structure.mps
old mode 100644
new mode 100755
index dae617a..8692d52
--- a/languages/mbeddr.arduino.registers/languageModels/structure.mps
+++ b/languages/mbeddr.arduino.registers/languageModels/structure.mps
@@ -11,8 +11,8 @@
   <registry>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
+        <property id="6714410169261853888" name="conceptId" index="EcuMT" />
         <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
-        <property id="1587916991969465369" name="conceptId" index="1pbfSe" />
       </concept>
       <concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
         <reference id="1071489389519" name="extends" index="1TJDcQ" />
@@ -31,7 +31,7 @@
     <property role="3GE5qa" value="registers.mbeddr" />
     <property role="TrG5h" value="ArduinoRegisterKind" />
     <property role="34LRSv" value="arduino" />
-    <property role="1pbfSe" value="1074137845" />
+    <property role="EcuMT" value="5152824560130951251" />
     <ref role="1TJDcQ" to="nbyu:5W7baq$aGq_" resolve="AbstractRegisterTransformationKind" />
   </node>
 </model>
diff --git a/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl b/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl
old mode 100644
new mode 100755
index 9791917..03ea365
--- a/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl
+++ b/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl
@@ -24,34 +24,7 @@
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
       </usedDevKits>
       <languageVersions>
-        <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="2" />
-        <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
-        <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="2" />
-        <language id="a9d69647-0840-491e-bf39-2eb0805d2011" fqName="com.mbeddr.core.statements" version="1" />
-        <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
-        <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
-        <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />
-        <language id="b4d28e19-7d2d-47e9-943e-3a41f97a0e52" fqName="com.mbeddr.mpsutil.plantuml.node" version="0" />
-        <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
-        <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-        <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
-        <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-        <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
-        <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" fqName="jetbrains.mps.core.xml" version="0" />
-        <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
-        <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-        <language id="b401a680-8325-4110-8fd3-84331ff25bef" fqName="jetbrains.mps.lang.generator" version="0" />
-        <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" fqName="jetbrains.mps.lang.generator.generationContext" version="0" />
-        <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
-        <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-        <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
-        <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
-        <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
-        <language id="3828799d-97c8-48d0-af8b-39b903457e1e" fqName="mbeddr.arduino.registers" version="0" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
       </languageVersions>
       <dependencyVersions>
         <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -93,7 +66,7 @@
         <module reference="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
         <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
@@ -124,27 +97,24 @@
   </dependencies>
   <usedDevKits>
     <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
+    <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
-    <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
-    <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
-    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" fqName="jetbrains.mps.lang.behavior" version="0" />
-    <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" fqName="jetbrains.mps.lang.constraints" version="0" />
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="1" />
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
-    <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
-    <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
-    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -182,7 +152,7 @@
     <module reference="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
diff --git a/languages/mbeddr.arduino.statemachine/languageModels/structure.mps b/languages/mbeddr.arduino.statemachine/languageModels/structure.mps
old mode 100644
new mode 100755
index aa600d5..3059327
--- a/languages/mbeddr.arduino.statemachine/languageModels/structure.mps
+++ b/languages/mbeddr.arduino.statemachine/languageModels/structure.mps
@@ -16,8 +16,8 @@
   <registry>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
+        <property id="6714410169261853888" name="conceptId" index="EcuMT" />
         <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
-        <property id="1587916991969465369" name="conceptId" index="1pbfSe" />
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
       </concept>
       <concept id="1169127622168" name="jetbrains.mps.lang.structure.structure.InterfaceConceptReference" flags="ig" index="PrWs8">
@@ -31,6 +31,7 @@
         <property id="1071599776563" name="role" index="20kJfa" />
         <property id="1071599893252" name="sourceCardinality" index="20lbJX" />
         <property id="1071599937831" name="metaClass" index="20lmBu" />
+        <property id="241647608299431140" name="linkId" index="IQ2ns" />
         <reference id="1071599976176" name="target" index="20lvS9" />
       </concept>
     </language>
@@ -43,7 +44,7 @@
   <node concept="1TIwiD" id="2NO1T5RyLIB">
     <property role="TrG5h" value="InterruptInEventTrigger" />
     <property role="34LRSv" value="arduino interrupt" />
-    <property role="1pbfSe" value="1535171784" />
+    <property role="EcuMT" value="3239222353343486887" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2NO1T5RyYTc" role="PzmwI">
       <ref role="PrY4T" to="clqz:41KMvfcjScv" resolve="IInEventBinding" />
@@ -51,35 +52,39 @@
   </node>
   <node concept="1TIwiD" id="2NO1T5Rz3Od">
     <property role="TrG5h" value="ArduinoInterruptInEventBinding" />
-    <property role="1pbfSe" value="1535097698" />
+    <property role="EcuMT" value="3239222353343560973" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="2NO1T5RzgPG" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20lbJX" value="1" />
       <property role="20kJfa" value="var" />
+      <property role="IQ2ns" value="3239222353343614316" />
       <ref role="20lvS9" to="x27k:5IYyAOzCrre" resolve="GlobalVariableDeclaration" />
     </node>
     <node concept="1TJgyj" id="2NO1T5R$isZ" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="event" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="3239222353343883071" />
       <ref role="20lvS9" to="clqz:41KMvfcjSct" resolve="InEvent" />
     </node>
     <node concept="1TJgyj" id="2NO1T5RzfCx" role="1TKVEi">
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="interrupt" />
       <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="3239222353343609377" />
       <ref role="20lvS9" to="nbyu:SwwM9UHCGQ" resolve="InterruptDeclaration" />
     </node>
   </node>
   <node concept="1TIwiD" id="2NO1T5RDqn0">
     <property role="TrG5h" value="ArduinoStatemachineInterruptConfigItem" />
-    <property role="1pbfSe" value="1533432495" />
+    <property role="EcuMT" value="3239222353345226176" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="2NO1T5REU$T" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="bindings" />
       <property role="20lbJX" value="1..n" />
+      <property role="IQ2ns" value="3239222353345620281" />
       <ref role="20lvS9" node="2NO1T5Rz3Od" resolve="ArduinoInterruptInEventBinding" />
     </node>
     <node concept="PrWs8" id="2NO1T5RDqn1" role="PzmwI">
diff --git a/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl b/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl
old mode 100644
new mode 100755
index bac7501..f5c0eb3
--- a/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl
+++ b/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl
@@ -26,44 +26,44 @@
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
       </usedDevKits>
       <languageVersions>
-        <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="2" />
-        <language id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" fqName="com.mbeddr.core.buildconfig" version="0" />
-        <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
-        <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="2" />
-        <language id="f93d1dbe-bfd1-42dd-932a-f375fa6f5373" fqName="com.mbeddr.core.make" version="1" />
-        <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" fqName="com.mbeddr.core.modules" version="0" />
-        <language id="62296a07-bc38-46d2-8034-198c24063588" fqName="com.mbeddr.core.modules.gen" version="0" />
-        <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" fqName="com.mbeddr.core.pointers" version="0" />
-        <language id="a9d69647-0840-491e-bf39-2eb0805d2011" fqName="com.mbeddr.core.statements" version="1" />
-        <language id="efda956e-491e-4f00-ba14-36af2f213ecf" fqName="com.mbeddr.core.udt" version="1" />
-        <language id="06d68b77-b699-4918-83b8-857e63787800" fqName="com.mbeddr.core.unittest" version="1" />
-        <language id="2693fc71-9b0e-4b05-ab13-f57227d675f2" fqName="com.mbeddr.core.util" version="0" />
-        <language id="564e97d6-8fb7-41f5-bfc1-c7ed376efd62" fqName="com.mbeddr.ext.statemachines" version="0" />
-        <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
-        <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
-        <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />
-        <language id="b4d28e19-7d2d-47e9-943e-3a41f97a0e52" fqName="com.mbeddr.mpsutil.plantuml.node" version="0" />
-        <language id="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2" fqName="com.mbeddr.mpsutil.suppresswarning" version="0" />
-        <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
-        <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-        <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
-        <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-        <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
-        <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" fqName="jetbrains.mps.core.xml" version="0" />
-        <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
-        <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-        <language id="b401a680-8325-4110-8fd3-84331ff25bef" fqName="jetbrains.mps.lang.generator" version="0" />
-        <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" fqName="jetbrains.mps.lang.generator.generationContext" version="0" />
-        <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
-        <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-        <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
-        <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
-        <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
-        <language id="028007ba-e266-4d05-ab46-25264b977671" fqName="mbeddr.arduino.statemachine" version="0" />
+        <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="2" />
+        <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="0" />
+        <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
+        <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="2" />
+        <language slang="l:f93d1dbe-bfd1-42dd-932a-f375fa6f5373:com.mbeddr.core.make" version="1" />
+        <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="0" />
+        <language slang="l:62296a07-bc38-46d2-8034-198c24063588:com.mbeddr.core.modules.gen" version="0" />
+        <language slang="l:3bf5377a-e904-4ded-9754-5a516023bfaa:com.mbeddr.core.pointers" version="0" />
+        <language slang="l:a9d69647-0840-491e-bf39-2eb0805d2011:com.mbeddr.core.statements" version="1" />
+        <language slang="l:efda956e-491e-4f00-ba14-36af2f213ecf:com.mbeddr.core.udt" version="1" />
+        <language slang="l:06d68b77-b699-4918-83b8-857e63787800:com.mbeddr.core.unittest" version="1" />
+        <language slang="l:2693fc71-9b0e-4b05-ab13-f57227d675f2:com.mbeddr.core.util" version="0" />
+        <language slang="l:564e97d6-8fb7-41f5-bfc1-c7ed376efd62:com.mbeddr.ext.statemachines" version="0" />
+        <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+        <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
+        <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
+        <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
+        <language slang="l:c1c2a88a-323c-4605-a37d-9ab77a2ccbd2:com.mbeddr.mpsutil.suppresswarning" version="0" />
+        <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
+        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+        <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+        <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
+        <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="2" />
+        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="1" />
+        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+        <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
+        <language slang="l:028007ba-e266-4d05-ab46-25264b977671:mbeddr.arduino.statemachine" version="0" />
       </languageVersions>
       <dependencyVersions>
         <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -145,30 +145,31 @@
   <sourcePath />
   <usedDevKits>
     <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
+    <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
-    <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
-    <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
-    <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
-    <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
-    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" fqName="jetbrains.mps.lang.behavior" version="0" />
-    <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" fqName="jetbrains.mps.lang.constraints" version="0" />
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="1" />
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
-    <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
-    <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
-    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="0" />
+    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="1" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="2" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="1" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/solutions/arduino.samples/arduino.samples.msd b/solutions/arduino.samples/arduino.samples.msd
old mode 100644
new mode 100755
index cb2ab72..b1c02be
--- a/solutions/arduino.samples/arduino.samples.msd
+++ b/solutions/arduino.samples/arduino.samples.msd
@@ -22,79 +22,79 @@
     <usedDevKit>6845f348-7ea5-449c-ae3b-3d600bc3b73d(mbeddr.arduino)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="e865cad2-7cc8-437a-951a-665bcbcb8b1a" fqName="com.mbeddr.cc.requirements" version="0" />
-    <language id="f3ed62ca-3490-40d0-890b-9b3133cc2ead" fqName="com.mbeddr.cc.requirements.c" version="0" />
-    <language id="7a52ca96-9053-41d2-ae13-8cee05f36698" fqName="com.mbeddr.cc.requirements.c2doc" version="0" />
-    <language id="983e02f8-8062-426e-b60d-bc044a46b93a" fqName="com.mbeddr.cc.requirements.report" version="0" />
-    <language id="b9f5080f-7f6a-4d86-b994-77d4c982153a" fqName="com.mbeddr.cc.requirements.scenario2doc" version="0" />
-    <language id="d6714220-402d-48cb-a4a2-88223c6257f6" fqName="com.mbeddr.cc.requirements.scenarios" version="0" />
-    <language id="e530d4cb-efad-4822-92f8-1d114f03f836" fqName="com.mbeddr.cc.requirements.wp" version="0" />
-    <language id="53bab999-e9c3-428a-80be-fef5bed08f55" fqName="com.mbeddr.cc.trace" version="0" />
-    <language id="017fba0e-af15-4a23-b0a8-02b5c1141e75" fqName="com.mbeddr.cc.var.annotations" version="0" />
-    <language id="634736cf-ea73-4eb1-abe9-d2ecc5fcf837" fqName="com.mbeddr.cc.var.c" version="0" />
-    <language id="e401b447-8019-4ccd-a72c-bfb0230f5782" fqName="com.mbeddr.cc.var.fm" version="1" />
-    <language id="b8eeb935-038d-48d8-ae7f-0c6768b8d4fc" fqName="com.mbeddr.cc.var.rt" version="0" />
-    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="2" />
-    <language id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" fqName="com.mbeddr.core.buildconfig" version="0" />
-    <language id="b2da2e1a-b542-47f5-9be0-4dc21efe74a4" fqName="com.mbeddr.core.checks" version="0" />
-    <language id="390de4af-0c8d-4716-8dec-3d05ca751b28" fqName="com.mbeddr.core.cinterpreter" version="0" />
-    <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
-    <language id="ebb5e132-d298-4649-b320-b3f4d7f3acff" fqName="com.mbeddr.core.debug.blext" version="0" />
-    <language id="783af01f-87a7-412c-be99-293a162652b5" fqName="com.mbeddr.core.embedded" version="0" />
-    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="2" />
-    <language id="ad5e9db1-9600-47c7-86ef-614165b281b8" fqName="com.mbeddr.core.legacy" version="0" />
-    <language id="f93d1dbe-bfd1-42dd-932a-f375fa6f5373" fqName="com.mbeddr.core.make" version="1" />
-    <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" fqName="com.mbeddr.core.modules" version="0" />
-    <language id="62296a07-bc38-46d2-8034-198c24063588" fqName="com.mbeddr.core.modules.gen" version="0" />
-    <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" fqName="com.mbeddr.core.pointers" version="0" />
-    <language id="a9d69647-0840-491e-bf39-2eb0805d2011" fqName="com.mbeddr.core.statements" version="1" />
-    <language id="efda956e-491e-4f00-ba14-36af2f213ecf" fqName="com.mbeddr.core.udt" version="1" />
-    <language id="06d68b77-b699-4918-83b8-857e63787800" fqName="com.mbeddr.core.unittest" version="1" />
-    <language id="2693fc71-9b0e-4b05-ab13-f57227d675f2" fqName="com.mbeddr.core.util" version="0" />
-    <language id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" fqName="com.mbeddr.doc" version="0" />
-    <language id="f44f6b9a-bf30-4f73-866e-fac17c177409" fqName="com.mbeddr.doc.gen_latex" version="0" />
-    <language id="2dec0852-3a21-4c4e-a68c-b05236cc37f2" fqName="com.mbeddr.doc.gen_xhtml" version="0" />
-    <language id="f8f68d92-c6d2-44b3-8d63-c00ade75ec86" fqName="com.mbeddr.doc.latex" version="0" />
-    <language id="e06345c7-da82-4f8b-bd44-1425fe158640" fqName="com.mbeddr.doc.meta" version="0" />
-    <language id="97d24244-51db-4e2e-97fc-7bd73b1f5f40" fqName="com.mbeddr.ext.components" version="0" />
-    <language id="028899e1-bfee-4db6-b470-ed0f9ee5f662" fqName="com.mbeddr.ext.components.embedded" version="0" />
-    <language id="bd640b8f-4be4-42b6-8dc0-2c94d1ddf606" fqName="com.mbeddr.ext.components.gen_nomw" version="0" />
-    <language id="36a565f1-3fa0-42d6-baac-f87e209c9789" fqName="com.mbeddr.ext.components.mock" version="0" />
-    <language id="13a36f90-83c5-4bf6-9dd6-70e455f1ef36" fqName="com.mbeddr.ext.components.statemachine" version="0" />
-    <language id="41911c23-eb23-4ee6-872f-bc7f7ebce290" fqName="com.mbeddr.ext.components.test" version="0" />
-    <language id="54f2a59b-97bb-4c09-af92-928ebf9c5966" fqName="com.mbeddr.ext.compositecomponents" version="0" />
-    <language id="564e97d6-8fb7-41f5-bfc1-c7ed376efd62" fqName="com.mbeddr.ext.statemachines" version="0" />
-    <language id="0d04a6cc-773e-4069-b9b0-11884b2ff1c8" fqName="com.mbeddr.ext.units" version="1" />
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
-    <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
-    <language id="1c897ba5-9d43-4035-ac7f-0306495743ac" fqName="com.mbeddr.mpsutil.interpreter.test" version="0" />
-    <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />
-    <language id="92f195b6-a209-4804-ad65-f5248ecd5873" fqName="com.mbeddr.mpsutil.margincell" version="0" />
-    <language id="b4d28e19-7d2d-47e9-943e-3a41f97a0e52" fqName="com.mbeddr.mpsutil.plantuml.node" version="0" />
-    <language id="c788b046-2019-4656-8b60-8bb9bbb177b5" fqName="com.mbeddr.mpsutil.review" version="0" />
-    <language id="7a060fae-09e0-4372-be36-6696d6554c0e" fqName="com.mbeddr.mpsutil.review.annotation" version="0" />
-    <language id="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2" fqName="com.mbeddr.mpsutil.suppresswarning" version="0" />
-    <language id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" fqName="de.itemis.mps.editor.diagram.layout" version="0" />
-    <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
-    <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
-    <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" fqName="jetbrains.mps.baseLanguage.unitTest" version="0" />
-    <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" fqName="jetbrains.mps.core.xml" version="0" />
-    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
-    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" fqName="jetbrains.mps.lang.behavior" version="0" />
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="86ef8290-12bb-4ca7-947f-093788f263a9" fqName="jetbrains.mps.lang.project" version="0" />
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
-    <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
-    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
-    <language id="3c4c8461-a533-4459-916a-dc0176793b4c" fqName="mbeddr.arduino.core" version="0" />
-    <language id="e562f51e-6403-4857-b773-44632077c67d" fqName="mbeddr.arduino.interrupts" version="0" />
-    <language id="3828799d-97c8-48d0-af8b-39b903457e1e" fqName="mbeddr.arduino.registers" version="0" />
-    <language id="028007ba-e266-4d05-ab46-25264b977671" fqName="mbeddr.arduino.statemachine" version="0" />
+    <language slang="l:e865cad2-7cc8-437a-951a-665bcbcb8b1a:com.mbeddr.cc.requirements" version="0" />
+    <language slang="l:f3ed62ca-3490-40d0-890b-9b3133cc2ead:com.mbeddr.cc.requirements.c" version="0" />
+    <language slang="l:7a52ca96-9053-41d2-ae13-8cee05f36698:com.mbeddr.cc.requirements.c2doc" version="0" />
+    <language slang="l:983e02f8-8062-426e-b60d-bc044a46b93a:com.mbeddr.cc.requirements.report" version="0" />
+    <language slang="l:b9f5080f-7f6a-4d86-b994-77d4c982153a:com.mbeddr.cc.requirements.scenario2doc" version="0" />
+    <language slang="l:d6714220-402d-48cb-a4a2-88223c6257f6:com.mbeddr.cc.requirements.scenarios" version="0" />
+    <language slang="l:e530d4cb-efad-4822-92f8-1d114f03f836:com.mbeddr.cc.requirements.wp" version="0" />
+    <language slang="l:53bab999-e9c3-428a-80be-fef5bed08f55:com.mbeddr.cc.trace" version="0" />
+    <language slang="l:017fba0e-af15-4a23-b0a8-02b5c1141e75:com.mbeddr.cc.var.annotations" version="0" />
+    <language slang="l:634736cf-ea73-4eb1-abe9-d2ecc5fcf837:com.mbeddr.cc.var.c" version="0" />
+    <language slang="l:e401b447-8019-4ccd-a72c-bfb0230f5782:com.mbeddr.cc.var.fm" version="1" />
+    <language slang="l:b8eeb935-038d-48d8-ae7f-0c6768b8d4fc:com.mbeddr.cc.var.rt" version="0" />
+    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="2" />
+    <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="0" />
+    <language slang="l:b2da2e1a-b542-47f5-9be0-4dc21efe74a4:com.mbeddr.core.checks" version="0" />
+    <language slang="l:390de4af-0c8d-4716-8dec-3d05ca751b28:com.mbeddr.core.cinterpreter" version="0" />
+    <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
+    <language slang="l:ebb5e132-d298-4649-b320-b3f4d7f3acff:com.mbeddr.core.debug.blext" version="0" />
+    <language slang="l:783af01f-87a7-412c-be99-293a162652b5:com.mbeddr.core.embedded" version="0" />
+    <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="2" />
+    <language slang="l:ad5e9db1-9600-47c7-86ef-614165b281b8:com.mbeddr.core.legacy" version="0" />
+    <language slang="l:f93d1dbe-bfd1-42dd-932a-f375fa6f5373:com.mbeddr.core.make" version="1" />
+    <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="0" />
+    <language slang="l:62296a07-bc38-46d2-8034-198c24063588:com.mbeddr.core.modules.gen" version="0" />
+    <language slang="l:3bf5377a-e904-4ded-9754-5a516023bfaa:com.mbeddr.core.pointers" version="0" />
+    <language slang="l:a9d69647-0840-491e-bf39-2eb0805d2011:com.mbeddr.core.statements" version="1" />
+    <language slang="l:efda956e-491e-4f00-ba14-36af2f213ecf:com.mbeddr.core.udt" version="1" />
+    <language slang="l:06d68b77-b699-4918-83b8-857e63787800:com.mbeddr.core.unittest" version="1" />
+    <language slang="l:2693fc71-9b0e-4b05-ab13-f57227d675f2:com.mbeddr.core.util" version="0" />
+    <language slang="l:2374bc90-7e37-41f1-a9c4-c2e35194c36a:com.mbeddr.doc" version="0" />
+    <language slang="l:f44f6b9a-bf30-4f73-866e-fac17c177409:com.mbeddr.doc.gen_latex" version="0" />
+    <language slang="l:2dec0852-3a21-4c4e-a68c-b05236cc37f2:com.mbeddr.doc.gen_xhtml" version="0" />
+    <language slang="l:f8f68d92-c6d2-44b3-8d63-c00ade75ec86:com.mbeddr.doc.latex" version="0" />
+    <language slang="l:e06345c7-da82-4f8b-bd44-1425fe158640:com.mbeddr.doc.meta" version="0" />
+    <language slang="l:97d24244-51db-4e2e-97fc-7bd73b1f5f40:com.mbeddr.ext.components" version="0" />
+    <language slang="l:028899e1-bfee-4db6-b470-ed0f9ee5f662:com.mbeddr.ext.components.embedded" version="0" />
+    <language slang="l:bd640b8f-4be4-42b6-8dc0-2c94d1ddf606:com.mbeddr.ext.components.gen_nomw" version="0" />
+    <language slang="l:36a565f1-3fa0-42d6-baac-f87e209c9789:com.mbeddr.ext.components.mock" version="0" />
+    <language slang="l:13a36f90-83c5-4bf6-9dd6-70e455f1ef36:com.mbeddr.ext.components.statemachine" version="0" />
+    <language slang="l:41911c23-eb23-4ee6-872f-bc7f7ebce290:com.mbeddr.ext.components.test" version="0" />
+    <language slang="l:54f2a59b-97bb-4c09-af92-928ebf9c5966:com.mbeddr.ext.compositecomponents" version="0" />
+    <language slang="l:564e97d6-8fb7-41f5-bfc1-c7ed376efd62:com.mbeddr.ext.statemachines" version="0" />
+    <language slang="l:0d04a6cc-773e-4069-b9b0-11884b2ff1c8:com.mbeddr.ext.units" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
+    <language slang="l:1c897ba5-9d43-4035-ac7f-0306495743ac:com.mbeddr.mpsutil.interpreter.test" version="0" />
+    <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
+    <language slang="l:92f195b6-a209-4804-ad65-f5248ecd5873:com.mbeddr.mpsutil.margincell" version="0" />
+    <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
+    <language slang="l:c788b046-2019-4656-8b60-8bb9bbb177b5:com.mbeddr.mpsutil.review" version="0" />
+    <language slang="l:7a060fae-09e0-4372-be36-6696d6554c0e:com.mbeddr.mpsutil.review.annotation" version="0" />
+    <language slang="l:c1c2a88a-323c-4605-a37d-9ab77a2ccbd2:com.mbeddr.mpsutil.suppresswarning" version="0" />
+    <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" version="0" />
+    <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="0" />
+    <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
+    <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
+    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:86ef8290-12bb-4ca7-947f-093788f263a9:jetbrains.mps.lang.project" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="2" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="1" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
+    <language slang="l:3c4c8461-a533-4459-916a-dc0176793b4c:mbeddr.arduino.core" version="0" />
+    <language slang="l:e562f51e-6403-4857-b773-44632077c67d:mbeddr.arduino.interrupts" version="0" />
+    <language slang="l:3828799d-97c8-48d0-af8b-39b903457e1e:mbeddr.arduino.registers" version="0" />
+    <language slang="l:028007ba-e266-4d05-ab46-25264b977671:mbeddr.arduino.statemachine" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -117,6 +117,7 @@
     <module reference="a9d69647-0840-491e-bf39-2eb0805d2011(com.mbeddr.core.statements)" version="0" />
     <module reference="efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt)" version="0" />
     <module reference="2693fc71-9b0e-4b05-ab13-f57227d675f2(com.mbeddr.core.util)" version="0" />
+    <module reference="30d40e06-2249-4bd3-b8ab-109459f5021f(com.mbeddr.ext.units.runtime)" version="0" />
     <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
     <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
     <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
diff --git a/solutions/arduino.samples/models/arduino/samples/Atomic/.model b/solutions/arduino.samples/models/arduino/samples/Atomic/.model
old mode 100644
new mode 100755
diff --git a/solutions/arduino.samples/models/arduino/samples/Atomic/Atomic.mpsr b/solutions/arduino.samples/models/arduino/samples/Atomic/Atomic.mpsr
old mode 100644
new mode 100755
diff --git a/solutions/arduino.samples/models/arduino/samples/Atomic/BuildConfiguration (a.s.Atomic).mpsr b/solutions/arduino.samples/models/arduino/samples/Atomic/BuildConfiguration (a.s.Atomic).mpsr
old mode 100644
new mode 100755
index 0bbcdf0..c41b09e
--- a/solutions/arduino.samples/models/arduino/samples/Atomic/BuildConfiguration (a.s.Atomic).mpsr	
+++ b/solutions/arduino.samples/models/arduino/samples/Atomic/BuildConfiguration (a.s.Atomic).mpsr	
@@ -59,10 +59,10 @@
         <ref role="2v9HqP" node="1pOg3uxo5VV" resolve="Atomic" />
       </node>
       <node concept="2v9HqM" id="Yv2B6LBPQx" role="2eOfOg">
-        <ref role="2v9HqP" to="aelz:Yv2B6LBx6X" resolve="avr_io" />
+        <ref role="2v9HqP" to="aelz:4kqxgPFWhL7" resolve="avr_io" />
       </node>
       <node concept="2v9HqM" id="55_53lUxgHC" role="2eOfOg">
-        <ref role="2v9HqP" to="aelz:Yv2B6LBx6Z" resolve="avr_interrupt" />
+        <ref role="2v9HqP" to="aelz:3kpMhm4HRQv" resolve="avr_interrupt" />
       </node>
     </node>
     <node concept="A5USz" id="EvPvZE4n_e" role="2Q9xDr">
diff --git a/solutions/arduino.samples/models/arduino/samples/Atomic/TypeSizeConfiguration (a.s.Atomic).mpsr b/solutions/arduino.samples/models/arduino/samples/Atomic/TypeSizeConfiguration (a.s.Atomic).mpsr
old mode 100644
new mode 100755
diff --git a/solutions/arduino.samples/models/arduino/samples/statemachine/.model b/solutions/arduino.samples/models/arduino/samples/statemachine/.model
old mode 100644
new mode 100755
diff --git a/solutions/arduino.samples/models/arduino/samples/statemachine/BuildConfiguration (a.s.statemachine).mpsr b/solutions/arduino.samples/models/arduino/samples/statemachine/BuildConfiguration (a.s.statemachine).mpsr
old mode 100644
new mode 100755
index 6d46500..4ee191e
--- a/solutions/arduino.samples/models/arduino/samples/statemachine/BuildConfiguration (a.s.statemachine).mpsr	
+++ b/solutions/arduino.samples/models/arduino/samples/statemachine/BuildConfiguration (a.s.statemachine).mpsr	
@@ -90,10 +90,10 @@
         <ref role="2v9HqP" node="1pOg3uxo5VV" resolve="Statemachine" />
       </node>
       <node concept="2v9HqM" id="2LVOPcbj4vD" role="2eOfOg">
-        <ref role="2v9HqP" to="aelz:Yv2B6LBx6X" resolve="avr_io" />
+        <ref role="2v9HqP" to="aelz:4kqxgPFWhL7" resolve="avr_io" />
       </node>
       <node concept="2v9HqM" id="2LVOPcbj4vE" role="2eOfOg">
-        <ref role="2v9HqP" to="aelz:Yv2B6LBx6Z" resolve="avr_interrupt" />
+        <ref role="2v9HqP" to="aelz:3kpMhm4HRQv" resolve="avr_interrupt" />
       </node>
     </node>
     <node concept="24Uyqy" id="EvPvZE4n_d" role="2AWWZH">
diff --git a/solutions/arduino.samples/models/arduino/samples/statemachine/Statemachine.mpsr b/solutions/arduino.samples/models/arduino/samples/statemachine/Statemachine.mpsr
old mode 100644
new mode 100755
index 755061d..7bdb5a4
--- a/solutions/arduino.samples/models/arduino/samples/statemachine/Statemachine.mpsr
+++ b/solutions/arduino.samples/models/arduino/samples/statemachine/Statemachine.mpsr
@@ -154,7 +154,7 @@
       <node concept="3XIRFW" id="1pOg3uxo5WB" role="3XIRFX">
         <node concept="1_9egQ" id="2LVOPcbdblj" role="3XIRFZ">
           <node concept="BUAnR" id="2LVOPcbdbli" role="1_9egR">
-            <ref role="BUAnL" to="aelz:Yv2B6LBx7c" resolve="cli" />
+            <ref role="BUAnL" to="aelz:3kpMhm4HV5o" resolve="cli" />
           </node>
         </node>
         <node concept="3XISUE" id="2LVOPcbcBwg" role="3XIRFZ" />
@@ -292,7 +292,7 @@
         </node>
         <node concept="1_9egQ" id="2LVOPcbcg04" role="3XIRFZ">
           <node concept="BUAnR" id="2LVOPcbcg03" role="1_9egR">
-            <ref role="BUAnL" to="aelz:Yv2B6LBx78" resolve="sei" />
+            <ref role="BUAnL" to="aelz:3kpMhm4HVKL" resolve="sei" />
           </node>
         </node>
         <node concept="3XISUE" id="2LVOPcba_3Q" role="3XIRFZ" />
@@ -379,7 +379,7 @@
     </node>
     <node concept="3GEVxB" id="1ZYgP9nhm9J" role="2OODSX">
       <property role="3GEa6x" value="false" />
-      <ref role="3GEb4d" to="aelz:Yv2B6LBx6Z" resolve="avr_interrupt" />
+      <ref role="3GEb4d" to="aelz:3kpMhm4HRQv" resolve="avr_interrupt" />
     </node>
   </node>
 </model>
diff --git a/solutions/arduino.samples/models/arduino/samples/statemachine/TypeSizeConfiguration (a.s.statemachine).mpsr b/solutions/arduino.samples/models/arduino/samples/statemachine/TypeSizeConfiguration (a.s.statemachine).mpsr
old mode 100644
new mode 100755
diff --git a/solutions/arduino.samples/models/arduino/samples/weather/.model b/solutions/arduino.samples/models/arduino/samples/weather/.model
old mode 100644
new mode 100755
diff --git a/solutions/arduino.samples/models/arduino/samples/weather/BuildConfiguration (a.s.weather).mpsr b/solutions/arduino.samples/models/arduino/samples/weather/BuildConfiguration (a.s.weather).mpsr
old mode 100644
new mode 100755
index 541790d..9756955
--- a/solutions/arduino.samples/models/arduino/samples/weather/BuildConfiguration (a.s.weather).mpsr	
+++ b/solutions/arduino.samples/models/arduino/samples/weather/BuildConfiguration (a.s.weather).mpsr	
@@ -80,10 +80,10 @@
         <ref role="2v9HqP" to="aelz:Yv2B6LBx6E" resolve="util_delay" />
       </node>
       <node concept="2v9HqM" id="3dH4Jop6nO6" role="2eOfOg">
-        <ref role="2v9HqP" to="aelz:Yv2B6LBx6Z" resolve="avr_interrupt" />
+        <ref role="2v9HqP" to="aelz:3kpMhm4HRQv" resolve="avr_interrupt" />
       </node>
       <node concept="2v9HqM" id="3dH4Jop6nO7" role="2eOfOg">
-        <ref role="2v9HqP" to="aelz:Yv2B6LBx6X" resolve="avr_io" />
+        <ref role="2v9HqP" to="aelz:4kqxgPFWhL7" resolve="avr_io" />
       </node>
       <node concept="2v9HqM" id="4u2wEbSzZdD" role="2eOfOg">
         <ref role="2v9HqP" to="1o4w:6RZtz2lxDoM" resolve="uno" />
diff --git a/solutions/arduino.samples/models/arduino/samples/weather/TypeSizeConfiguration (a.s.weather).mpsr b/solutions/arduino.samples/models/arduino/samples/weather/TypeSizeConfiguration (a.s.weather).mpsr
old mode 100644
new mode 100755
diff --git a/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd b/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd
old mode 100644
new mode 100755
index a1963ff..6798de1
--- a/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd
+++ b/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd
@@ -11,13 +11,7 @@
     <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
   </dependencies>
   <languageVersions>
-    <language id="798100da-4f0a-421a-b991-71f8c50ce5d2" fqName="jetbrains.mps.build" version="0" />
-    <language id="0cf935df-4699-4e9c-a132-fa109541cba3" fqName="jetbrains.mps.build.mps" version="1" />
-    <language id="698a8d22-a104-47a0-ba8d-10e3ec237f13" fqName="jetbrains.mps.build.workflow" version="0" />
-    <language id="58f98fef-90ad-4b72-a390-fad66ec7005a" fqName="jetbrains.mps.core.properties" version="0" />
-    <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" fqName="jetbrains.mps.core.xml" version="0" />
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
   </languageVersions>
   <dependencyVersions>
     <module reference="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.slisson.mps.all.build)" version="0" />
diff --git a/solutions/mbeddr.arduino.header/mbeddr.arduino.header.msd b/solutions/mbeddr.arduino.header/mbeddr.arduino.header.msd
old mode 100644
new mode 100755
index 85160a2..356fea3
--- a/solutions/mbeddr.arduino.header/mbeddr.arduino.header.msd
+++ b/solutions/mbeddr.arduino.header/mbeddr.arduino.header.msd
@@ -10,47 +10,47 @@
     <usedDevKit>d2a9c55c-6bdc-4cc2-97e1-4ba7552f5584(com.mbeddr.core)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="2" />
-    <language id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" fqName="com.mbeddr.core.buildconfig" version="0" />
-    <language id="b2da2e1a-b542-47f5-9be0-4dc21efe74a4" fqName="com.mbeddr.core.checks" version="0" />
-    <language id="390de4af-0c8d-4716-8dec-3d05ca751b28" fqName="com.mbeddr.core.cinterpreter" version="0" />
-    <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
-    <language id="ebb5e132-d298-4649-b320-b3f4d7f3acff" fqName="com.mbeddr.core.debug.blext" version="0" />
-    <language id="783af01f-87a7-412c-be99-293a162652b5" fqName="com.mbeddr.core.embedded" version="0" />
-    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="2" />
-    <language id="ad5e9db1-9600-47c7-86ef-614165b281b8" fqName="com.mbeddr.core.legacy" version="0" />
-    <language id="f93d1dbe-bfd1-42dd-932a-f375fa6f5373" fqName="com.mbeddr.core.make" version="1" />
-    <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" fqName="com.mbeddr.core.modules" version="0" />
-    <language id="62296a07-bc38-46d2-8034-198c24063588" fqName="com.mbeddr.core.modules.gen" version="0" />
-    <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" fqName="com.mbeddr.core.pointers" version="0" />
-    <language id="a9d69647-0840-491e-bf39-2eb0805d2011" fqName="com.mbeddr.core.statements" version="1" />
-    <language id="efda956e-491e-4f00-ba14-36af2f213ecf" fqName="com.mbeddr.core.udt" version="1" />
-    <language id="06d68b77-b699-4918-83b8-857e63787800" fqName="com.mbeddr.core.unittest" version="1" />
-    <language id="2693fc71-9b0e-4b05-ab13-f57227d675f2" fqName="com.mbeddr.core.util" version="0" />
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
-    <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
-    <language id="1c897ba5-9d43-4035-ac7f-0306495743ac" fqName="com.mbeddr.mpsutil.interpreter.test" version="0" />
-    <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />
-    <language id="92f195b6-a209-4804-ad65-f5248ecd5873" fqName="com.mbeddr.mpsutil.margincell" version="0" />
-    <language id="b4d28e19-7d2d-47e9-943e-3a41f97a0e52" fqName="com.mbeddr.mpsutil.plantuml.node" version="0" />
-    <language id="c788b046-2019-4656-8b60-8bb9bbb177b5" fqName="com.mbeddr.mpsutil.review" version="0" />
-    <language id="7a060fae-09e0-4372-be36-6696d6554c0e" fqName="com.mbeddr.mpsutil.review.annotation" version="0" />
-    <language id="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2" fqName="com.mbeddr.mpsutil.suppresswarning" version="0" />
-    <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
-    <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
-    <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" fqName="jetbrains.mps.baseLanguage.unitTest" version="0" />
-    <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" fqName="jetbrains.mps.core.xml" version="0" />
-    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
-    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" fqName="jetbrains.mps.lang.behavior" version="0" />
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
-    <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
-    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
+    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
+    <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="1" />
+    <language slang="l:b2da2e1a-b542-47f5-9be0-4dc21efe74a4:com.mbeddr.core.checks" version="0" />
+    <language slang="l:390de4af-0c8d-4716-8dec-3d05ca751b28:com.mbeddr.core.cinterpreter" version="0" />
+    <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
+    <language slang="l:ebb5e132-d298-4649-b320-b3f4d7f3acff:com.mbeddr.core.debug.blext" version="0" />
+    <language slang="l:783af01f-87a7-412c-be99-293a162652b5:com.mbeddr.core.embedded" version="0" />
+    <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="3" />
+    <language slang="l:ad5e9db1-9600-47c7-86ef-614165b281b8:com.mbeddr.core.legacy" version="0" />
+    <language slang="l:f93d1dbe-bfd1-42dd-932a-f375fa6f5373:com.mbeddr.core.make" version="1" />
+    <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="4" />
+    <language slang="l:62296a07-bc38-46d2-8034-198c24063588:com.mbeddr.core.modules.gen" version="0" />
+    <language slang="l:3bf5377a-e904-4ded-9754-5a516023bfaa:com.mbeddr.core.pointers" version="0" />
+    <language slang="l:a9d69647-0840-491e-bf39-2eb0805d2011:com.mbeddr.core.statements" version="1" />
+    <language slang="l:efda956e-491e-4f00-ba14-36af2f213ecf:com.mbeddr.core.udt" version="1" />
+    <language slang="l:06d68b77-b699-4918-83b8-857e63787800:com.mbeddr.core.unittest" version="3" />
+    <language slang="l:2693fc71-9b0e-4b05-ab13-f57227d675f2:com.mbeddr.core.util" version="0" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
+    <language slang="l:1c897ba5-9d43-4035-ac7f-0306495743ac:com.mbeddr.mpsutil.interpreter.test" version="0" />
+    <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
+    <language slang="l:92f195b6-a209-4804-ad65-f5248ecd5873:com.mbeddr.mpsutil.margincell" version="0" />
+    <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
+    <language slang="l:c788b046-2019-4656-8b60-8bb9bbb177b5:com.mbeddr.mpsutil.review" version="0" />
+    <language slang="l:7a060fae-09e0-4372-be36-6696d6554c0e:com.mbeddr.mpsutil.review.annotation" version="0" />
+    <language slang="l:c1c2a88a-323c-4605-a37d-9ab77a2ccbd2:com.mbeddr.mpsutil.suppresswarning" version="0" />
+    <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="0" />
+    <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
+    <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
+    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="336a1564-6617-4b5b-84e7-3d25ed4b8c8c(mbeddr.arduino.header)" version="0" />
diff --git a/solutions/mbeddr.arduino.header/models/mbeddr/arduino/header/Import.mps b/solutions/mbeddr.arduino.header/models/mbeddr/arduino/header/Import.mps
old mode 100644
new mode 100755
index c4b6fd6..aa1164c
--- a/solutions/mbeddr.arduino.header/models/mbeddr/arduino/header/Import.mps
+++ b/solutions/mbeddr.arduino.header/models/mbeddr/arduino/header/Import.mps
@@ -15,6 +15,7 @@
       <concept id="6116558314501417934" name="com.mbeddr.core.modules.structure.ExternalResourceDescriptor" flags="ng" index="rcWEJ">
         <property id="6116558314501417936" name="path" index="rcWEL" />
       </concept>
+      <concept id="6021475212425916971" name="com.mbeddr.core.modules.structure.GlobalConstantFunctionDeclaration" flags="ng" index="BTY7A" />
       <concept id="3376775282622142916" name="com.mbeddr.core.modules.structure.AbstractDefineLike" flags="ng" index="2DRUVY">
         <child id="3376775282622233992" name="value" index="2DQcEM" />
       </concept>
@@ -32,6 +33,7 @@
         <property id="9066372830132870213" name="hasEllipsis" index="3owap8" />
       </concept>
       <concept id="6437088627575724000" name="com.mbeddr.core.modules.structure.FunctionPrototype" flags="ng" index="N3Fnw" />
+      <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
       <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
       <concept id="6708182213627045678" name="com.mbeddr.core.modules.structure.IExternable" flags="ng" index="3mNis0">
         <property id="6708182213627045681" name="extern" index="3mNisv" />
@@ -358,5 +360,33 @@
       <property role="rcWEL" value="&lt;util/delay.h&gt;" />
     </node>
   </node>
+  <node concept="rcWEw" id="3kpMhm4HRQv">
+    <property role="TrG5h" value="avr_interrupt" />
+    <property role="3GE5qa" value="avr" />
+    <node concept="rcWE1" id="3kpMhm4HV5d" role="rcWEr">
+      <property role="rcWEL" value="&lt;avr/interrupt.h&gt;" />
+    </node>
+    <node concept="BTY7A" id="3kpMhm4HV5o" role="N3F5h">
+      <property role="TrG5h" value="cli" />
+      <property role="2OOxQR" value="true" />
+    </node>
+    <node concept="BTY7A" id="3kpMhm4HVKL" role="N3F5h">
+      <property role="TrG5h" value="sei" />
+      <property role="2OOxQR" value="true" />
+    </node>
+    <node concept="2NXPZ9" id="3kpMhm4HVKI" role="N3F5h">
+      <property role="TrG5h" value="empty_1478082120384_10" />
+    </node>
+  </node>
+  <node concept="rcWEw" id="4kqxgPFWhL7">
+    <property role="TrG5h" value="avr_io" />
+    <property role="3GE5qa" value="avr" />
+    <node concept="rcWE1" id="4kqxgPFWhL8" role="rcWEr">
+      <property role="rcWEL" value="&lt;avr/io.h&gt;" />
+    </node>
+    <node concept="2NXPZ9" id="4kqxgPFWhLb" role="N3F5h">
+      <property role="TrG5h" value="empty_1478082120384_10" />
+    </node>
+  </node>
 </model>
 
diff --git a/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd b/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd
old mode 100644
new mode 100755
index 5f41dc8..ee53c40
--- a/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd
+++ b/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd
@@ -14,48 +14,7 @@
     <usedDevKit>d2a9c55c-6bdc-4cc2-97e1-4ba7552f5584(com.mbeddr.core)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="2" />
-    <language id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" fqName="com.mbeddr.core.buildconfig" version="0" />
-    <language id="b2da2e1a-b542-47f5-9be0-4dc21efe74a4" fqName="com.mbeddr.core.checks" version="0" />
-    <language id="390de4af-0c8d-4716-8dec-3d05ca751b28" fqName="com.mbeddr.core.cinterpreter" version="0" />
-    <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
-    <language id="ebb5e132-d298-4649-b320-b3f4d7f3acff" fqName="com.mbeddr.core.debug.blext" version="0" />
-    <language id="783af01f-87a7-412c-be99-293a162652b5" fqName="com.mbeddr.core.embedded" version="0" />
-    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="2" />
-    <language id="ad5e9db1-9600-47c7-86ef-614165b281b8" fqName="com.mbeddr.core.legacy" version="0" />
-    <language id="f93d1dbe-bfd1-42dd-932a-f375fa6f5373" fqName="com.mbeddr.core.make" version="1" />
-    <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" fqName="com.mbeddr.core.modules" version="0" />
-    <language id="62296a07-bc38-46d2-8034-198c24063588" fqName="com.mbeddr.core.modules.gen" version="0" />
-    <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" fqName="com.mbeddr.core.pointers" version="0" />
-    <language id="a9d69647-0840-491e-bf39-2eb0805d2011" fqName="com.mbeddr.core.statements" version="1" />
-    <language id="efda956e-491e-4f00-ba14-36af2f213ecf" fqName="com.mbeddr.core.udt" version="1" />
-    <language id="06d68b77-b699-4918-83b8-857e63787800" fqName="com.mbeddr.core.unittest" version="1" />
-    <language id="2693fc71-9b0e-4b05-ab13-f57227d675f2" fqName="com.mbeddr.core.util" version="0" />
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
-    <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
-    <language id="1c897ba5-9d43-4035-ac7f-0306495743ac" fqName="com.mbeddr.mpsutil.interpreter.test" version="0" />
-    <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />
-    <language id="92f195b6-a209-4804-ad65-f5248ecd5873" fqName="com.mbeddr.mpsutil.margincell" version="0" />
-    <language id="b4d28e19-7d2d-47e9-943e-3a41f97a0e52" fqName="com.mbeddr.mpsutil.plantuml.node" version="0" />
-    <language id="c788b046-2019-4656-8b60-8bb9bbb177b5" fqName="com.mbeddr.mpsutil.review" version="0" />
-    <language id="7a060fae-09e0-4372-be36-6696d6554c0e" fqName="com.mbeddr.mpsutil.review.annotation" version="0" />
-    <language id="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2" fqName="com.mbeddr.mpsutil.suppresswarning" version="0" />
-    <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
-    <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
-    <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" fqName="jetbrains.mps.baseLanguage.unitTest" version="0" />
-    <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" fqName="jetbrains.mps.core.xml" version="0" />
-    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
-    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" fqName="jetbrains.mps.lang.behavior" version="0" />
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
-    <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
-    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
-    <language id="3c4c8461-a533-4459-916a-dc0176793b4c" fqName="mbeddr.arduino.core" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
   </languageVersions>
   <dependencyVersions>
     <module reference="336a1564-6617-4b5b-84e7-3d25ed4b8c8c(mbeddr.arduino.header)" version="0" />

From 6c2472c015ed08f8fc9e17009e8be7893bb51348 Mon Sep 17 00:00:00 2001
From: danielratiu <ratiud@googlemail.com>
Date: Wed, 2 Nov 2016 13:03:16 +0100
Subject: [PATCH 03/48] migrated to MPS 3.4.1 - fixing concept casts

---
 .../generator/template/main@generator.mps     | 570 +++++++++---------
 .../languageModels/behavior.mps               | 135 ++---
 .../languageModels/constraints.mps            |  77 +--
 .../languageModels/intentions.mps             |  60 +-
 .../languageModels/typesystem.mps             |  57 +-
 .../arduino/core/pluginSolution/plugin.mps    |  47 +-
 .../generator/template/main@generator.mps     |  25 +-
 .../generator/template/main@generator.mps     |  33 +-
 .../languageModels/typesystem.mps             |  63 +-
 9 files changed, 534 insertions(+), 533 deletions(-)
 mode change 100644 => 100755 languages/mbeddr.arduino.core/languageModels/constraints.mps
 mode change 100644 => 100755 languages/mbeddr.arduino.core/languageModels/intentions.mps
 mode change 100644 => 100755 languages/mbeddr.arduino.core/languageModels/typesystem.mps
 mode change 100644 => 100755 languages/mbeddr.arduino.core/solutions/pluginSolution/models/mbeddr/arduino/core/pluginSolution/plugin.mps
 mode change 100644 => 100755 languages/mbeddr.arduino.interrupts/generator/template/main@generator.mps
 mode change 100644 => 100755 languages/mbeddr.arduino.registers/generator/template/main@generator.mps
 mode change 100644 => 100755 languages/mbeddr.arduino.statemachine/languageModels/typesystem.mps

diff --git a/languages/mbeddr.arduino.core/generator/template/mbeddr/arduino/core/generator/template/main@generator.mps b/languages/mbeddr.arduino.core/generator/template/mbeddr/arduino/core/generator/template/main@generator.mps
index a935be5..419da10 100755
--- a/languages/mbeddr.arduino.core/generator/template/mbeddr/arduino/core/generator/template/main@generator.mps
+++ b/languages/mbeddr.arduino.core/generator/template/mbeddr/arduino/core/generator/template/main@generator.mps
@@ -479,6 +479,10 @@
       <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+      </concept>
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
@@ -732,9 +736,9 @@
               <node concept="sxT6M" id="5aSlGxDtEfY" role="3cqZAp">
                 <property role="sxT66" value="name" />
                 <node concept="2OqwBi" id="5aSlGxDtEfZ" role="sxT64">
-                  <node concept="1PxgMI" id="5aSlGxDtEg0" role="2Oq$k0">
-                    <ref role="1PxNhF" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                    <node concept="30H73N" id="5aSlGxDtEg1" role="1PxMeX" />
+                  <node concept="1PxgMI" id="3tp$LrDyPrF" role="2Oq$k0">
+                    <ref role="1m5ApE" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                    <node concept="30H73N" id="3tp$LrDyOhk" role="1m5AlR" />
                   </node>
                   <node concept="3TrcHB" id="5aSlGxDtEg2" role="2OqNvi">
                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -996,11 +1000,11 @@
                                     <node concept="2OqwBi" id="26IgR5b9IvO" role="2Oq$k0">
                                       <node concept="2OqwBi" id="26IgR5b9IvP" role="2Oq$k0">
                                         <node concept="1eOMI4" id="26IgR5b9IvQ" role="2Oq$k0">
-                                          <node concept="1PxgMI" id="26IgR5b9IvR" role="1eOMHV">
-                                            <ref role="1PxNhF" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
-                                            <node concept="2OqwBi" id="26IgR5b9IvS" role="1PxMeX">
-                                              <node concept="30H73N" id="26IgR5b9IvT" role="2Oq$k0" />
-                                              <node concept="3TrEf2" id="26IgR5b9IvU" role="2OqNvi">
+                                          <node concept="1PxgMI" id="3tp$LrDy_jp" role="1eOMHV">
+                                            <ref role="1m5ApE" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
+                                            <node concept="2OqwBi" id="3tp$LrDy_jq" role="1m5AlR">
+                                              <node concept="30H73N" id="3tp$LrDy_jr" role="2Oq$k0" />
+                                              <node concept="3TrEf2" id="3tp$LrDy_js" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                                               </node>
                                             </node>
@@ -1044,11 +1048,11 @@
                                       <node concept="2OqwBi" id="26IgR5b9Iw9" role="2Oq$k0">
                                         <node concept="2OqwBi" id="26IgR5b9Iwa" role="2Oq$k0">
                                           <node concept="1eOMI4" id="26IgR5b9Iwb" role="2Oq$k0">
-                                            <node concept="1PxgMI" id="26IgR5b9Iwc" role="1eOMHV">
-                                              <ref role="1PxNhF" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
-                                              <node concept="2OqwBi" id="26IgR5b9Iwd" role="1PxMeX">
-                                                <node concept="30H73N" id="26IgR5b9Iwe" role="2Oq$k0" />
-                                                <node concept="3TrEf2" id="26IgR5b9Iwf" role="2OqNvi">
+                                            <node concept="1PxgMI" id="3tp$LrDyAqI" role="1eOMHV">
+                                              <ref role="1m5ApE" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
+                                              <node concept="2OqwBi" id="3tp$LrDyAqJ" role="1m5AlR">
+                                                <node concept="30H73N" id="3tp$LrDyAqK" role="2Oq$k0" />
+                                                <node concept="3TrEf2" id="3tp$LrDyC4q" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
                                                 </node>
                                               </node>
@@ -1102,9 +1106,9 @@
                                           <node concept="2OqwBi" id="26IgR5b9Iww" role="2Oq$k0">
                                             <node concept="2OqwBi" id="26IgR5b9Iwx" role="2Oq$k0">
                                               <node concept="1eOMI4" id="26IgR5b9Iwy" role="2Oq$k0">
-                                                <node concept="1PxgMI" id="26IgR5b9Iwz" role="1eOMHV">
-                                                  <ref role="1PxNhF" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
-                                                  <node concept="2OqwBi" id="26IgR5b9Iw$" role="1PxMeX">
+                                                <node concept="1PxgMI" id="3tp$LrDywIZ" role="1eOMHV">
+                                                  <ref role="1m5ApE" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
+                                                  <node concept="2OqwBi" id="26IgR5b9Iw$" role="1m5AlR">
                                                     <node concept="30H73N" id="26IgR5b9Iw_" role="2Oq$k0" />
                                                     <node concept="3TrEf2" id="26IgR5b9IwA" role="2OqNvi">
                                                       <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
@@ -1160,11 +1164,11 @@
                                             <node concept="2OqwBi" id="26IgR5b9IwR" role="2Oq$k0">
                                               <node concept="2OqwBi" id="26IgR5b9IwS" role="2Oq$k0">
                                                 <node concept="1eOMI4" id="26IgR5b9IwT" role="2Oq$k0">
-                                                  <node concept="1PxgMI" id="26IgR5b9IwU" role="1eOMHV">
-                                                    <ref role="1PxNhF" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
-                                                    <node concept="2OqwBi" id="26IgR5b9IwV" role="1PxMeX">
-                                                      <node concept="30H73N" id="26IgR5b9IwW" role="2Oq$k0" />
-                                                      <node concept="3TrEf2" id="26IgR5b9IwX" role="2OqNvi">
+                                                  <node concept="1PxgMI" id="3tp$LrDyz7w" role="1eOMHV">
+                                                    <ref role="1m5ApE" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
+                                                    <node concept="2OqwBi" id="3tp$LrDyz7x" role="1m5AlR">
+                                                      <node concept="30H73N" id="3tp$LrDyz7y" role="2Oq$k0" />
+                                                      <node concept="3TrEf2" id="3tp$LrDy$Mk" role="2OqNvi">
                                                         <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
                                                       </node>
                                                     </node>
@@ -1277,11 +1281,11 @@
                                     <node concept="2OqwBi" id="2mpt1xbRf1P" role="2Oq$k0">
                                       <node concept="2OqwBi" id="2mpt1xbRf1Q" role="2Oq$k0">
                                         <node concept="1eOMI4" id="2mpt1xbRf1R" role="2Oq$k0">
-                                          <node concept="1PxgMI" id="2mpt1xbRf1S" role="1eOMHV">
-                                            <ref role="1PxNhF" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
-                                            <node concept="2OqwBi" id="2mpt1xbRf1T" role="1PxMeX">
-                                              <node concept="30H73N" id="2mpt1xbRf1U" role="2Oq$k0" />
-                                              <node concept="3TrEf2" id="2mpt1xbRf1V" role="2OqNvi">
+                                          <node concept="1PxgMI" id="3tp$LrDyKop" role="1eOMHV">
+                                            <ref role="1m5ApE" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
+                                            <node concept="2OqwBi" id="3tp$LrDyKoq" role="1m5AlR">
+                                              <node concept="30H73N" id="3tp$LrDyKor" role="2Oq$k0" />
+                                              <node concept="3TrEf2" id="3tp$LrDyKos" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                                               </node>
                                             </node>
@@ -1325,11 +1329,11 @@
                                       <node concept="2OqwBi" id="2mpt1xbRf2a" role="2Oq$k0">
                                         <node concept="2OqwBi" id="2mpt1xbRf2b" role="2Oq$k0">
                                           <node concept="1eOMI4" id="2mpt1xbRf2c" role="2Oq$k0">
-                                            <node concept="1PxgMI" id="2mpt1xbRf2d" role="1eOMHV">
-                                              <ref role="1PxNhF" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
-                                              <node concept="2OqwBi" id="2mpt1xbRf2e" role="1PxMeX">
-                                                <node concept="30H73N" id="2mpt1xbRf2f" role="2Oq$k0" />
-                                                <node concept="3TrEf2" id="2mpt1xbRf2g" role="2OqNvi">
+                                            <node concept="1PxgMI" id="3tp$LrDyLWT" role="1eOMHV">
+                                              <ref role="1m5ApE" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
+                                              <node concept="2OqwBi" id="3tp$LrDyLWU" role="1m5AlR">
+                                                <node concept="30H73N" id="3tp$LrDyLWV" role="2Oq$k0" />
+                                                <node concept="3TrEf2" id="3tp$LrDyNGe" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
                                                 </node>
                                               </node>
@@ -1383,11 +1387,11 @@
                                           <node concept="2OqwBi" id="4sbNL4NzSLS" role="2Oq$k0">
                                             <node concept="2OqwBi" id="4sbNL4NzSLT" role="2Oq$k0">
                                               <node concept="1eOMI4" id="4sbNL4NzSLU" role="2Oq$k0">
-                                                <node concept="1PxgMI" id="4sbNL4NzSLV" role="1eOMHV">
-                                                  <ref role="1PxNhF" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
-                                                  <node concept="2OqwBi" id="4sbNL4NzSLW" role="1PxMeX">
-                                                    <node concept="30H73N" id="4sbNL4NzSLX" role="2Oq$k0" />
-                                                    <node concept="3TrEf2" id="4sbNL4NzSLY" role="2OqNvi">
+                                                <node concept="1PxgMI" id="3tp$LrDyHrY" role="1eOMHV">
+                                                  <ref role="1m5ApE" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
+                                                  <node concept="2OqwBi" id="3tp$LrDyHrZ" role="1m5AlR">
+                                                    <node concept="30H73N" id="3tp$LrDyHs0" role="2Oq$k0" />
+                                                    <node concept="3TrEf2" id="3tp$LrDyHs1" role="2OqNvi">
                                                       <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                                                     </node>
                                                   </node>
@@ -1441,11 +1445,11 @@
                                             <node concept="2OqwBi" id="4sbNL4NzSMh" role="2Oq$k0">
                                               <node concept="2OqwBi" id="4sbNL4NzSMi" role="2Oq$k0">
                                                 <node concept="1eOMI4" id="4sbNL4NzSMj" role="2Oq$k0">
-                                                  <node concept="1PxgMI" id="4sbNL4NzSMk" role="1eOMHV">
-                                                    <ref role="1PxNhF" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
-                                                    <node concept="2OqwBi" id="4sbNL4NzSMl" role="1PxMeX">
-                                                      <node concept="30H73N" id="4sbNL4NzSMm" role="2Oq$k0" />
-                                                      <node concept="3TrEf2" id="4sbNL4NzSMn" role="2OqNvi">
+                                                  <node concept="1PxgMI" id="3tp$LrDyIwN" role="1eOMHV">
+                                                    <ref role="1m5ApE" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
+                                                    <node concept="2OqwBi" id="3tp$LrDyIwO" role="1m5AlR">
+                                                      <node concept="30H73N" id="3tp$LrDyIwP" role="2Oq$k0" />
+                                                      <node concept="3TrEf2" id="3tp$LrDyJTk" role="2OqNvi">
                                                         <ref role="3Tt5mk" to="mj1l:7FQByU3CrD1" resolve="right" />
                                                       </node>
                                                     </node>
@@ -1558,11 +1562,11 @@
                                     <node concept="2OqwBi" id="4sbNL4NzU6C" role="2Oq$k0">
                                       <node concept="2OqwBi" id="4sbNL4NzU6D" role="2Oq$k0">
                                         <node concept="1eOMI4" id="4sbNL4NzU6E" role="2Oq$k0">
-                                          <node concept="1PxgMI" id="4sbNL4NzU6F" role="1eOMHV">
-                                            <ref role="1PxNhF" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
-                                            <node concept="2OqwBi" id="4sbNL4NzU6G" role="1PxMeX">
-                                              <node concept="30H73N" id="4sbNL4NzU6H" role="2Oq$k0" />
-                                              <node concept="3TrEf2" id="4sbNL4NzU6I" role="2OqNvi">
+                                          <node concept="1PxgMI" id="3tp$LrDyC$F" role="1eOMHV">
+                                            <ref role="1m5ApE" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
+                                            <node concept="2OqwBi" id="3tp$LrDyC$G" role="1m5AlR">
+                                              <node concept="30H73N" id="3tp$LrDyC$H" role="2Oq$k0" />
+                                              <node concept="3TrEf2" id="3tp$LrDyC$I" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                                               </node>
                                             </node>
@@ -1622,11 +1626,11 @@
                               <node concept="2OqwBi" id="26IgR5b9HUN" role="2Oq$k0">
                                 <node concept="2OqwBi" id="26IgR5b9HUO" role="2Oq$k0">
                                   <node concept="1eOMI4" id="26IgR5b9HUP" role="2Oq$k0">
-                                    <node concept="1PxgMI" id="26IgR5b9HUQ" role="1eOMHV">
-                                      <ref role="1PxNhF" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
-                                      <node concept="2OqwBi" id="26IgR5b9HUR" role="1PxMeX">
-                                        <node concept="30H73N" id="26IgR5b9HUS" role="2Oq$k0" />
-                                        <node concept="3TrEf2" id="26IgR5b9HUT" role="2OqNvi">
+                                    <node concept="1PxgMI" id="3tp$LrDyD$h" role="1eOMHV">
+                                      <ref role="1m5ApE" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
+                                      <node concept="2OqwBi" id="3tp$LrDyD$i" role="1m5AlR">
+                                        <node concept="30H73N" id="3tp$LrDyD$j" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="3tp$LrDyD$k" role="2OqNvi">
                                           <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                                         </node>
                                       </node>
@@ -1722,11 +1726,11 @@
                                     <node concept="2OqwBi" id="4sbNL4NzV6f" role="2Oq$k0">
                                       <node concept="2OqwBi" id="4sbNL4NzV6g" role="2Oq$k0">
                                         <node concept="1eOMI4" id="4sbNL4NzV6h" role="2Oq$k0">
-                                          <node concept="1PxgMI" id="4sbNL4NzV6i" role="1eOMHV">
-                                            <ref role="1PxNhF" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
-                                            <node concept="2OqwBi" id="4sbNL4NzV6j" role="1PxMeX">
-                                              <node concept="30H73N" id="4sbNL4NzV6k" role="2Oq$k0" />
-                                              <node concept="3TrEf2" id="4sbNL4NzV6l" role="2OqNvi">
+                                          <node concept="1PxgMI" id="3tp$LrDyEte" role="1eOMHV">
+                                            <ref role="1m5ApE" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
+                                            <node concept="2OqwBi" id="3tp$LrDyEtf" role="1m5AlR">
+                                              <node concept="30H73N" id="3tp$LrDyEtg" role="2Oq$k0" />
+                                              <node concept="3TrEf2" id="3tp$LrDyEth" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                                               </node>
                                             </node>
@@ -1787,11 +1791,11 @@
                                 <node concept="2OqwBi" id="26IgR5b9HXX" role="2Oq$k0">
                                   <node concept="2OqwBi" id="26IgR5b9HXY" role="2Oq$k0">
                                     <node concept="1eOMI4" id="26IgR5b9HXZ" role="2Oq$k0">
-                                      <node concept="1PxgMI" id="26IgR5b9HY0" role="1eOMHV">
-                                        <ref role="1PxNhF" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
-                                        <node concept="2OqwBi" id="26IgR5b9HY1" role="1PxMeX">
-                                          <node concept="30H73N" id="26IgR5b9HY2" role="2Oq$k0" />
-                                          <node concept="3TrEf2" id="26IgR5b9HY3" role="2OqNvi">
+                                      <node concept="1PxgMI" id="3tp$LrDyG3O" role="1eOMHV">
+                                        <ref role="1m5ApE" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
+                                        <node concept="2OqwBi" id="3tp$LrDyG3P" role="1m5AlR">
+                                          <node concept="30H73N" id="3tp$LrDyG3Q" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="3tp$LrDyG3R" role="2OqNvi">
                                             <ref role="3Tt5mk" to="mj1l:7FQByU3CrD0" resolve="left" />
                                           </node>
                                         </node>
@@ -2204,9 +2208,9 @@
                               <node concept="2OqwBi" id="26IgR5bai$$" role="2Oq$k0">
                                 <node concept="2OqwBi" id="26IgR5bai$_" role="2Oq$k0">
                                   <node concept="1eOMI4" id="26IgR5bai$A" role="2Oq$k0">
-                                    <node concept="1PxgMI" id="26IgR5bai$B" role="1eOMHV">
-                                      <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                                      <node concept="2OqwBi" id="26IgR5bai$C" role="1PxMeX">
+                                    <node concept="1PxgMI" id="3tp$LrDxOhg" role="1eOMHV">
+                                      <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                                      <node concept="2OqwBi" id="26IgR5bai$C" role="1m5AlR">
                                         <node concept="37vLTw" id="2GeljgL483r" role="2Oq$k0">
                                           <ref role="3cqZAo" node="26IgR5bai$q" resolve="bc" />
                                         </node>
@@ -2216,7 +2220,7 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="3TrEf2" id="26IgR5bai$F" role="2OqNvi">
+                                  <node concept="3TrEf2" id="3tp$LrDxQ9c" role="2OqNvi">
                                     <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
                                   </node>
                                 </node>
@@ -2562,9 +2566,9 @@
                               <node concept="2OqwBi" id="1pOg3uxo2wE" role="2Oq$k0">
                                 <node concept="2OqwBi" id="1pOg3uxo2wF" role="2Oq$k0">
                                   <node concept="1eOMI4" id="1pOg3uxo2wG" role="2Oq$k0">
-                                    <node concept="1PxgMI" id="1pOg3uxo2wH" role="1eOMHV">
-                                      <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                                      <node concept="2OqwBi" id="1pOg3uxo2wI" role="1PxMeX">
+                                    <node concept="1PxgMI" id="3tp$LrDxW3e" role="1eOMHV">
+                                      <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                                      <node concept="2OqwBi" id="1pOg3uxo2wI" role="1m5AlR">
                                         <node concept="37vLTw" id="2GeljgL484M" role="2Oq$k0">
                                           <ref role="3cqZAo" node="1pOg3uxo2wu" resolve="bc" />
                                         </node>
@@ -2574,7 +2578,7 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="3TrEf2" id="1pOg3uxo2wL" role="2OqNvi">
+                                  <node concept="3TrEf2" id="3tp$LrDxXYZ" role="2OqNvi">
                                     <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
                                   </node>
                                 </node>
@@ -3091,20 +3095,20 @@
                                         </node>
                                         <node concept="FJ1c_" id="7fU3Y2eze6t" role="3uHU7B">
                                           <node concept="2OqwBi" id="7fU3Y2exGzk" role="3uHU7B">
-                                            <node concept="1PxgMI" id="7fU3Y2exFEC" role="2Oq$k0">
-                                              <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                                              <node concept="2OqwBi" id="7fU3Y2exABd" role="1PxMeX">
-                                                <node concept="37vLTw" id="7fU3Y2exAhc" role="2Oq$k0">
+                                            <node concept="2qgKlT" id="7fU3Y2ezbE9" role="2OqNvi">
+                                              <ref role="37wK5l" to="7ord:7fU3Y2exR5v" resolve="getCpuSpeedInt" />
+                                            </node>
+                                            <node concept="1PxgMI" id="3tp$LrDyfXd" role="2Oq$k0">
+                                              <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                                              <node concept="2OqwBi" id="3tp$LrDyduE" role="1m5AlR">
+                                                <node concept="37vLTw" id="3tp$LrDycv9" role="2Oq$k0">
                                                   <ref role="3cqZAo" node="7fU3Y2ex_II" resolve="bc" />
                                                 </node>
-                                                <node concept="3TrEf2" id="7fU3Y2exDCe" role="2OqNvi">
+                                                <node concept="3TrEf2" id="3tp$LrDyeA8" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="2qgKlT" id="7fU3Y2ezbE9" role="2OqNvi">
-                                              <ref role="37wK5l" to="7ord:7fU3Y2exR5v" resolve="getCpuSpeedInt" />
-                                            </node>
                                           </node>
                                           <node concept="1eOMI4" id="7fU3Y2ezzMJ" role="3uHU7w">
                                             <node concept="17qRlL" id="7fU3Y2ezv3$" role="1eOMHV">
@@ -3215,9 +3219,12 @@
                                       </node>
                                       <node concept="FJ1c_" id="7fU3Y2ezPTT" role="3uHU7B">
                                         <node concept="2OqwBi" id="7fU3Y2ezPTU" role="3uHU7B">
-                                          <node concept="1PxgMI" id="7fU3Y2ezPTV" role="2Oq$k0">
-                                            <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                                            <node concept="2OqwBi" id="7fU3Y2ezPTW" role="1PxMeX">
+                                          <node concept="2qgKlT" id="7fU3Y2ezPTZ" role="2OqNvi">
+                                            <ref role="37wK5l" to="7ord:7fU3Y2exR5v" resolve="getCpuSpeedInt" />
+                                          </node>
+                                          <node concept="1PxgMI" id="3tp$LrDyjxO" role="2Oq$k0">
+                                            <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                                            <node concept="2OqwBi" id="7fU3Y2ezPTW" role="1m5AlR">
                                               <node concept="37vLTw" id="7fU3Y2ezPTX" role="2Oq$k0">
                                                 <ref role="3cqZAo" node="7fU3Y2ezPTG" resolve="bc" />
                                               </node>
@@ -3226,9 +3233,6 @@
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="2qgKlT" id="7fU3Y2ezPTZ" role="2OqNvi">
-                                            <ref role="37wK5l" to="7ord:7fU3Y2exR5v" resolve="getCpuSpeedInt" />
-                                          </node>
                                         </node>
                                         <node concept="1eOMI4" id="7fU3Y2ezPU0" role="3uHU7w">
                                           <node concept="17qRlL" id="7fU3Y2ezPU1" role="1eOMHV">
@@ -3418,11 +3422,11 @@
               <node concept="3Tqbb2" id="3YVME3YF6Py" role="1tU5fm">
                 <ref role="ehGHo" to="x27k:5_l8w1EmTvx" resolve="Function" />
               </node>
-              <node concept="1PxgMI" id="3YVME3YF6Pz" role="33vP2m">
-                <ref role="1PxNhF" to="x27k:5_l8w1EmTvx" resolve="Function" />
-                <node concept="2OqwBi" id="3YVME3YF6P$" role="1PxMeX">
-                  <node concept="30H73N" id="3YVME3YF6P_" role="2Oq$k0" />
-                  <node concept="1mfA1w" id="3YVME3YF6PA" role="2OqNvi" />
+              <node concept="1PxgMI" id="3tp$LrDyu2O" role="33vP2m">
+                <ref role="1m5ApE" to="x27k:5_l8w1EmTvx" resolve="Function" />
+                <node concept="2OqwBi" id="3tp$LrDys2A" role="1m5AlR">
+                  <node concept="30H73N" id="3tp$LrDyrCO" role="2Oq$k0" />
+                  <node concept="1mfA1w" id="3tp$LrDysTO" role="2OqNvi" />
                 </node>
               </node>
             </node>
@@ -3687,13 +3691,13 @@
                                     <node concept="2OqwBi" id="EvPvZE4eQB" role="2Oq$k0">
                                       <node concept="2OqwBi" id="EvPvZE4eQC" role="2Oq$k0">
                                         <node concept="1eOMI4" id="EvPvZE4eQD" role="2Oq$k0">
-                                          <node concept="1PxgMI" id="EvPvZE4eQE" role="1eOMHV">
-                                            <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                                            <node concept="2OqwBi" id="EvPvZE4eQF" role="1PxMeX">
-                                              <node concept="37vLTw" id="2GeljgL483B" role="2Oq$k0">
+                                          <node concept="1PxgMI" id="3tp$LrDynWv" role="1eOMHV">
+                                            <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                                            <node concept="2OqwBi" id="3tp$LrDylF1" role="1m5AlR">
+                                              <node concept="37vLTw" id="3tp$LrDylo4" role="2Oq$k0">
                                                 <ref role="3cqZAo" node="EvPvZE4eQr" resolve="bc" />
                                               </node>
-                                              <node concept="3TrEf2" id="EvPvZE4eQH" role="2OqNvi">
+                                              <node concept="3TrEf2" id="3tp$LrDymNP" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                                               </node>
                                             </node>
@@ -4255,9 +4259,9 @@
                 <node concept="17QB3L" id="2uTv4B9jFx2" role="1tU5fm" />
                 <node concept="2OqwBi" id="2uTv4B9jFxb" role="33vP2m">
                   <node concept="1eOMI4" id="2uTv4B9jFxc" role="2Oq$k0">
-                    <node concept="1PxgMI" id="2uTv4B9jFxd" role="1eOMHV">
-                      <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                      <node concept="2OqwBi" id="2uTv4B9jFxe" role="1PxMeX">
+                    <node concept="1PxgMI" id="3tp$LrDyYVs" role="1eOMHV">
+                      <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                      <node concept="2OqwBi" id="2uTv4B9jFxe" role="1m5AlR">
                         <node concept="30H73N" id="2uTv4B9jFxf" role="2Oq$k0" />
                         <node concept="3TrEf2" id="2uTv4B9jFxg" role="2OqNvi">
                           <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
@@ -4657,11 +4661,11 @@
                     </node>
                     <node concept="2OqwBi" id="22vbFi$tUl0" role="3uHU7w">
                       <node concept="1eOMI4" id="22vbFi$tUkF" role="2Oq$k0">
-                        <node concept="1PxgMI" id="22vbFi$tUjW" role="1eOMHV">
-                          <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                          <node concept="2OqwBi" id="22vbFi$tUjQ" role="1PxMeX">
-                            <node concept="30H73N" id="22vbFi$tUjn" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="22vbFi$tUjV" role="2OqNvi">
+                        <node concept="1PxgMI" id="3tp$LrDz1FL" role="1eOMHV">
+                          <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                          <node concept="2OqwBi" id="3tp$LrDz0kl" role="1m5AlR">
+                            <node concept="30H73N" id="3tp$LrDz01q" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="3tp$LrDz10L" role="2OqNvi">
                               <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                             </node>
                           </node>
@@ -4688,11 +4692,11 @@
                   <node concept="3cpWs3" id="22vbFi$tUlz" role="3clFbG">
                     <node concept="2OqwBi" id="22vbFi$tUn5" role="3uHU7w">
                       <node concept="1eOMI4" id="22vbFi$tUms" role="2Oq$k0">
-                        <node concept="1PxgMI" id="22vbFi$tUmm" role="1eOMHV">
-                          <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                          <node concept="2OqwBi" id="22vbFi$tUlV" role="1PxMeX">
-                            <node concept="30H73N" id="22vbFi$tUlA" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="22vbFi$tUm0" role="2OqNvi">
+                        <node concept="1PxgMI" id="3tp$LrDz2DI" role="1eOMHV">
+                          <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                          <node concept="2OqwBi" id="3tp$LrDz2DJ" role="1m5AlR">
+                            <node concept="30H73N" id="3tp$LrDz2DK" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="3tp$LrDz2DL" role="2OqNvi">
                               <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                             </node>
                           </node>
@@ -4725,11 +4729,11 @@
                     </node>
                     <node concept="2OqwBi" id="55_53lUxi1N" role="3uHU7w">
                       <node concept="1eOMI4" id="55_53lUxi1q" role="2Oq$k0">
-                        <node concept="1PxgMI" id="55_53lUxi1r" role="1eOMHV">
-                          <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                          <node concept="2OqwBi" id="55_53lUxi1s" role="1PxMeX">
-                            <node concept="30H73N" id="55_53lUxi1t" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="55_53lUxi1u" role="2OqNvi">
+                        <node concept="1PxgMI" id="3tp$LrDz3nO" role="1eOMHV">
+                          <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                          <node concept="2OqwBi" id="3tp$LrDz3nP" role="1m5AlR">
+                            <node concept="30H73N" id="3tp$LrDz3nQ" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="3tp$LrDz3nR" role="2OqNvi">
                               <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                             </node>
                           </node>
@@ -4755,11 +4759,11 @@
                 <node concept="3clFbF" id="22vbFi$uiis" role="3cqZAp">
                   <node concept="2OqwBi" id="22vbFi$uikB" role="3clFbG">
                     <node concept="1eOMI4" id="22vbFi$uiki" role="2Oq$k0">
-                      <node concept="1PxgMI" id="22vbFi$uijC" role="1eOMHV">
-                        <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                        <node concept="2OqwBi" id="22vbFi$uiiM" role="1PxMeX">
-                          <node concept="30H73N" id="22vbFi$uiit" role="2Oq$k0" />
-                          <node concept="3TrEf2" id="22vbFi$uiiR" role="2OqNvi">
+                      <node concept="1PxgMI" id="3tp$LrDz3IH" role="1eOMHV">
+                        <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                        <node concept="2OqwBi" id="3tp$LrDz3II" role="1m5AlR">
+                          <node concept="30H73N" id="3tp$LrDz3IJ" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="3tp$LrDz3IK" role="2OqNvi">
                             <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                           </node>
                         </node>
@@ -4943,18 +4947,18 @@
               <node concept="3clFbF" id="2nSRgleEQTL" role="3cqZAp">
                 <node concept="3cpWs3" id="2nSRgleEQTN" role="3clFbG">
                   <node concept="2OqwBi" id="2nSRgleEQTY" role="3uHU7w">
-                    <node concept="1PxgMI" id="2nSRgleEQTW" role="2Oq$k0">
-                      <ref role="1PxNhF" to="51wr:2nSRgleEPDw" resolve="IDebuggablePlatform" />
-                      <node concept="2OqwBi" id="2nSRgleEQTR" role="1PxMeX">
-                        <node concept="30H73N" id="2nSRgleEQTQ" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="2nSRgleEQTV" role="2OqNvi">
+                    <node concept="3TrcHB" id="2nSRgleEQU2" role="2OqNvi">
+                      <ref role="3TsBF5" to="51wr:2nSRgleEPDx" resolve="debugOptions" />
+                    </node>
+                    <node concept="1PxgMI" id="3tp$LrDz4jE" role="2Oq$k0">
+                      <ref role="1m5ApE" to="51wr:2nSRgleEPDw" resolve="IDebuggablePlatform" />
+                      <node concept="2OqwBi" id="3tp$LrDz4jF" role="1m5AlR">
+                        <node concept="30H73N" id="3tp$LrDz4jG" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="3tp$LrDz4jH" role="2OqNvi">
                           <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3TrcHB" id="2nSRgleEQU2" role="2OqNvi">
-                      <ref role="3TsBF5" to="51wr:2nSRgleEPDx" resolve="debugOptions" />
-                    </node>
                   </node>
                   <node concept="Xl_RD" id="2nSRgleEQTM" role="3uHU7B">
                     <property role="Xl_RC" value="CFLAGS +=" />
@@ -4972,18 +4976,18 @@
               <node concept="1Wc70l" id="2nSRgleEQUl" role="3clFbG">
                 <node concept="2OqwBi" id="2nSRgleEQU_" role="3uHU7w">
                   <node concept="2OqwBi" id="2nSRgleEQUw" role="2Oq$k0">
-                    <node concept="1PxgMI" id="2nSRgleEQUu" role="2Oq$k0">
-                      <ref role="1PxNhF" to="51wr:2nSRgleEPDw" resolve="IDebuggablePlatform" />
-                      <node concept="2OqwBi" id="2nSRgleEQUp" role="1PxMeX">
-                        <node concept="30H73N" id="2nSRgleEQUo" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="2nSRgleEQUt" role="2OqNvi">
+                    <node concept="3TrcHB" id="2nSRgleEQU$" role="2OqNvi">
+                      <ref role="3TsBF5" to="51wr:2nSRgleEPDx" resolve="debugOptions" />
+                    </node>
+                    <node concept="1PxgMI" id="3tp$LrDz50Y" role="2Oq$k0">
+                      <ref role="1m5ApE" to="51wr:2nSRgleEPDw" resolve="IDebuggablePlatform" />
+                      <node concept="2OqwBi" id="3tp$LrDz50Z" role="1m5AlR">
+                        <node concept="30H73N" id="3tp$LrDz510" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="3tp$LrDz511" role="2OqNvi">
                           <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3TrcHB" id="2nSRgleEQU$" role="2OqNvi">
-                      <ref role="3TsBF5" to="51wr:2nSRgleEPDx" resolve="debugOptions" />
-                    </node>
                   </node>
                   <node concept="17RvpY" id="2nSRgleEQUD" role="2OqNvi" />
                 </node>
@@ -5058,18 +5062,18 @@
               <node concept="1Wc70l" id="2nSRgleEQVq" role="3clFbG">
                 <node concept="2OqwBi" id="2nSRgleEQVr" role="3uHU7w">
                   <node concept="2OqwBi" id="2nSRgleEQVs" role="2Oq$k0">
-                    <node concept="1PxgMI" id="2nSRgleEQVt" role="2Oq$k0">
-                      <ref role="1PxNhF" to="51wr:2nSRgleEPDw" resolve="IDebuggablePlatform" />
-                      <node concept="2OqwBi" id="2nSRgleEQVu" role="1PxMeX">
-                        <node concept="30H73N" id="2nSRgleEQVv" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="2nSRgleEQVw" role="2OqNvi">
+                    <node concept="3TrcHB" id="2nSRgleEQVx" role="2OqNvi">
+                      <ref role="3TsBF5" to="51wr:2nSRgleEPDx" resolve="debugOptions" />
+                    </node>
+                    <node concept="1PxgMI" id="3tp$LrDz5Kr" role="2Oq$k0">
+                      <ref role="1m5ApE" to="51wr:2nSRgleEPDw" resolve="IDebuggablePlatform" />
+                      <node concept="2OqwBi" id="3tp$LrDz5Ks" role="1m5AlR">
+                        <node concept="30H73N" id="3tp$LrDz5Kt" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="3tp$LrDz5Ku" role="2OqNvi">
                           <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3TrcHB" id="2nSRgleEQVx" role="2OqNvi">
-                      <ref role="3TsBF5" to="51wr:2nSRgleEPDx" resolve="debugOptions" />
-                    </node>
                   </node>
                   <node concept="17RvpY" id="2nSRgleEQVy" role="2OqNvi" />
                 </node>
@@ -5347,11 +5351,11 @@
                 <node concept="3clFbF" id="1ZYgP9nkuNh" role="3cqZAp">
                   <node concept="2OqwBi" id="1ZYgP9nkuNj" role="3clFbG">
                     <node concept="1eOMI4" id="1ZYgP9nkuNk" role="2Oq$k0">
-                      <node concept="1PxgMI" id="1ZYgP9nkuNl" role="1eOMHV">
-                        <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                        <node concept="2OqwBi" id="1ZYgP9nkuNm" role="1PxMeX">
-                          <node concept="30H73N" id="1ZYgP9nkuNn" role="2Oq$k0" />
-                          <node concept="3TrEf2" id="1ZYgP9nkuNo" role="2OqNvi">
+                      <node concept="1PxgMI" id="3tp$LrDz5Uz" role="1eOMHV">
+                        <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                        <node concept="2OqwBi" id="3tp$LrDz5U$" role="1m5AlR">
+                          <node concept="30H73N" id="3tp$LrDz5U_" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="3tp$LrDz5UA" role="2OqNvi">
                             <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                           </node>
                         </node>
@@ -5379,18 +5383,18 @@
                       <property role="Xl_RC" value="-P " />
                     </node>
                     <node concept="2OqwBi" id="5eVJx9Df3qS" role="3uHU7w">
-                      <node concept="1PxgMI" id="5eVJx9Df3qT" role="2Oq$k0">
-                        <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                        <node concept="2OqwBi" id="5eVJx9Df3qU" role="1PxMeX">
-                          <node concept="30H73N" id="5eVJx9Df3qV" role="2Oq$k0" />
-                          <node concept="3TrEf2" id="5eVJx9Df3qW" role="2OqNvi">
+                      <node concept="3TrcHB" id="5eVJx9Df3qX" role="2OqNvi">
+                        <ref role="3TsBF5" to="koo2:6JYjBlsLOqI" resolve="serialPort" />
+                      </node>
+                      <node concept="1PxgMI" id="3tp$LrDz6uw" role="2Oq$k0">
+                        <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                        <node concept="2OqwBi" id="3tp$LrDz6ux" role="1m5AlR">
+                          <node concept="30H73N" id="3tp$LrDz6uy" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="3tp$LrDz6uz" role="2OqNvi">
                             <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                           </node>
                         </node>
                       </node>
-                      <node concept="3TrcHB" id="5eVJx9Df3qX" role="2OqNvi">
-                        <ref role="3TsBF5" to="koo2:6JYjBlsLOqI" resolve="serialPort" />
-                      </node>
                     </node>
                   </node>
                 </node>
@@ -5403,18 +5407,18 @@
                 <node concept="3clFbF" id="5eVJx9Df6mb" role="3cqZAp">
                   <node concept="2OqwBi" id="5eVJx9Df74h" role="3clFbG">
                     <node concept="2OqwBi" id="5eVJx9Df6md" role="2Oq$k0">
-                      <node concept="1PxgMI" id="5eVJx9Df6me" role="2Oq$k0">
-                        <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                        <node concept="2OqwBi" id="5eVJx9Df6mf" role="1PxMeX">
-                          <node concept="30H73N" id="5eVJx9Df6mg" role="2Oq$k0" />
-                          <node concept="3TrEf2" id="5eVJx9Df6mh" role="2OqNvi">
+                      <node concept="3TrcHB" id="5eVJx9Df6mi" role="2OqNvi">
+                        <ref role="3TsBF5" to="koo2:6JYjBlsLOqI" resolve="serialPort" />
+                      </node>
+                      <node concept="1PxgMI" id="3tp$LrDz66V" role="2Oq$k0">
+                        <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                        <node concept="2OqwBi" id="3tp$LrDz66W" role="1m5AlR">
+                          <node concept="30H73N" id="3tp$LrDz66X" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="3tp$LrDz66Y" role="2OqNvi">
                             <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                           </node>
                         </node>
                       </node>
-                      <node concept="3TrcHB" id="5eVJx9Df6mi" role="2OqNvi">
-                        <ref role="3TsBF5" to="koo2:6JYjBlsLOqI" resolve="serialPort" />
-                      </node>
                     </node>
                     <node concept="17RvpY" id="5eVJx9Df7QP" role="2OqNvi" />
                   </node>
@@ -5791,16 +5795,16 @@
                               <property role="Xl_RC" value="___" />
                             </node>
                             <node concept="2OqwBi" id="5oFMniD7s1C" role="3uHU7w">
-                              <node concept="1PxgMI" id="5oFMniD7s1A" role="2Oq$k0">
-                                <ref role="1PxNhF" to="k146:2lgwE2U2X_H" resolve="MessageDefinitionTable" />
-                                <node concept="2OqwBi" id="5oFMniD7s1x" role="1PxMeX">
+                              <node concept="3TrcHB" id="3tp$LrD_1rS" role="2OqNvi">
+                                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                              </node>
+                              <node concept="1PxgMI" id="3tp$LrD_0xK" role="2Oq$k0">
+                                <ref role="1m5ApE" to="k146:2lgwE2U2X_H" resolve="MessageDefinitionTable" />
+                                <node concept="2OqwBi" id="5oFMniD7s1x" role="1m5AlR">
                                   <node concept="30H73N" id="7fU3Y2eAJSS" role="2Oq$k0" />
                                   <node concept="1mfA1w" id="5oFMniD7s1_" role="2OqNvi" />
                                 </node>
                               </node>
-                              <node concept="3TrcHB" id="5oFMniD7s1G" role="2OqNvi">
-                                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                              </node>
                             </node>
                           </node>
                           <node concept="Xl_RD" id="5oFMniD7s1O" role="3uHU7w">
@@ -6169,9 +6173,12 @@
                                           <property role="Xl_RC" value="___" />
                                         </node>
                                         <node concept="2OqwBi" id="7fU3Y2eO7Vz" role="3uHU7w">
-                                          <node concept="1PxgMI" id="7fU3Y2eO7V$" role="2Oq$k0">
-                                            <ref role="1PxNhF" to="k146:2lgwE2U2X_H" resolve="MessageDefinitionTable" />
-                                            <node concept="2OqwBi" id="7fU3Y2eO7V_" role="1PxMeX">
+                                          <node concept="3TrcHB" id="3tp$LrD$WGx" role="2OqNvi">
+                                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                          </node>
+                                          <node concept="1PxgMI" id="3tp$LrD$VRb" role="2Oq$k0">
+                                            <ref role="1m5ApE" to="k146:2lgwE2U2X_H" resolve="MessageDefinitionTable" />
+                                            <node concept="2OqwBi" id="7fU3Y2eO7V_" role="1m5AlR">
                                               <node concept="2OqwBi" id="7fU3Y2eOoF1" role="2Oq$k0">
                                                 <node concept="2OqwBi" id="7fU3Y2eOgak" role="2Oq$k0">
                                                   <node concept="30H73N" id="7fU3Y2eO7VA" role="2Oq$k0" />
@@ -6186,9 +6193,6 @@
                                               <node concept="1mfA1w" id="7fU3Y2eO7VB" role="2OqNvi" />
                                             </node>
                                           </node>
-                                          <node concept="3TrcHB" id="7fU3Y2eO7VC" role="2OqNvi">
-                                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                          </node>
                                         </node>
                                       </node>
                                       <node concept="Xl_RD" id="7fU3Y2eO7VD" role="3uHU7w">
@@ -6563,9 +6567,12 @@
                                           <property role="Xl_RC" value="___" />
                                         </node>
                                         <node concept="2OqwBi" id="4Mvxa96veKC" role="3uHU7w">
-                                          <node concept="1PxgMI" id="4Mvxa96veKD" role="2Oq$k0">
-                                            <ref role="1PxNhF" to="k146:2lgwE2U2X_H" resolve="MessageDefinitionTable" />
-                                            <node concept="2OqwBi" id="4Mvxa96veKE" role="1PxMeX">
+                                          <node concept="3TrcHB" id="3tp$LrD$YAk" role="2OqNvi">
+                                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                          </node>
+                                          <node concept="1PxgMI" id="3tp$LrD$XKY" role="2Oq$k0">
+                                            <ref role="1m5ApE" to="k146:2lgwE2U2X_H" resolve="MessageDefinitionTable" />
+                                            <node concept="2OqwBi" id="4Mvxa96veKE" role="1m5AlR">
                                               <node concept="2OqwBi" id="4Mvxa96veKF" role="2Oq$k0">
                                                 <node concept="2OqwBi" id="4Mvxa96veKG" role="2Oq$k0">
                                                   <node concept="30H73N" id="4Mvxa96veKH" role="2Oq$k0" />
@@ -6580,9 +6587,6 @@
                                               <node concept="1mfA1w" id="4Mvxa96veKK" role="2OqNvi" />
                                             </node>
                                           </node>
-                                          <node concept="3TrcHB" id="4Mvxa96veKL" role="2OqNvi">
-                                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                          </node>
                                         </node>
                                       </node>
                                       <node concept="Xl_RD" id="4Mvxa96veKM" role="3uHU7w">
@@ -6799,13 +6803,13 @@
         <node concept="3cpWs6" id="78Ts1skpDGb" role="3cqZAp">
           <node concept="2OqwBi" id="78Ts1skpDGc" role="3cqZAk">
             <node concept="2OqwBi" id="78Ts1skpDGd" role="2Oq$k0">
-              <node concept="1PxgMI" id="78Ts1skpDGe" role="2Oq$k0">
-                <ref role="1PxNhF" to="k146:3R$6B6bKETH" resolve="ReportingConfiguration" />
-                <node concept="37vLTw" id="5Hxjapweqyn" role="1PxMeX">
+              <node concept="1PxgMI" id="3tp$LrD_2Ls" role="2Oq$k0">
+                <ref role="1m5ApE" to="k146:3R$6B6bKETH" resolve="ReportingConfiguration" />
+                <node concept="37vLTw" id="3tp$LrD_1Wl" role="1m5AlR">
                   <ref role="3cqZAo" node="78Ts1skpDG3" resolve="rc" />
                 </node>
               </node>
-              <node concept="3TrEf2" id="78Ts1skpDGg" role="2OqNvi">
+              <node concept="3TrEf2" id="3tp$LrD_3rk" role="2OqNvi">
                 <ref role="3Tt5mk" to="k146:3R$6B6bKEUv" resolve="strategy" />
               </node>
             </node>
@@ -6860,16 +6864,16 @@
               <node concept="2YIFZM" id="5zHSh8Vjl65" role="33vP2m">
                 <ref role="1Pybhc" to="n7pc:7YIk2VQKlj4" resolve="MeetTypeHelper" />
                 <ref role="37wK5l" to="n7pc:7YIk2VQKlja" resolve="isInstanceOf" />
-                <node concept="1PxgMI" id="5zHSh8Vjl66" role="37wK5m">
-                  <ref role="1PxNhF" to="tpck:hYa1RjM" resolve="IType" />
-                  <node concept="2OqwBi" id="5zHSh8Vjl67" role="1PxMeX">
-                    <node concept="2OqwBi" id="5zHSh8Vjl68" role="2Oq$k0">
-                      <node concept="30H73N" id="5zHSh8Vjl69" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="5zHSh8Vjl6a" role="2OqNvi">
+                <node concept="1PxgMI" id="3tp$LrD_o7C" role="37wK5m">
+                  <ref role="1m5ApE" to="tpck:hYa1RjM" resolve="IType" />
+                  <node concept="2OqwBi" id="3tp$LrD_o7D" role="1m5AlR">
+                    <node concept="2OqwBi" id="3tp$LrD_o7E" role="2Oq$k0">
+                      <node concept="30H73N" id="3tp$LrD_o7F" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="3tp$LrD_o7G" role="2OqNvi">
                         <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" resolve="expression" />
                       </node>
                     </node>
-                    <node concept="3JvlWi" id="5zHSh8Vjl6b" role="2OqNvi" />
+                    <node concept="3JvlWi" id="3tp$LrD_o7H" role="2OqNvi" />
                   </node>
                 </node>
                 <node concept="3TUQnm" id="5zHSh8Vjl6c" role="37wK5m">
@@ -6895,28 +6899,25 @@
                     <ref role="3cqZAo" node="5zHSh8Vjl6e" resolve="byteSize" />
                   </node>
                   <node concept="2OqwBi" id="5zHSh8Vjl6m" role="37vLTx">
-                    <node concept="1PxgMI" id="5zHSh8Vjl6n" role="2Oq$k0">
-                      <ref role="1PxNhF" to="mj1l:7lNBHBNB4oP" resolve="PrimitiveC99IntegralType" />
-                      <node concept="2YIFZM" id="5zHSh8Vjl6o" role="1PxMeX">
-                        <ref role="37wK5l" to="n7pc:3_DQCSSLRH1" resolve="getConcreteType" />
-                        <ref role="1Pybhc" to="n7pc:7YIk2VQKlj4" resolve="MeetTypeHelper" />
-                        <node concept="1PxgMI" id="5zHSh8Vjl6p" role="37wK5m">
-                          <ref role="1PxNhF" to="tpck:hYa1RjM" resolve="IType" />
-                          <node concept="2OqwBi" id="5zHSh8Vjl6q" role="1PxMeX">
-                            <node concept="2OqwBi" id="5zHSh8Vjl6r" role="2Oq$k0">
-                              <node concept="30H73N" id="5zHSh8Vjl6s" role="2Oq$k0" />
-                              <node concept="3TrEf2" id="5zHSh8Vjl6t" role="2OqNvi">
-                                <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" resolve="expression" />
-                              </node>
+                    <node concept="2qgKlT" id="5zHSh8Vjl6v" role="2OqNvi">
+                      <ref role="37wK5l" to="ywuz:61lw97FtLtJ" resolve="getUsedBytes" />
+                    </node>
+                    <node concept="2YIFZM" id="5zHSh8Vjl6o" role="2Oq$k0">
+                      <ref role="37wK5l" to="n7pc:3_DQCSSLRH1" resolve="getConcreteType" />
+                      <ref role="1Pybhc" to="n7pc:7YIk2VQKlj4" resolve="MeetTypeHelper" />
+                      <node concept="1PxgMI" id="3tp$LrD_orZ" role="37wK5m">
+                        <ref role="1m5ApE" to="tpck:hYa1RjM" resolve="IType" />
+                        <node concept="2OqwBi" id="3tp$LrD_os0" role="1m5AlR">
+                          <node concept="2OqwBi" id="3tp$LrD_os1" role="2Oq$k0">
+                            <node concept="30H73N" id="3tp$LrD_os2" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="3tp$LrD_os3" role="2OqNvi">
+                              <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" resolve="expression" />
                             </node>
-                            <node concept="3JvlWi" id="5zHSh8Vjl6u" role="2OqNvi" />
                           </node>
+                          <node concept="3JvlWi" id="3tp$LrD_os4" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="2qgKlT" id="5zHSh8Vjl6v" role="2OqNvi">
-                      <ref role="37wK5l" to="ywuz:61lw97FtLtJ" resolve="getUsedBytes" />
-                    </node>
                   </node>
                 </node>
               </node>
@@ -7031,14 +7032,14 @@
                           <node concept="3Tqbb2" id="5zHSh8V93TO" role="1tU5fm">
                             <ref role="ehGHo" to="mj1l:7lNBHBNB4oP" resolve="PrimitiveC99IntegralType" />
                           </node>
-                          <node concept="1PxgMI" id="5zHSh8V99M1" role="33vP2m">
-                            <ref role="1PxNhF" to="mj1l:7lNBHBNB4oP" resolve="PrimitiveC99IntegralType" />
-                            <node concept="2YIFZM" id="5zHSh8V97Y_" role="1PxMeX">
-                              <ref role="37wK5l" to="n7pc:3_DQCSSLRH1" resolve="getConcreteType" />
+                          <node concept="1PxgMI" id="3tp$LrD_u1u" role="33vP2m">
+                            <ref role="1m5ApE" to="mj1l:7lNBHBNB4oP" resolve="PrimitiveC99IntegralType" />
+                            <node concept="2YIFZM" id="5zHSh8V97Y_" role="1m5AlR">
                               <ref role="1Pybhc" to="n7pc:7YIk2VQKlj4" resolve="MeetTypeHelper" />
-                              <node concept="1PxgMI" id="5zHSh8V9bF6" role="37wK5m">
-                                <ref role="1PxNhF" to="tpck:hYa1RjM" resolve="IType" />
-                                <node concept="2OqwBi" id="5zHSh8VfWlW" role="1PxMeX">
+                              <ref role="37wK5l" to="n7pc:3_DQCSSLRH1" resolve="getConcreteType" />
+                              <node concept="1PxgMI" id="3tp$LrD_qHg" role="37wK5m">
+                                <ref role="1m5ApE" to="tpck:hYa1RjM" resolve="IType" />
+                                <node concept="2OqwBi" id="5zHSh8VfWlW" role="1m5AlR">
                                   <node concept="2OqwBi" id="5zHSh8V9cYg" role="2Oq$k0">
                                     <node concept="30H73N" id="5zHSh8V98uR" role="2Oq$k0" />
                                     <node concept="3TrEf2" id="5zHSh8V9fqa" role="2OqNvi">
@@ -7155,16 +7156,16 @@
               <node concept="2YIFZM" id="5zHSh8Vi5_z" role="33vP2m">
                 <ref role="37wK5l" to="n7pc:7YIk2VQKlja" resolve="isInstanceOf" />
                 <ref role="1Pybhc" to="n7pc:7YIk2VQKlj4" resolve="MeetTypeHelper" />
-                <node concept="1PxgMI" id="5zHSh8Vikf0" role="37wK5m">
-                  <ref role="1PxNhF" to="tpck:hYa1RjM" resolve="IType" />
-                  <node concept="2OqwBi" id="5zHSh8VieN_" role="1PxMeX">
-                    <node concept="2OqwBi" id="5zHSh8Vi7gD" role="2Oq$k0">
-                      <node concept="30H73N" id="5zHSh8Vi75$" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="5zHSh8Vic8P" role="2OqNvi">
+                <node concept="1PxgMI" id="3tp$LrD_gSW" role="37wK5m">
+                  <ref role="1m5ApE" to="tpck:hYa1RjM" resolve="IType" />
+                  <node concept="2OqwBi" id="3tp$LrD_fTQ" role="1m5AlR">
+                    <node concept="2OqwBi" id="3tp$LrD_fTR" role="2Oq$k0">
+                      <node concept="30H73N" id="3tp$LrD_fTS" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="3tp$LrD_fTT" role="2OqNvi">
                         <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" resolve="expression" />
                       </node>
                     </node>
-                    <node concept="3JvlWi" id="5zHSh8Viho0" role="2OqNvi" />
+                    <node concept="3JvlWi" id="3tp$LrD_fTU" role="2OqNvi" />
                   </node>
                 </node>
                 <node concept="3TUQnm" id="5zHSh8VimVi" role="37wK5m">
@@ -7190,28 +7191,25 @@
                     <ref role="3cqZAo" node="5zHSh8Visn4" resolve="byteSize" />
                   </node>
                   <node concept="2OqwBi" id="5zHSh8ViQAw" role="37vLTx">
-                    <node concept="1PxgMI" id="5zHSh8ViOkK" role="2Oq$k0">
-                      <ref role="1PxNhF" to="mj1l:7lNBHBNB4oP" resolve="PrimitiveC99IntegralType" />
-                      <node concept="2YIFZM" id="5zHSh8Vi_bK" role="1PxMeX">
-                        <ref role="37wK5l" to="n7pc:3_DQCSSLRH1" resolve="getConcreteType" />
-                        <ref role="1Pybhc" to="n7pc:7YIk2VQKlj4" resolve="MeetTypeHelper" />
-                        <node concept="1PxgMI" id="5zHSh8ViLiy" role="37wK5m">
-                          <ref role="1PxNhF" to="tpck:hYa1RjM" resolve="IType" />
-                          <node concept="2OqwBi" id="5zHSh8ViGn$" role="1PxMeX">
-                            <node concept="2OqwBi" id="5zHSh8ViAh3" role="2Oq$k0">
-                              <node concept="30H73N" id="5zHSh8ViA5Y" role="2Oq$k0" />
-                              <node concept="3TrEf2" id="5zHSh8ViDcJ" role="2OqNvi">
-                                <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" resolve="expression" />
-                              </node>
+                    <node concept="2qgKlT" id="3tp$LrD_nIa" role="2OqNvi">
+                      <ref role="37wK5l" to="ywuz:61lw97FtLtJ" resolve="getUsedBytes" />
+                    </node>
+                    <node concept="2YIFZM" id="5zHSh8Vi_bK" role="2Oq$k0">
+                      <ref role="37wK5l" to="n7pc:3_DQCSSLRH1" resolve="getConcreteType" />
+                      <ref role="1Pybhc" to="n7pc:7YIk2VQKlj4" resolve="MeetTypeHelper" />
+                      <node concept="1PxgMI" id="3tp$LrD_hFD" role="37wK5m">
+                        <ref role="1m5ApE" to="tpck:hYa1RjM" resolve="IType" />
+                        <node concept="2OqwBi" id="3tp$LrD_hFE" role="1m5AlR">
+                          <node concept="2OqwBi" id="3tp$LrD_hFF" role="2Oq$k0">
+                            <node concept="30H73N" id="3tp$LrD_hFG" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="3tp$LrD_hFH" role="2OqNvi">
+                              <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" resolve="expression" />
                             </node>
-                            <node concept="3JvlWi" id="5zHSh8ViIzJ" role="2OqNvi" />
                           </node>
+                          <node concept="3JvlWi" id="3tp$LrD_hFI" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="2qgKlT" id="5zHSh8ViXlV" role="2OqNvi">
-                      <ref role="37wK5l" to="ywuz:61lw97FtLtJ" resolve="getUsedBytes" />
-                    </node>
                   </node>
                 </node>
               </node>
@@ -7756,9 +7754,9 @@
                           <node concept="2OqwBi" id="7pMSfLXvjll" role="2Oq$k0">
                             <node concept="2OqwBi" id="7pMSfLXvjlm" role="2Oq$k0">
                               <node concept="1eOMI4" id="7pMSfLXvjln" role="2Oq$k0">
-                                <node concept="1PxgMI" id="7pMSfLXvjlo" role="1eOMHV">
-                                  <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                                  <node concept="2OqwBi" id="7pMSfLXvjlp" role="1PxMeX">
+                                <node concept="1PxgMI" id="3tp$LrD_82K" role="1eOMHV">
+                                  <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                                  <node concept="2OqwBi" id="7pMSfLXvjlp" role="1m5AlR">
                                     <node concept="37vLTw" id="7pMSfLXvjlq" role="2Oq$k0">
                                       <ref role="3cqZAo" node="7pMSfLXvjl9" resolve="bc" />
                                     </node>
@@ -7768,7 +7766,7 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3TrEf2" id="7pMSfLXvjls" role="2OqNvi">
+                              <node concept="3TrEf2" id="3tp$LrD_9_T" role="2OqNvi">
                                 <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
                               </node>
                             </node>
@@ -8169,19 +8167,19 @@
                           <node concept="2OqwBi" id="7pMSfLXvjnB" role="2Oq$k0">
                             <node concept="2OqwBi" id="7pMSfLXvjnC" role="2Oq$k0">
                               <node concept="1eOMI4" id="7pMSfLXvjnD" role="2Oq$k0">
-                                <node concept="1PxgMI" id="7pMSfLXvjnE" role="1eOMHV">
-                                  <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                                  <node concept="2OqwBi" id="7pMSfLXvjnF" role="1PxMeX">
-                                    <node concept="37vLTw" id="7pMSfLXvjnG" role="2Oq$k0">
+                                <node concept="1PxgMI" id="3tp$LrD_atj" role="1eOMHV">
+                                  <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                                  <node concept="2OqwBi" id="3tp$LrD_atk" role="1m5AlR">
+                                    <node concept="37vLTw" id="3tp$LrD_atl" role="2Oq$k0">
                                       <ref role="3cqZAo" node="7pMSfLXvjnr" resolve="bc" />
                                     </node>
-                                    <node concept="3TrEf2" id="7pMSfLXvjnH" role="2OqNvi">
+                                    <node concept="3TrEf2" id="3tp$LrD_atm" role="2OqNvi">
                                       <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3TrEf2" id="7pMSfLXvjnI" role="2OqNvi">
+                              <node concept="3TrEf2" id="3tp$LrD_bzI" role="2OqNvi">
                                 <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
                               </node>
                             </node>
@@ -8698,20 +8696,20 @@
                                     </node>
                                     <node concept="FJ1c_" id="7pMSfLXvjrf" role="3uHU7B">
                                       <node concept="2OqwBi" id="7pMSfLXvjrg" role="3uHU7B">
-                                        <node concept="1PxgMI" id="7pMSfLXvjrh" role="2Oq$k0">
-                                          <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                                          <node concept="2OqwBi" id="7pMSfLXvjri" role="1PxMeX">
-                                            <node concept="37vLTw" id="7pMSfLXvjrj" role="2Oq$k0">
+                                        <node concept="2qgKlT" id="3tp$LrD_d1a" role="2OqNvi">
+                                          <ref role="37wK5l" to="7ord:7fU3Y2exR5v" resolve="getCpuSpeedInt" />
+                                        </node>
+                                        <node concept="1PxgMI" id="3tp$LrD_cr5" role="2Oq$k0">
+                                          <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                                          <node concept="2OqwBi" id="3tp$LrD_cr6" role="1m5AlR">
+                                            <node concept="37vLTw" id="3tp$LrD_cr7" role="2Oq$k0">
                                               <ref role="3cqZAo" node="7pMSfLXvjr2" resolve="bc" />
                                             </node>
-                                            <node concept="3TrEf2" id="7pMSfLXvjrk" role="2OqNvi">
+                                            <node concept="3TrEf2" id="3tp$LrD_cr8" role="2OqNvi">
                                               <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="2qgKlT" id="7pMSfLXvjrl" role="2OqNvi">
-                                          <ref role="37wK5l" to="7ord:7fU3Y2exR5v" resolve="getCpuSpeedInt" />
-                                        </node>
                                       </node>
                                       <node concept="1eOMI4" id="7pMSfLXvjrm" role="3uHU7w">
                                         <node concept="17qRlL" id="7pMSfLXvjrn" role="1eOMHV">
@@ -8822,20 +8820,20 @@
                                   </node>
                                   <node concept="FJ1c_" id="7pMSfLXvjs5" role="3uHU7B">
                                     <node concept="2OqwBi" id="7pMSfLXvjs6" role="3uHU7B">
-                                      <node concept="1PxgMI" id="7pMSfLXvjs7" role="2Oq$k0">
-                                        <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                                        <node concept="2OqwBi" id="7pMSfLXvjs8" role="1PxMeX">
-                                          <node concept="37vLTw" id="7pMSfLXvjs9" role="2Oq$k0">
+                                      <node concept="2qgKlT" id="3tp$LrD_e0C" role="2OqNvi">
+                                        <ref role="37wK5l" to="7ord:7fU3Y2exR5v" resolve="getCpuSpeedInt" />
+                                      </node>
+                                      <node concept="1PxgMI" id="3tp$LrD_dqz" role="2Oq$k0">
+                                        <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                                        <node concept="2OqwBi" id="3tp$LrD_dq$" role="1m5AlR">
+                                          <node concept="37vLTw" id="3tp$LrD_dq_" role="2Oq$k0">
                                             <ref role="3cqZAo" node="7pMSfLXvjrS" resolve="bc" />
                                           </node>
-                                          <node concept="3TrEf2" id="7pMSfLXvjsa" role="2OqNvi">
+                                          <node concept="3TrEf2" id="3tp$LrD_dqA" role="2OqNvi">
                                             <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="2qgKlT" id="7pMSfLXvjsb" role="2OqNvi">
-                                        <ref role="37wK5l" to="7ord:7fU3Y2exR5v" resolve="getCpuSpeedInt" />
-                                      </node>
                                     </node>
                                     <node concept="1eOMI4" id="7pMSfLXvjsc" role="3uHU7w">
                                       <node concept="17qRlL" id="7pMSfLXvjsd" role="1eOMHV">
@@ -9669,19 +9667,19 @@
                       <node concept="3cpWs3" id="1pOg3uxo01W" role="3clFbG">
                         <node concept="2OqwBi" id="1pOg3uxo01y" role="3uHU7w">
                           <node concept="1eOMI4" id="1pOg3uxo01d" role="2Oq$k0">
-                            <node concept="1PxgMI" id="1pOg3uxo00R" role="1eOMHV">
-                              <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                              <node concept="2OqwBi" id="1pOg3uxo00K" role="1PxMeX">
+                            <node concept="1PxgMI" id="3tp$LrD$S5a" role="1eOMHV">
+                              <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                              <node concept="2OqwBi" id="1pOg3uxo00K" role="1m5AlR">
                                 <node concept="1eOMI4" id="1pOg3uxo007" role="2Oq$k0">
-                                  <node concept="1PxgMI" id="1pOg3uxnZZw" role="1eOMHV">
-                                    <ref role="1PxNhF" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
-                                    <node concept="2OqwBi" id="1pOg3uxnZZq" role="1PxMeX">
-                                      <node concept="30H73N" id="1pOg3uxnZZ5" role="2Oq$k0" />
-                                      <node concept="1mfA1w" id="1pOg3uxnZZv" role="2OqNvi" />
+                                  <node concept="1PxgMI" id="3tp$LrD$PYL" role="1eOMHV">
+                                    <ref role="1m5ApE" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
+                                    <node concept="2OqwBi" id="3tp$LrD$P54" role="1m5AlR">
+                                      <node concept="30H73N" id="3tp$LrD$OKN" role="2Oq$k0" />
+                                      <node concept="1mfA1w" id="3tp$LrD$Pvj" role="2OqNvi" />
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="3TrEf2" id="1pOg3uxo00Q" role="2OqNvi">
+                                <node concept="3TrEf2" id="3tp$LrD$QKH" role="2OqNvi">
                                   <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                                 </node>
                               </node>
@@ -9774,22 +9772,20 @@
                         <node concept="3Tqbb2" id="55_53lUxi2r" role="1tU5fm">
                           <ref role="ehGHo" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
                         </node>
-                        <node concept="1eOMI4" id="55_53lUxi2w" role="33vP2m">
-                          <node concept="1PxgMI" id="55_53lUxyQz" role="1eOMHV">
-                            <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                            <node concept="2OqwBi" id="55_53lUxyQt" role="1PxMeX">
-                              <node concept="1eOMI4" id="55_53lUxyQ4" role="2Oq$k0">
-                                <node concept="1PxgMI" id="55_53lUxyQ5" role="1eOMHV">
-                                  <ref role="1PxNhF" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
-                                  <node concept="2OqwBi" id="55_53lUxyQ6" role="1PxMeX">
-                                    <node concept="30H73N" id="55_53lUxyQ7" role="2Oq$k0" />
-                                    <node concept="1mfA1w" id="55_53lUxyQ8" role="2OqNvi" />
-                                  </node>
+                        <node concept="1PxgMI" id="3tp$LrDxFM6" role="33vP2m">
+                          <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                          <node concept="2OqwBi" id="55_53lUxyQt" role="1m5AlR">
+                            <node concept="1eOMI4" id="55_53lUxyQ4" role="2Oq$k0">
+                              <node concept="1PxgMI" id="3tp$LrDxCnk" role="1eOMHV">
+                                <ref role="1m5ApE" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
+                                <node concept="2OqwBi" id="3tp$LrDxAQm" role="1m5AlR">
+                                  <node concept="30H73N" id="3tp$LrDxAxc" role="2Oq$k0" />
+                                  <node concept="1mfA1w" id="3tp$LrDxBFD" role="2OqNvi" />
                                 </node>
                               </node>
-                              <node concept="3TrEf2" id="55_53lUxyQy" role="2OqNvi">
-                                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
-                              </node>
+                            </node>
+                            <node concept="3TrEf2" id="3tp$LrDxDfS" role="2OqNvi">
+                              <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                             </node>
                           </node>
                         </node>
diff --git a/languages/mbeddr.arduino.core/languageModels/behavior.mps b/languages/mbeddr.arduino.core/languageModels/behavior.mps
index dfad0bd..53dfc85 100755
--- a/languages/mbeddr.arduino.core/languageModels/behavior.mps
+++ b/languages/mbeddr.arduino.core/languageModels/behavior.mps
@@ -93,7 +93,6 @@
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
-      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
@@ -143,6 +142,10 @@
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC" />
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+      </concept>
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1171315804604" name="jetbrains.mps.lang.smodel.structure.Model_RootsOperation" flags="nn" index="2RRcyG">
         <reference id="1171315804605" name="concept" index="2RRcyH" />
@@ -154,10 +157,7 @@
       <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
         <reference id="1219352800908" name="referentNode" index="3B5MYn" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <reference id="1140138128738" name="concept_old" index="1PxNhF" />
-        <child id="1140138123956" name="leftExpression_old" index="1PxMeX" />
-      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -601,26 +601,26 @@
     </node>
     <node concept="13hLZK" id="3gdl6si72OK" role="13h7CW">
       <node concept="3clFbS" id="3gdl6si72OL" role="2VODD2">
-        <node concept="2Gpval" id="3gdl6si74on" role="3cqZAp">
-          <node concept="2GrKxI" id="3gdl6si74oo" role="2Gsz3X">
+        <node concept="2Gpval" id="3tp$LrDwmPn" role="3cqZAp">
+          <node concept="2GrKxI" id="3tp$LrDwmPo" role="2Gsz3X">
             <property role="TrG5h" value="item" />
           </node>
-          <node concept="3clFbS" id="3gdl6si74oq" role="2LFqv$">
-            <node concept="3clFbF" id="3gdl6si74or" role="3cqZAp">
-              <node concept="2OqwBi" id="3gdl6si74pP" role="3clFbG">
-                <node concept="2OqwBi" id="3gdl6si74oV" role="2Oq$k0">
-                  <node concept="13iPFW" id="3gdl6si74os" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="3gdl6si74p1" role="2OqNvi">
+          <node concept="3clFbS" id="3tp$LrDwmPp" role="2LFqv$">
+            <node concept="3clFbF" id="3tp$LrDwmPq" role="3cqZAp">
+              <node concept="2OqwBi" id="3tp$LrDwmPr" role="3clFbG">
+                <node concept="2OqwBi" id="3tp$LrDwmPs" role="2Oq$k0">
+                  <node concept="13iPFW" id="3tp$LrDwmPt" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="3tp$LrDwmPu" role="2OqNvi">
                     <ref role="3TtcxE" to="koo2:3gdl6si6LyV" resolve="digitalConfig" />
                   </node>
                 </node>
-                <node concept="TSZUe" id="3gdl6si74pV" role="2OqNvi">
-                  <node concept="2OqwBi" id="3gdl6si74qi" role="25WWJ7">
-                    <node concept="13iPFW" id="3gdl6si74pX" role="2Oq$k0" />
-                    <node concept="2qgKlT" id="3gdl6si74qo" role="2OqNvi">
+                <node concept="TSZUe" id="3tp$LrDwmPv" role="2OqNvi">
+                  <node concept="2OqwBi" id="3tp$LrDwmPw" role="25WWJ7">
+                    <node concept="13iPFW" id="3tp$LrDwmPx" role="2Oq$k0" />
+                    <node concept="2qgKlT" id="3tp$LrDwmPy" role="2OqNvi">
                       <ref role="37wK5l" node="3gdl6si73Mz" resolve="getDigitalConfig" />
-                      <node concept="2GrUjf" id="3gdl6si74qp" role="37wK5m">
-                        <ref role="2Gs0qQ" node="3gdl6si74oo" resolve="item" />
+                      <node concept="2GrUjf" id="3tp$LrDwmPz" role="37wK5m">
+                        <ref role="2Gs0qQ" node="3tp$LrDwmPo" resolve="item" />
                       </node>
                     </node>
                   </node>
@@ -628,59 +628,59 @@
               </node>
             </node>
           </node>
-          <node concept="2OqwBi" id="3gdl6si73K8" role="2GsD0m">
-            <node concept="2OqwBi" id="3gdl6si73JG" role="2Oq$k0">
-              <node concept="1eOMI4" id="3gdl6si73Jn" role="2Oq$k0">
-                <node concept="1PxgMI" id="3gdl6si73ID" role="1eOMHV">
-                  <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                  <node concept="2OqwBi" id="4EC9auLEKIu" role="1PxMeX">
-                    <node concept="2OqwBi" id="4EC9auLEKI2" role="2Oq$k0">
-                      <node concept="2OqwBi" id="4EC9auLEKI3" role="2Oq$k0">
-                        <node concept="2OqwBi" id="4EC9auLEKI4" role="2Oq$k0">
-                          <node concept="13iPFW" id="4EC9auLEKI5" role="2Oq$k0" />
-                          <node concept="I4A8Y" id="4EC9auLEKI6" role="2OqNvi" />
+          <node concept="2OqwBi" id="3tp$LrDwmP$" role="2GsD0m">
+            <node concept="2OqwBi" id="3tp$LrDwmP_" role="2Oq$k0">
+              <node concept="1eOMI4" id="3tp$LrDwmPA" role="2Oq$k0">
+                <node concept="1PxgMI" id="3tp$LrDwGNM" role="1eOMHV">
+                  <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                  <node concept="2OqwBi" id="3tp$LrDwEu5" role="1m5AlR">
+                    <node concept="2OqwBi" id="3tp$LrDw_8G" role="2Oq$k0">
+                      <node concept="2OqwBi" id="3tp$LrDwyTV" role="2Oq$k0">
+                        <node concept="2OqwBi" id="3tp$LrDwxc8" role="2Oq$k0">
+                          <node concept="13iPFW" id="3tp$LrDwwwD" role="2Oq$k0" />
+                          <node concept="I4A8Y" id="3tp$LrDwy7d" role="2OqNvi" />
                         </node>
-                        <node concept="2RRcyG" id="4EC9auLEKI7" role="2OqNvi">
+                        <node concept="2RRcyG" id="3tp$LrDwzJY" role="2OqNvi">
                           <ref role="2RRcyH" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
                         </node>
                       </node>
-                      <node concept="1uHKPH" id="4EC9auLEKI8" role="2OqNvi" />
+                      <node concept="1uHKPH" id="3tp$LrDwDx1" role="2OqNvi" />
                     </node>
-                    <node concept="3TrEf2" id="4EC9auLEKI$" role="2OqNvi">
+                    <node concept="3TrEf2" id="3tp$LrDwFFQ" role="2OqNvi">
                       <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="3TrEf2" id="3gdl6si73JM" role="2OqNvi">
+              <node concept="3TrEf2" id="3tp$LrDwIIX" role="2OqNvi">
                 <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
               </node>
             </node>
-            <node concept="3Tsc0h" id="3gdl6si73Ke" role="2OqNvi">
+            <node concept="3Tsc0h" id="3tp$LrDwmPM" role="2OqNvi">
               <ref role="3TtcxE" to="koo2:4JsbL6NpKIN" resolve="digitalPins" />
             </node>
           </node>
         </node>
-        <node concept="2Gpval" id="1qwvy7xHbPp" role="3cqZAp">
-          <node concept="2GrKxI" id="1qwvy7xHbPq" role="2Gsz3X">
+        <node concept="2Gpval" id="3tp$LrDwmPN" role="3cqZAp">
+          <node concept="2GrKxI" id="3tp$LrDwmPO" role="2Gsz3X">
             <property role="TrG5h" value="item" />
           </node>
-          <node concept="3clFbS" id="1qwvy7xHbPr" role="2LFqv$">
-            <node concept="3clFbF" id="1qwvy7xHbPs" role="3cqZAp">
-              <node concept="2OqwBi" id="1qwvy7xHbPt" role="3clFbG">
-                <node concept="2OqwBi" id="1qwvy7xHbPu" role="2Oq$k0">
-                  <node concept="13iPFW" id="1qwvy7xHbPv" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="1qwvy7xHbSL" role="2OqNvi">
+          <node concept="3clFbS" id="3tp$LrDwmPP" role="2LFqv$">
+            <node concept="3clFbF" id="3tp$LrDwmPQ" role="3cqZAp">
+              <node concept="2OqwBi" id="3tp$LrDwmPR" role="3clFbG">
+                <node concept="2OqwBi" id="3tp$LrDwmPS" role="2Oq$k0">
+                  <node concept="13iPFW" id="3tp$LrDwmPT" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="3tp$LrDwmPU" role="2OqNvi">
                     <ref role="3TtcxE" to="koo2:1qwvy7xGKCQ" resolve="analogPinConfiguration" />
                   </node>
                 </node>
-                <node concept="TSZUe" id="1qwvy7xHbPx" role="2OqNvi">
-                  <node concept="2OqwBi" id="1qwvy7xHbPy" role="25WWJ7">
-                    <node concept="13iPFW" id="1qwvy7xHbPz" role="2Oq$k0" />
-                    <node concept="2qgKlT" id="1qwvy7xHbP$" role="2OqNvi">
+                <node concept="TSZUe" id="3tp$LrDwmPV" role="2OqNvi">
+                  <node concept="2OqwBi" id="3tp$LrDwmPW" role="25WWJ7">
+                    <node concept="13iPFW" id="3tp$LrDwmPX" role="2Oq$k0" />
+                    <node concept="2qgKlT" id="3tp$LrDwmPY" role="2OqNvi">
                       <ref role="37wK5l" node="1qwvy7xHbPS" resolve="getAnalogConfig" />
-                      <node concept="2GrUjf" id="1qwvy7xHbP_" role="37wK5m">
-                        <ref role="2Gs0qQ" node="1qwvy7xHbPq" resolve="item" />
+                      <node concept="2GrUjf" id="3tp$LrDwmPZ" role="37wK5m">
+                        <ref role="2Gs0qQ" node="3tp$LrDwmPO" resolve="item" />
                       </node>
                     </node>
                   </node>
@@ -688,40 +688,39 @@
               </node>
             </node>
           </node>
-          <node concept="2OqwBi" id="1qwvy7xHbPA" role="2GsD0m">
-            <node concept="2OqwBi" id="1qwvy7xHbPB" role="2Oq$k0">
-              <node concept="1eOMI4" id="1qwvy7xHbPC" role="2Oq$k0">
-                <node concept="1PxgMI" id="1qwvy7xHbPD" role="1eOMHV">
-                  <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                  <node concept="2OqwBi" id="1qwvy7xHbPE" role="1PxMeX">
-                    <node concept="2OqwBi" id="1qwvy7xHbPF" role="2Oq$k0">
-                      <node concept="2OqwBi" id="1qwvy7xHbPG" role="2Oq$k0">
-                        <node concept="2OqwBi" id="1qwvy7xHbPH" role="2Oq$k0">
-                          <node concept="13iPFW" id="1qwvy7xHbPI" role="2Oq$k0" />
-                          <node concept="I4A8Y" id="1qwvy7xHbPJ" role="2OqNvi" />
+          <node concept="2OqwBi" id="3tp$LrDwmQ0" role="2GsD0m">
+            <node concept="3Tsc0h" id="3tp$LrDwmQe" role="2OqNvi">
+              <ref role="3TtcxE" to="koo2:3gdl6si6AgN" resolve="analogPins" />
+            </node>
+            <node concept="2OqwBi" id="3tp$LrDwJAQ" role="2Oq$k0">
+              <node concept="1eOMI4" id="3tp$LrDwJAR" role="2Oq$k0">
+                <node concept="1PxgMI" id="3tp$LrDwJAS" role="1eOMHV">
+                  <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                  <node concept="2OqwBi" id="3tp$LrDwJAT" role="1m5AlR">
+                    <node concept="2OqwBi" id="3tp$LrDwJAU" role="2Oq$k0">
+                      <node concept="2OqwBi" id="3tp$LrDwJAV" role="2Oq$k0">
+                        <node concept="2OqwBi" id="3tp$LrDwJAW" role="2Oq$k0">
+                          <node concept="13iPFW" id="3tp$LrDwJAX" role="2Oq$k0" />
+                          <node concept="I4A8Y" id="3tp$LrDwJAY" role="2OqNvi" />
                         </node>
-                        <node concept="2RRcyG" id="1qwvy7xHbPK" role="2OqNvi">
+                        <node concept="2RRcyG" id="3tp$LrDwJAZ" role="2OqNvi">
                           <ref role="2RRcyH" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
                         </node>
                       </node>
-                      <node concept="1uHKPH" id="1qwvy7xHbPL" role="2OqNvi" />
+                      <node concept="1uHKPH" id="3tp$LrDwJB0" role="2OqNvi" />
                     </node>
-                    <node concept="3TrEf2" id="1qwvy7xHbPM" role="2OqNvi">
+                    <node concept="3TrEf2" id="3tp$LrDwJB1" role="2OqNvi">
                       <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="3TrEf2" id="1qwvy7xHbPN" role="2OqNvi">
+              <node concept="3TrEf2" id="3tp$LrDwJB2" role="2OqNvi">
                 <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
               </node>
             </node>
-            <node concept="3Tsc0h" id="1qwvy7xHbPR" role="2OqNvi">
-              <ref role="3TtcxE" to="koo2:3gdl6si6AgN" resolve="analogPins" />
-            </node>
           </node>
         </node>
-        <node concept="3clFbH" id="1qwvy7xHbPo" role="3cqZAp" />
       </node>
     </node>
   </node>
diff --git a/languages/mbeddr.arduino.core/languageModels/constraints.mps b/languages/mbeddr.arduino.core/languageModels/constraints.mps
old mode 100644
new mode 100755
index 2966072..3bc9db0
--- a/languages/mbeddr.arduino.core/languageModels/constraints.mps
+++ b/languages/mbeddr.arduino.core/languageModels/constraints.mps
@@ -13,12 +13,12 @@
     <import index="koo2" ref="r:3c7790ca-a687-4dfa-a94e-7b5e9848d78c(mbeddr.arduino.core.structure)" />
     <import index="x27k" ref="r:75ecab8a-8931-4140-afc6-4b46398710fc(com.mbeddr.core.modules.structure)" />
     <import index="c4fa" ref="r:9f0e84b6-2ec7-4f9e-83e0-feedc77b63a3(com.mbeddr.core.statements.structure)" />
-    <import index="vsqj" ref="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.project(MPS.Core/jetbrains.mps.project@java_stub)" />
+    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
     <import index="51wr" ref="r:b31f1c3c-99aa-4f1e-a329-cba27efb1a6b(com.mbeddr.core.buildconfig.structure)" />
     <import index="o3n2" ref="r:26eadcf0-f275-4e90-be37-e4432772a74d(jetbrains.mps.build.util)" />
     <import index="6xgk" ref="r:6e9ad488-5df2-49e4-8c01-8a7f3812adf7(jetbrains.mps.lang.scopes.runtime)" />
-    <import index="as9o" ref="f:java_stub#3f233e7f-b8a6-46d2-a57f-795d56775243#org.jetbrains.annotations(Annotations/org.jetbrains.annotations@java_stub)" />
-    <import index="e2lb" ref="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.lang(JDK/java.lang@java_stub)" implicit="true" />
+    <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts">
@@ -162,6 +162,10 @@
       <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+      </concept>
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1176109685393" name="jetbrains.mps.lang.smodel.structure.Model_RootsIncludingImportedOperation" flags="nn" index="3lApI0">
         <reference id="1176109685394" name="concept" index="3lApI3" />
@@ -170,10 +174,7 @@
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <reference id="1140138128738" name="concept" index="1PxNhF" />
-        <child id="1140138123956" name="leftExpression" index="1PxMeX" />
-      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -203,7 +204,7 @@
     <property role="3GE5qa" value="platform" />
     <ref role="1M2myG" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
     <node concept="1N5Pfh" id="3gdl6si6$CU" role="1Mr941">
-      <ref role="1N5Vy1" to="koo2:4JsbL6NpX5B" />
+      <ref role="1N5Vy1" to="koo2:4JsbL6NpX5B" resolve="description" />
       <node concept="1MUpDS" id="3gdl6si6_ge" role="1N6uqs">
         <node concept="3clFbS" id="3gdl6si6_gf" role="2VODD2">
           <node concept="3clFbF" id="3gdl6si6_gg" role="3cqZAp">
@@ -236,7 +237,7 @@
                   <node concept="2OqwBi" id="4EC9auLEQ0P" role="2Oq$k0">
                     <node concept="EsrRn" id="4EC9auLEQ0w" role="2Oq$k0" />
                     <node concept="3TrEf2" id="4EC9auLEQ0V" role="2OqNvi">
-                      <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                      <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                     </node>
                   </node>
                   <node concept="3TrcHB" id="4EC9auLEQ1n" role="2OqNvi">
@@ -250,7 +251,7 @@
                 <property role="Xl_RC" value="input" />
               </node>
               <node concept="liA8E" id="4EC9auLEQex" role="2OqNvi">
-                <ref role="37wK5l" to="e2lb:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
                 <node concept="1Wqviy" id="4EC9auLEQey" role="37wK5m" />
               </node>
             </node>
@@ -260,7 +261,7 @@
                   <property role="Xl_RC" value="output" />
                 </node>
                 <node concept="liA8E" id="4EC9auLEQf2" role="2OqNvi">
-                  <ref role="37wK5l" to="e2lb:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
                   <node concept="1Wqviy" id="4EC9auLEQf3" role="37wK5m" />
                 </node>
               </node>
@@ -270,7 +271,7 @@
                     <node concept="2OqwBi" id="4EC9auLEQ1N" role="2Oq$k0">
                       <node concept="EsrRn" id="4EC9auLEQ1u" role="2Oq$k0" />
                       <node concept="3TrEf2" id="4EC9auLEQ1T" role="2OqNvi">
-                        <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                        <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                       </node>
                     </node>
                     <node concept="3TrcHB" id="4EC9auLEQ2l" role="2OqNvi">
@@ -286,7 +287,7 @@
                   <property role="Xl_RC" value="PWM" />
                 </node>
                 <node concept="liA8E" id="4EC9auLEQfR" role="2OqNvi">
-                  <ref role="37wK5l" to="e2lb:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
                   <node concept="1Wqviy" id="4EC9auLEQfS" role="37wK5m" />
                 </node>
               </node>
@@ -296,7 +297,7 @@
                     <node concept="2OqwBi" id="4EC9auLEQ2M" role="2Oq$k0">
                       <node concept="EsrRn" id="4EC9auLEQ2t" role="2Oq$k0" />
                       <node concept="3TrEf2" id="4EC9auLEQ2S" role="2OqNvi">
-                        <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" />
+                        <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                       </node>
                     </node>
                     <node concept="3TrcHB" id="4EC9auLEQ3k" role="2OqNvi">
@@ -316,7 +317,7 @@
       </node>
     </node>
     <node concept="1N5Pfh" id="4EC9auLELVk" role="1Mr941">
-      <ref role="1N5Vy1" to="koo2:3gdl6si6JD8" />
+      <ref role="1N5Vy1" to="koo2:3gdl6si6JD8" resolve="pin" />
       <node concept="3k9gUc" id="4EC9auLELVl" role="3kmjI7">
         <node concept="3clFbS" id="4EC9auLELVm" role="2VODD2">
           <node concept="3clFbF" id="26IgR5babul" role="3cqZAp">
@@ -354,12 +355,12 @@
                         <ref role="ehGHo" to="koo2:4JsbL6NpngL" resolve="DigitalPin" />
                       </node>
                       <node concept="2AHcQZ" id="1BNbAattLXS" role="2AJF6D">
-                        <ref role="2AI5Lk" to="as9o:~NotNull" resolve="NotNull" />
+                        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
                       </node>
                     </node>
                     <node concept="17QB3L" id="1BNbAattLXT" role="3clF45" />
                     <node concept="2AHcQZ" id="1BNbAattLXU" role="2AJF6D">
-                      <ref role="2AI5Lk" to="as9o:~Nullable" resolve="Nullable" />
+                      <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
                     </node>
                     <node concept="3clFbS" id="1BNbAattLXV" role="3clF47">
                       <node concept="3clFbF" id="1BNbAattZ6k" role="3cqZAp">
@@ -379,31 +380,31 @@
                   </node>
                   <node concept="2OqwBi" id="1BNbAattUwk" role="37wK5m">
                     <node concept="2OqwBi" id="1BNbAattRcC" role="2Oq$k0">
-                      <node concept="1PxgMI" id="1BNbAatulgl" role="2Oq$k0">
-                        <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                        <node concept="2OqwBi" id="1BNbAattNUC" role="1PxMeX">
-                          <node concept="2OqwBi" id="1BNbAattN5U" role="2Oq$k0">
-                            <node concept="2rP1CM" id="1BNbAattMCD" role="2Oq$k0" />
-                            <node concept="2Xjw5R" id="1BNbAattNx4" role="2OqNvi">
-                              <node concept="1xMEDy" id="1BNbAattNx6" role="1xVPHs">
-                                <node concept="chp4Y" id="1BNbAattNAD" role="ri$Ld">
+                      <node concept="3TrEf2" id="1BNbAattU16" role="2OqNvi">
+                        <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
+                      </node>
+                      <node concept="1PxgMI" id="3tp$LrDwQhv" role="2Oq$k0">
+                        <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                        <node concept="2OqwBi" id="3tp$LrDwQhw" role="1m5AlR">
+                          <node concept="2OqwBi" id="3tp$LrDwQhx" role="2Oq$k0">
+                            <node concept="2rP1CM" id="3tp$LrDwQhy" role="2Oq$k0" />
+                            <node concept="2Xjw5R" id="3tp$LrDwQhz" role="2OqNvi">
+                              <node concept="1xMEDy" id="3tp$LrDwQh$" role="1xVPHs">
+                                <node concept="chp4Y" id="3tp$LrDwQh_" role="ri$Ld">
                                   <ref role="cht4Q" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
                                 </node>
                               </node>
-                              <node concept="1xIGOp" id="1BNbAattNLJ" role="1xVPHs" />
+                              <node concept="1xIGOp" id="3tp$LrDwQhA" role="1xVPHs" />
                             </node>
                           </node>
-                          <node concept="3TrEf2" id="1BNbAattP62" role="2OqNvi">
-                            <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" />
+                          <node concept="3TrEf2" id="3tp$LrDwQhB" role="2OqNvi">
+                            <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
                           </node>
                         </node>
                       </node>
-                      <node concept="3TrEf2" id="1BNbAattU16" role="2OqNvi">
-                        <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" />
-                      </node>
                     </node>
                     <node concept="3Tsc0h" id="1BNbAattVqe" role="2OqNvi">
-                      <ref role="3TtcxE" to="koo2:4JsbL6NpKIN" />
+                      <ref role="3TtcxE" to="koo2:4JsbL6NpKIN" resolve="digitalPins" />
                     </node>
                   </node>
                 </node>
@@ -499,7 +500,7 @@
     <property role="3GE5qa" value="pin" />
     <ref role="1M2myG" to="koo2:4JsbL6NpngL" resolve="DigitalPin" />
     <node concept="1N5Pfh" id="1XyQ$8LuPzh" role="1Mr941">
-      <ref role="1N5Vy1" to="koo2:4JsbL6NpKGY" />
+      <ref role="1N5Vy1" to="koo2:4JsbL6NpKGY" resolve="dataDirectionReg" />
       <node concept="1MUpDS" id="4sbNL4NRyfJ" role="1N6uqs">
         <node concept="3clFbS" id="4sbNL4NRyfK" role="2VODD2">
           <node concept="3clFbF" id="4sbNL4NRyfL" role="3cqZAp">
@@ -517,7 +518,7 @@
                   </node>
                 </node>
                 <node concept="3Tsc0h" id="4sbNL4NRyfU" role="2OqNvi">
-                  <ref role="3TtcxE" to="koo2:5TY7OGK$Adi" />
+                  <ref role="3TtcxE" to="koo2:5TY7OGK$Adi" resolve="registers" />
                 </node>
               </node>
               <node concept="v3k3i" id="4sbNL4NRyfV" role="2OqNvi">
@@ -531,7 +532,7 @@
       </node>
     </node>
     <node concept="1N5Pfh" id="1XyQ$8LuPzn" role="1Mr941">
-      <ref role="1N5Vy1" to="koo2:4JsbL6NpKGU" />
+      <ref role="1N5Vy1" to="koo2:4JsbL6NpKGU" resolve="inputReg" />
       <node concept="1MUpDS" id="4sbNL4NRy7W" role="1N6uqs">
         <node concept="3clFbS" id="4sbNL4NRy7X" role="2VODD2">
           <node concept="3clFbF" id="4sbNL4NRsGu" role="3cqZAp">
@@ -549,7 +550,7 @@
                   </node>
                 </node>
                 <node concept="3Tsc0h" id="4sbNL4NRu3F" role="2OqNvi">
-                  <ref role="3TtcxE" to="koo2:5TY7OGK$Adi" />
+                  <ref role="3TtcxE" to="koo2:5TY7OGK$Adi" resolve="registers" />
                 </node>
               </node>
               <node concept="v3k3i" id="4sbNL4NRxRH" role="2OqNvi">
@@ -563,7 +564,7 @@
       </node>
     </node>
     <node concept="1N5Pfh" id="1XyQ$8LuPzx" role="1Mr941">
-      <ref role="1N5Vy1" to="koo2:2mpt1xbR9gV" />
+      <ref role="1N5Vy1" to="koo2:2mpt1xbR9gV" resolve="outputReg" />
       <node concept="1MUpDS" id="4sbNL4NRymw" role="1N6uqs">
         <node concept="3clFbS" id="4sbNL4NRymx" role="2VODD2">
           <node concept="3clFbF" id="4sbNL4NRymy" role="3cqZAp">
@@ -581,7 +582,7 @@
                   </node>
                 </node>
                 <node concept="3Tsc0h" id="4sbNL4NRymF" role="2OqNvi">
-                  <ref role="3TtcxE" to="koo2:5TY7OGK$Adi" />
+                  <ref role="3TtcxE" to="koo2:5TY7OGK$Adi" resolve="registers" />
                 </node>
               </node>
               <node concept="v3k3i" id="4sbNL4NRymG" role="2OqNvi">
diff --git a/languages/mbeddr.arduino.core/languageModels/intentions.mps b/languages/mbeddr.arduino.core/languageModels/intentions.mps
old mode 100644
new mode 100755
index eb21c5a..56ee760
--- a/languages/mbeddr.arduino.core/languageModels/intentions.mps
+++ b/languages/mbeddr.arduino.core/languageModels/intentions.mps
@@ -117,9 +117,6 @@
         <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
       </concept>
     </language>
-    <language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots">
-      <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
-    </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -164,6 +161,10 @@
       <concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC">
         <reference id="1139880128956" name="concept" index="1A9B2P" />
       </concept>
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+      </concept>
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
       </concept>
@@ -190,8 +191,6 @@
       </concept>
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
         <property id="1238684351431" name="asCast" index="1BlNFB" />
-        <reference id="1140138128738" name="concept" index="1PxNhF" />
-        <child id="1140138123956" name="leftExpression" index="1PxMeX" />
       </concept>
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
@@ -331,7 +330,7 @@
             <node concept="2OqwBi" id="6RZtz2lhJ6h" role="2Oq$k0">
               <node concept="2Sf5sV" id="6RZtz2lhIVL" role="2Oq$k0" />
               <node concept="3TrEf2" id="6RZtz2lhLDR" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" />
+                <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" resolve="condition" />
               </node>
             </node>
             <node concept="3x8VRR" id="6RZtz2lhOgG" role="2OqNvi" />
@@ -358,7 +357,7 @@
                 <node concept="2OqwBi" id="6RZtz2lhZKv" role="37vLTJ">
                   <node concept="2Sf5sV" id="6RZtz2lhZDx" role="2Oq$k0" />
                   <node concept="3TrEf2" id="6RZtz2li29x" role="2OqNvi">
-                    <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" />
+                    <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" resolve="condition" />
                   </node>
                 </node>
               </node>
@@ -368,7 +367,7 @@
             <node concept="2OqwBi" id="6RZtz2lhUOt" role="2Oq$k0">
               <node concept="2Sf5sV" id="6RZtz2lhUGB" role="2Oq$k0" />
               <node concept="3TrEf2" id="6RZtz2lhXdz" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" />
+                <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" resolve="condition" />
               </node>
             </node>
             <node concept="3x8VRR" id="6RZtz2lhZ$$" role="2OqNvi" />
@@ -380,7 +379,7 @@
                   <node concept="2OqwBi" id="6RZtz2li5i5" role="2Oq$k0">
                     <node concept="2Sf5sV" id="6RZtz2li5b7" role="2Oq$k0" />
                     <node concept="3TrEf2" id="6RZtz2li7F7" role="2OqNvi">
-                      <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" />
+                      <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" resolve="condition" />
                     </node>
                   </node>
                   <node concept="zfrQC" id="6RZtz2lib0y" role="2OqNvi" />
@@ -434,13 +433,13 @@
                 <ref role="3cqZAo" node="6RZtz2lulu1" resolve="ifstmt" />
               </node>
               <node concept="3TrEf2" id="6RZtz2luuiY" role="2OqNvi">
-                <ref role="3Tt5mk" to="c4fa:5so5TTr6Vvo" />
+                <ref role="3Tt5mk" to="c4fa:5so5TTr6Vvo" resolve="condition" />
               </node>
             </node>
             <node concept="2OqwBi" id="6RZtz2lulI7" role="37vLTJ">
               <node concept="2Sf5sV" id="6RZtz2lulB5" role="2Oq$k0" />
               <node concept="3TrEf2" id="6RZtz2luo8a" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" />
+                <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" resolve="condition" />
               </node>
             </node>
           </node>
@@ -635,7 +634,7 @@
                         <ref role="3cqZAo" node="1ZXVTt33BkG" resolve="register" />
                       </node>
                       <node concept="3TrEf2" id="1ZXVTt33BkY" role="2OqNvi">
-                        <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                        <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                       </node>
                     </node>
                     <node concept="2c44tf" id="1ZXVTt33BkZ" role="37vLTx">
@@ -797,7 +796,7 @@
                         <ref role="3cqZAo" node="1ZXVTt3388K" resolve="register" />
                       </node>
                       <node concept="3TrEf2" id="1ZXVTt33a7T" role="2OqNvi">
-                        <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                        <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                       </node>
                     </node>
                     <node concept="2c44tf" id="1ZXVTt33f0z" role="37vLTx">
@@ -1009,7 +1008,7 @@
                             <ref role="3cqZAo" node="1ZXVTt36SnE" resolve="register" />
                           </node>
                           <node concept="3TrEf2" id="2gwo2Q2kPiH" role="2OqNvi">
-                            <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                            <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                           </node>
                         </node>
                       </node>
@@ -1026,7 +1025,7 @@
                                 <ref role="3cqZAo" node="1ZXVTt36SnE" resolve="register" />
                               </node>
                               <node concept="3TrEf2" id="2gwo2Q2kQjI" role="2OqNvi">
-                                <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                               </node>
                             </node>
                             <node concept="2DeJnY" id="2gwo2Q2kS1r" role="2OqNvi">
@@ -1034,7 +1033,7 @@
                             </node>
                           </node>
                           <node concept="3TrEf2" id="2gwo2Q2kT0O" role="2OqNvi">
-                            <ref role="3Tt5mk" to="koo2:cDLCOYiq1v" />
+                            <ref role="3Tt5mk" to="koo2:cDLCOYiq1v" resolve="reg" />
                           </node>
                         </node>
                       </node>
@@ -1099,7 +1098,7 @@
                 <ref role="3cqZAo" node="1ZXVTt34fPn" resolve="arduinoDescription" />
               </node>
               <node concept="3Tsc0h" id="1ZXVTt354Mm" role="2OqNvi">
-                <ref role="3TtcxE" to="koo2:5TY7OGK$Adi" />
+                <ref role="3TtcxE" to="koo2:5TY7OGK$Adi" resolve="registers" />
               </node>
             </node>
             <node concept="X8dFx" id="1ZXVTt358Zo" role="2OqNvi">
@@ -1110,31 +1109,31 @@
                 <node concept="2S7cBI" id="1ZXVTt35hKe" role="2OqNvi">
                   <node concept="1bVj0M" id="1ZXVTt35hKg" role="23t8la">
                     <node concept="3clFbS" id="1ZXVTt35hKh" role="1bW5cS">
-                      <node concept="3clFbF" id="1ZXVTt35i17" role="3cqZAp">
-                        <node concept="2EnYce" id="1ZXVTt35i19" role="3clFbG">
-                          <node concept="0kSF2" id="1ZXVTt35i1a" role="2Oq$k0">
-                            <node concept="3uibUv" id="1ZXVTt35QM7" role="0kSFW">
+                      <node concept="3clFbF" id="3tp$LrDwXny" role="3cqZAp">
+                        <node concept="2OqwBi" id="3tp$LrDxdd6" role="3clFbG">
+                          <node concept="0kSF2" id="3tp$LrDx9JH" role="2Oq$k0">
+                            <node concept="3uibUv" id="3tp$LrDxaNU" role="0kSFW">
                               <ref role="3uigEE" to="wyt6:~Number" resolve="Number" />
                             </node>
-                            <node concept="2OqwBi" id="1ZXVTt35i1c" role="0kSFX">
-                              <node concept="1PxgMI" id="1ZXVTt35i1d" role="2Oq$k0">
+                            <node concept="2OqwBi" id="3tp$LrDx5_z" role="0kSFX">
+                              <node concept="1PxgMI" id="3tp$LrDx23Y" role="2Oq$k0">
                                 <property role="1BlNFB" value="true" />
-                                <ref role="1PxNhF" to="mj1l:Ux_D7zz3Zc" resolve="HexNumberLiteral" />
-                                <node concept="2OqwBi" id="1ZXVTt35i1e" role="1PxMeX">
-                                  <node concept="37vLTw" id="1ZXVTt35i1f" role="2Oq$k0">
+                                <ref role="1m5ApE" to="mj1l:Ux_D7zz3Zc" resolve="HexNumberLiteral" />
+                                <node concept="2OqwBi" id="3tp$LrDwZah" role="1m5AlR">
+                                  <node concept="37vLTw" id="3tp$LrDwXnw" role="2Oq$k0">
                                     <ref role="3cqZAo" node="1ZXVTt35hKi" resolve="it" />
                                   </node>
-                                  <node concept="3TrEf2" id="1ZXVTt35i1g" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                                  <node concept="3TrEf2" id="3tp$LrDx0u5" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="2qgKlT" id="1ZXVTt35i1h" role="2OqNvi">
+                              <node concept="2qgKlT" id="3tp$LrDx7ec" role="2OqNvi">
                                 <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
                               </node>
                             </node>
                           </node>
-                          <node concept="liA8E" id="1ZXVTt35i1i" role="2OqNvi">
+                          <node concept="liA8E" id="3tp$LrDxgCP" role="2OqNvi">
                             <ref role="37wK5l" to="wyt6:~Number.intValue():int" resolve="intValue" />
                           </node>
                         </node>
@@ -1153,6 +1152,7 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="3tp$LrDwTBv" role="3cqZAp" />
       </node>
     </node>
     <node concept="2SaL7w" id="2gwo2Q2kFa2" role="2ZfVeh">
diff --git a/languages/mbeddr.arduino.core/languageModels/typesystem.mps b/languages/mbeddr.arduino.core/languageModels/typesystem.mps
old mode 100644
new mode 100755
index 0d16714..211b5e6
--- a/languages/mbeddr.arduino.core/languageModels/typesystem.mps
+++ b/languages/mbeddr.arduino.core/languageModels/typesystem.mps
@@ -143,6 +143,10 @@
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+      </concept>
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
@@ -150,10 +154,7 @@
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <reference id="1140138128738" name="concept" index="1PxNhF" />
-        <child id="1140138123956" name="leftExpression" index="1PxMeX" />
-      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -275,7 +276,7 @@
                 <ref role="1YBMHb" node="26IgR5b9RSb" resolve="dl" />
               </node>
               <node concept="3TrEf2" id="26IgR5b9RT7" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:26IgR5b9RPe" />
+                <ref role="3Tt5mk" to="koo2:26IgR5b9RPe" resolve="expression" />
               </node>
             </node>
           </node>
@@ -298,7 +299,7 @@
                 <ref role="1YBMHb" node="26IgR5ba1vn" resolve="dl" />
               </node>
               <node concept="3TrEf2" id="26IgR5ba1wq" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:26IgR5b9RPe" />
+                <ref role="3Tt5mk" to="koo2:26IgR5b9RPe" resolve="expression" />
               </node>
             </node>
             <node concept="2qgKlT" id="26IgR5ba1wr" role="2OqNvi">
@@ -316,7 +317,7 @@
                 <ref role="1YBMHb" node="26IgR5ba1vn" resolve="dl" />
               </node>
               <node concept="3TrEf2" id="26IgR5ba1xb" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:26IgR5b9RPe" />
+                <ref role="3Tt5mk" to="koo2:26IgR5b9RPe" resolve="expression" />
               </node>
             </node>
           </node>
@@ -368,7 +369,7 @@
                 <ref role="1YBMHb" node="EvPvZE510D" resolve="rre" />
               </node>
               <node concept="3TrEf2" id="EvPvZE511v" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:cDLCOYiq1v" />
+                <ref role="3Tt5mk" to="koo2:cDLCOYiq1v" resolve="reg" />
               </node>
             </node>
           </node>
@@ -439,7 +440,7 @@
                 <ref role="1YBMHb" node="1qwvy7xGHjp" resolve="apc" />
               </node>
               <node concept="3TrEf2" id="1qwvy7xGHka" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:1qwvy7xGC75" />
+                <ref role="3Tt5mk" to="koo2:1qwvy7xGC75" resolve="analogPin" />
               </node>
             </node>
           </node>
@@ -470,7 +471,7 @@
                 <ref role="1YBMHb" node="5cS3I48YX29" resolve="reg" />
               </node>
               <node concept="3TrEf2" id="2LVOPccdyeP" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
               </node>
             </node>
           </node>
@@ -522,7 +523,7 @@
                 <ref role="1YBMHb" node="5cS3I48ZaOU" resolve="register" />
               </node>
               <node concept="3TrEf2" id="6OcqZnLV$Cg" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
               </node>
             </node>
             <node concept="3x8VRR" id="6OcqZnLV_Js" role="2OqNvi" />
@@ -534,7 +535,7 @@
                   <ref role="1YBMHb" node="5cS3I48ZaOU" resolve="register" />
                 </node>
                 <node concept="3TrEf2" id="5cS3I48ZaPr" role="2OqNvi">
-                  <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                  <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                 </node>
               </node>
               <node concept="2qgKlT" id="5cS3I48ZaQ2" role="2OqNvi">
@@ -553,7 +554,7 @@
                 <ref role="1YBMHb" node="5cS3I48ZaOU" resolve="register" />
               </node>
               <node concept="3TrEf2" id="5cS3I48ZaQS" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
               </node>
             </node>
           </node>
@@ -586,7 +587,7 @@
                 <ref role="1YBMHb" node="60mYxM6tGa4" resolve="wordRegister" />
               </node>
               <node concept="3TrEf2" id="60mYxM6tGd0" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" />
+                <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
               </node>
             </node>
           </node>
@@ -627,7 +628,7 @@
                 <ref role="1YBMHb" node="5zHSh8Vlzkp" resolve="ws" />
               </node>
               <node concept="3TrEf2" id="5zHSh8VojpC" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" />
+                <ref role="3Tt5mk" to="koo2:4Mvxa96AcG3" resolve="expression" />
               </node>
             </node>
           </node>
@@ -675,7 +676,7 @@
                   <ref role="2Gs0qQ" node="1BZ0lgDLvsI" resolve="mr" />
                 </node>
                 <node concept="3TrEf2" id="1BZ0lgDLvsU" role="2OqNvi">
-                  <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" />
+                  <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
                 </node>
               </node>
             </node>
@@ -690,12 +691,12 @@
                   <node concept="2OqwBi" id="1BZ0lgDLvu1" role="37vLTx">
                     <node concept="2OqwBi" id="1BZ0lgDLvtn" role="2Oq$k0">
                       <node concept="2OqwBi" id="1BZ0lgDLvti" role="2Oq$k0">
-                        <node concept="2qgKlT" id="5DwX9xlGCpS" role="2OqNvi">
+                        <node concept="2qgKlT" id="3tp$LrDxyoc" role="2OqNvi">
                           <ref role="37wK5l" to="qd6m:5DwX9xlFNJe" resolve="flattenedContents" />
                         </node>
-                        <node concept="1PxgMI" id="1BZ0lgDLvtg" role="2Oq$k0">
-                          <ref role="1PxNhF" to="x27k:5_l8w1EmTde" resolve="ImplementationModule" />
-                          <node concept="3cpWsa" id="1BZ0lgDLvtf" role="1PxMeX">
+                        <node concept="1PxgMI" id="3tp$LrDxx05" role="2Oq$k0">
+                          <ref role="1m5ApE" to="x27k:5_l8w1EmTde" resolve="ImplementationModule" />
+                          <node concept="37vLTw" id="3tp$LrDxloY" role="1m5AlR">
                             <ref role="3cqZAo" node="1BZ0lgDLvsM" resolve="module" />
                           </node>
                         </node>
@@ -745,7 +746,7 @@
             <ref role="1YBMHb" node="3dH4JopdKhR" resolve="executable" />
           </node>
           <node concept="3Tsc0h" id="1BZ0lgDLwil" role="2OqNvi">
-            <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" />
+            <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
           </node>
         </node>
       </node>
@@ -815,7 +816,7 @@
                 <ref role="1YBMHb" node="6RZtz2lqZoS" resolve="sleepStatement" />
               </node>
               <node concept="3TrEf2" id="6RZtz2lr2p5" role="2OqNvi">
-                <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" />
+                <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" resolve="condition" />
               </node>
             </node>
           </node>
@@ -846,11 +847,11 @@
                         <ref role="1YBMHb" node="6RZtz2lslbs" resolve="ifStatement" />
                       </node>
                       <node concept="3TrEf2" id="6RZtz2ltpla" role="2OqNvi">
-                        <ref role="3Tt5mk" to="c4fa:5so5TTr6Vvp" />
+                        <ref role="3Tt5mk" to="c4fa:5so5TTr6Vvp" resolve="thenPart" />
                       </node>
                     </node>
                     <node concept="3Tsc0h" id="6RZtz2ltsFi" role="2OqNvi">
-                      <ref role="3TtcxE" to="c4fa:3CmSUB7Fp_m" />
+                      <ref role="3TtcxE" to="c4fa:3CmSUB7Fp_m" resolve="statements" />
                     </node>
                   </node>
                   <node concept="1uHKPH" id="6RZtz2ltJ8M" role="2OqNvi" />
@@ -865,11 +866,11 @@
                       <ref role="1YBMHb" node="6RZtz2lslbs" resolve="ifStatement" />
                     </node>
                     <node concept="3TrEf2" id="6RZtz2lsR0k" role="2OqNvi">
-                      <ref role="3Tt5mk" to="c4fa:5so5TTr6Vvp" />
+                      <ref role="3Tt5mk" to="c4fa:5so5TTr6Vvp" resolve="thenPart" />
                     </node>
                   </node>
                   <node concept="3Tsc0h" id="6RZtz2lsVQH" role="2OqNvi">
-                    <ref role="3TtcxE" to="c4fa:3CmSUB7Fp_m" />
+                    <ref role="3TtcxE" to="c4fa:3CmSUB7Fp_m" resolve="statements" />
                   </node>
                 </node>
                 <node concept="1uHKPH" id="6RZtz2ltctF" role="2OqNvi" />
@@ -893,11 +894,11 @@
                   <ref role="1YBMHb" node="6RZtz2lslbs" resolve="ifStatement" />
                 </node>
                 <node concept="3TrEf2" id="6RZtz2lsomd" role="2OqNvi">
-                  <ref role="3Tt5mk" to="c4fa:5so5TTr6Vvp" />
+                  <ref role="3Tt5mk" to="c4fa:5so5TTr6Vvp" resolve="thenPart" />
                 </node>
               </node>
               <node concept="3Tsc0h" id="6RZtz2lstbb" role="2OqNvi">
-                <ref role="3TtcxE" to="c4fa:3CmSUB7Fp_m" />
+                <ref role="3TtcxE" to="c4fa:3CmSUB7Fp_m" resolve="statements" />
               </node>
             </node>
             <node concept="34oBXx" id="6RZtz2lsHJh" role="2OqNvi" />
diff --git a/languages/mbeddr.arduino.core/solutions/pluginSolution/models/mbeddr/arduino/core/pluginSolution/plugin.mps b/languages/mbeddr.arduino.core/solutions/pluginSolution/models/mbeddr/arduino/core/pluginSolution/plugin.mps
old mode 100644
new mode 100755
index 542a2b9..95e92c2
--- a/languages/mbeddr.arduino.core/solutions/pluginSolution/models/mbeddr/arduino/core/pluginSolution/plugin.mps
+++ b/languages/mbeddr.arduino.core/solutions/pluginSolution/models/mbeddr/arduino/core/pluginSolution/plugin.mps
@@ -34,7 +34,7 @@
   </imports>
   <registry>
     <language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
-      <concept id="8974276187400029883" name="jetbrains.mps.lang.resources.structure.IconResource" flags="ng" index="1QGGSu" />
+      <concept id="8974276187400029883" name="jetbrains.mps.lang.resources.structure.FileIcon" flags="ng" index="1QGGSu" />
       <concept id="8974276187400029898" name="jetbrains.mps.lang.resources.structure.Resource" flags="ng" index="1QGGTJ">
         <property id="8974276187400029899" name="path" index="1QGGTI" />
       </concept>
@@ -350,13 +350,14 @@
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+      </concept>
       <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
         <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <reference id="1140138128738" name="concept" index="1PxNhF" />
-        <child id="1140138123956" name="leftExpression" index="1PxMeX" />
-      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@@ -809,9 +810,9 @@
                             </node>
                             <node concept="2OqwBi" id="39xl5bPwGAB" role="3uHU7w">
                               <node concept="1eOMI4" id="39xl5bPwGA3" role="2Oq$k0">
-                                <node concept="1PxgMI" id="39xl5bPwGAr" role="1eOMHV">
-                                  <ref role="1PxNhF" to="51wr:4o9sgv8QoKi" resolve="Executable" />
-                                  <node concept="2OqwBi" id="39xl5bPwGAf" role="1PxMeX">
+                                <node concept="1PxgMI" id="3tp$LrD_w0k" role="1eOMHV">
+                                  <ref role="1m5ApE" to="51wr:4o9sgv8QoKi" resolve="Executable" />
+                                  <node concept="2OqwBi" id="39xl5bPwGAf" role="1m5AlR">
                                     <node concept="2OqwBi" id="39xl5bPwG_T" role="2Oq$k0">
                                       <node concept="2LYoG9" id="39xl5bPwG_I" role="2Oq$k0">
                                         <ref role="2LYoGb" node="1CG6XUfjweF" resolve="config" />
@@ -826,7 +827,7 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="2qgKlT" id="6RZtz2kXSeP" role="2OqNvi">
+                              <node concept="2qgKlT" id="3tp$LrD_wMk" role="2OqNvi">
                                 <ref role="37wK5l" to="ahli:Dp4TemBUyu" resolve="executableFileName" />
                               </node>
                             </node>
@@ -853,18 +854,18 @@
                               <node concept="2YIFZM" id="CJowczrs9z" role="3CLvVj">
                                 <ref role="1Pybhc" to="x3yd:1ptFCtLqsnU" resolve="PlatformUtil" />
                                 <ref role="37wK5l" to="x3yd:CJowczpW7q" resolve="getFolderFQ" />
-                                <node concept="1PxgMI" id="39xl5bPwGBq" role="37wK5m">
-                                  <ref role="1PxNhF" to="51wr:4o9sgv8QoKk" resolve="Binary" />
-                                  <node concept="2OqwBi" id="39xl5bPwGB9" role="1PxMeX">
-                                    <node concept="2OqwBi" id="39xl5bPwGAS" role="2Oq$k0">
-                                      <node concept="2LYoG9" id="CJowczrs9$" role="2Oq$k0">
+                                <node concept="1PxgMI" id="3tp$LrD_yn1" role="37wK5m">
+                                  <ref role="1m5ApE" to="51wr:4o9sgv8QoKk" resolve="Binary" />
+                                  <node concept="2OqwBi" id="3tp$LrD_xEg" role="1m5AlR">
+                                    <node concept="2OqwBi" id="3tp$LrD_xEh" role="2Oq$k0">
+                                      <node concept="2LYoG9" id="3tp$LrD_xEi" role="2Oq$k0">
                                         <ref role="2LYoGb" node="1CG6XUfjweF" resolve="config" />
                                       </node>
-                                      <node concept="yHkDZ" id="39xl5bPwGAX" role="2OqNvi">
+                                      <node concept="yHkDZ" id="3tp$LrD_xEj" role="2OqNvi">
                                         <ref role="yHkDY" node="1ptFCtLqsrq" resolve="myBinary" />
                                       </node>
                                     </node>
-                                    <node concept="2XshWL" id="39xl5bPwGBf" role="2OqNvi">
+                                    <node concept="2XshWL" id="3tp$LrD_xEk" role="2OqNvi">
                                       <ref role="2WH_rO" to="awpe:7byHRlLC1PV" resolve="getNode" />
                                     </node>
                                   </node>
@@ -888,18 +889,18 @@
                                 <node concept="2YIFZM" id="CJowczrsac" role="3CLvVj">
                                   <ref role="1Pybhc" to="x3yd:1ptFCtLqsnU" resolve="PlatformUtil" />
                                   <ref role="37wK5l" to="x3yd:CJowczpW7q" resolve="getFolderFQ" />
-                                  <node concept="1PxgMI" id="39xl5bPwGCj" role="37wK5m">
-                                    <ref role="1PxNhF" to="51wr:4o9sgv8QoKk" resolve="Binary" />
-                                    <node concept="2OqwBi" id="39xl5bPwGC2" role="1PxMeX">
-                                      <node concept="2OqwBi" id="39xl5bPwGBA" role="2Oq$k0">
-                                        <node concept="2LYoG9" id="CJowczrsad" role="2Oq$k0">
+                                  <node concept="1PxgMI" id="3tp$LrD_zsb" role="37wK5m">
+                                    <ref role="1m5ApE" to="51wr:4o9sgv8QoKk" resolve="Binary" />
+                                    <node concept="2OqwBi" id="3tp$LrD_yQB" role="1m5AlR">
+                                      <node concept="2OqwBi" id="3tp$LrD_yQC" role="2Oq$k0">
+                                        <node concept="2LYoG9" id="3tp$LrD_yQD" role="2Oq$k0">
                                           <ref role="2LYoGb" node="1CG6XUfjweF" resolve="config" />
                                         </node>
-                                        <node concept="yHkDZ" id="39xl5bPwGBF" role="2OqNvi">
+                                        <node concept="yHkDZ" id="3tp$LrD_yQE" role="2OqNvi">
                                           <ref role="yHkDY" node="1ptFCtLqsrq" resolve="myBinary" />
                                         </node>
                                       </node>
-                                      <node concept="2XshWL" id="39xl5bPwGC8" role="2OqNvi">
+                                      <node concept="2XshWL" id="3tp$LrD_yQF" role="2OqNvi">
                                         <ref role="2WH_rO" to="awpe:7byHRlLC1PV" resolve="getNode" />
                                       </node>
                                     </node>
diff --git a/languages/mbeddr.arduino.interrupts/generator/template/main@generator.mps b/languages/mbeddr.arduino.interrupts/generator/template/main@generator.mps
old mode 100644
new mode 100755
index 496e2a2..6579c01
--- a/languages/mbeddr.arduino.interrupts/generator/template/main@generator.mps
+++ b/languages/mbeddr.arduino.interrupts/generator/template/main@generator.mps
@@ -102,6 +102,10 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+      </concept>
       <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
         <child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
       </concept>
@@ -111,10 +115,7 @@
       <concept id="1139867745658" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithNewOperation" flags="nn" index="1_qnLN">
         <reference id="1139867957129" name="concept" index="1_rbq0" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <reference id="1140138128738" name="concept" index="1PxNhF" />
-        <child id="1140138123956" name="leftExpression" index="1PxMeX" />
-      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -184,14 +185,14 @@
             <node concept="10P_77" id="7X9xw2qE_zH" role="1tU5fm" />
             <node concept="2OqwBi" id="7X9xw2qE_zI" role="33vP2m">
               <node concept="2OqwBi" id="7X9xw2qE_zJ" role="2Oq$k0">
-                <node concept="1PxgMI" id="7X9xw2qE_zK" role="2Oq$k0">
-                  <ref role="1PxNhF" to="nbyu:7X9xw2qCMiq" resolve="InterruptConfigItem" />
-                  <node concept="37vLTw" id="7X9xw2qE_zL" role="1PxMeX">
+                <node concept="1PxgMI" id="3tp$LrD__7t" role="2Oq$k0">
+                  <ref role="1m5ApE" to="nbyu:7X9xw2qCMiq" resolve="InterruptConfigItem" />
+                  <node concept="37vLTw" id="3tp$LrD_$k$" role="1m5AlR">
                     <ref role="3cqZAo" node="7X9xw2qE_zy" resolve="rc" />
                   </node>
                 </node>
-                <node concept="3TrEf2" id="7X9xw2qEBRS" role="2OqNvi">
-                  <ref role="3Tt5mk" to="nbyu:7X9xw2qCZP6" />
+                <node concept="3TrEf2" id="3tp$LrD__KD" role="2OqNvi">
+                  <ref role="3Tt5mk" to="nbyu:7X9xw2qCZP6" resolve="kind" />
                 </node>
               </node>
               <node concept="1mIQ4w" id="7X9xw2qE_zN" role="2OqNvi">
@@ -252,7 +253,7 @@
                     <ref role="2Gs0qQ" node="4vmikwGY6yp" resolve="isr" />
                   </node>
                   <node concept="3TrEf2" id="4vmikwGYaGJ" role="2OqNvi">
-                    <ref role="3Tt5mk" to="nbyu:SwwM9UHwwK" />
+                    <ref role="3Tt5mk" to="nbyu:SwwM9UHwwK" resolve="body" />
                   </node>
                 </node>
                 <node concept="2OqwBi" id="4vmikwGYaGK" role="37vLTJ">
@@ -260,7 +261,7 @@
                     <ref role="3cqZAo" node="4vmikwGYaGA" resolve="arduinoIsr" />
                   </node>
                   <node concept="3TrEf2" id="4vmikwGYaGM" role="2OqNvi">
-                    <ref role="3Tt5mk" to="8y1r:4u2wEbSxlZV" />
+                    <ref role="3Tt5mk" to="8y1r:4u2wEbSxlZV" resolve="body" />
                   </node>
                 </node>
               </node>
@@ -273,7 +274,7 @@
                       <ref role="2Gs0qQ" node="4vmikwGY6yp" resolve="isr" />
                     </node>
                     <node concept="3TrEf2" id="4vmikwGYaGS" role="2OqNvi">
-                      <ref role="3Tt5mk" to="nbyu:SwwM9UHwwO" />
+                      <ref role="3Tt5mk" to="nbyu:SwwM9UHwwO" resolve="interrupt" />
                     </node>
                   </node>
                   <node concept="3TrcHB" id="4vmikwGYaGT" role="2OqNvi">
diff --git a/languages/mbeddr.arduino.registers/generator/template/main@generator.mps b/languages/mbeddr.arduino.registers/generator/template/main@generator.mps
old mode 100644
new mode 100755
index fca5937..4c9eb04
--- a/languages/mbeddr.arduino.registers/generator/template/main@generator.mps
+++ b/languages/mbeddr.arduino.registers/generator/template/main@generator.mps
@@ -80,7 +80,7 @@
       </concept>
     </language>
     <language id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements">
-      <concept id="3830958861296879113" name="com.mbeddr.core.statements.structure.AbritraryTextItem" flags="ng" index="19_wF0">
+      <concept id="3830958861296879113" name="com.mbeddr.core.statements.structure.ArbitraryTextItem" flags="ng" index="19_wF0">
         <property id="3830958861296879114" name="text" index="19_wF3" />
       </concept>
       <concept id="3830958861296871078" name="com.mbeddr.core.statements.structure.ArbitraryTextExpression" flags="ng" index="19_ADJ">
@@ -152,6 +152,10 @@
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+      </concept>
       <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
       <concept id="1171315804604" name="jetbrains.mps.lang.smodel.structure.Model_RootsOperation" flags="nn" index="2RRcyG">
         <reference id="1171315804605" name="concept" index="2RRcyH" />
@@ -166,10 +170,7 @@
       <concept id="1206482823744" name="jetbrains.mps.lang.smodel.structure.Model_AddRootOperation" flags="nn" index="3BYIHo">
         <child id="1206482823746" name="nodeArgument" index="3BYIHq" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <reference id="1140138128738" name="concept" index="1PxNhF" />
-        <child id="1140138123956" name="leftExpression" index="1PxMeX" />
-      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -238,7 +239,7 @@
                       <node concept="2OqwBi" id="exHFgzSf2f" role="2Oq$k0">
                         <node concept="30H73N" id="exHFgzSeUQ" role="2Oq$k0" />
                         <node concept="3TrEf2" id="exHFgzShjZ" role="2OqNvi">
-                          <ref role="3Tt5mk" to="nbyu:5W7baq$5VaA" />
+                          <ref role="3Tt5mk" to="nbyu:5W7baq$5VaA" resolve="register" />
                         </node>
                       </node>
                       <node concept="3TrcHB" id="exHFgzSiKz" role="2OqNvi">
@@ -288,14 +289,14 @@
             <node concept="10P_77" id="to$mQWqqal" role="1tU5fm" />
             <node concept="2OqwBi" id="to$mQWqq0X" role="33vP2m">
               <node concept="2OqwBi" id="to$mQWqq0Y" role="2Oq$k0">
-                <node concept="1PxgMI" id="to$mQWqq0Z" role="2Oq$k0">
-                  <ref role="1PxNhF" to="nbyu:5W7baq$5xJh" resolve="RegisterConfigurationItem" />
-                  <node concept="37vLTw" id="43Joy80Lo54" role="1PxMeX">
+                <node concept="1PxgMI" id="3tp$LrD_Dwd" role="2Oq$k0">
+                  <ref role="1m5ApE" to="nbyu:5W7baq$5xJh" resolve="RegisterConfigurationItem" />
+                  <node concept="37vLTw" id="3tp$LrD_CHk" role="1m5AlR">
                     <ref role="3cqZAo" node="to$mQWqqaa" resolve="rc" />
                   </node>
                 </node>
-                <node concept="3TrEf2" id="5W7baq$aVhT" role="2OqNvi">
-                  <ref role="3Tt5mk" to="nbyu:5W7baq$aNen" />
+                <node concept="3TrEf2" id="3tp$LrD_E9p" role="2OqNvi">
+                  <ref role="3Tt5mk" to="nbyu:5W7baq$aNen" resolve="kind" />
                 </node>
               </node>
               <node concept="1mIQ4w" id="5W7baq$aXRz" role="2OqNvi">
@@ -378,7 +379,7 @@
                       </node>
                     </node>
                     <node concept="2pIpSj" id="exHFgzTl2R" role="2pJxcM">
-                      <ref role="2pIpSl" to="x27k:5jyom5fOqJU" />
+                      <ref role="2pIpSl" to="x27k:5jyom5fOqJU" resolve="descriptors" />
                       <node concept="2pJPED" id="exHFgzTl2S" role="2pJxcZ">
                         <ref role="2pJxaS" to="x27k:5jyom5fOqJw" resolve="HeaderDescriptor" />
                         <node concept="2pJxcG" id="exHFgzTl2T" role="2pJxcM">
@@ -431,9 +432,9 @@
                   <node concept="1bVj0M" id="exHFgzSQ2p" role="23t8la">
                     <node concept="3clFbS" id="exHFgzSQ2q" role="1bW5cS">
                       <node concept="3clFbF" id="exHFgzSQ2r" role="3cqZAp">
-                        <node concept="1PxgMI" id="exHFgzSQ2s" role="3clFbG">
-                          <ref role="1PxNhF" to="x27k:5_l8w1EmTde" resolve="ImplementationModule" />
-                          <node concept="2OqwBi" id="exHFgzSQ2t" role="1PxMeX">
+                        <node concept="1PxgMI" id="3tp$LrD_Bes" role="3clFbG">
+                          <ref role="1m5ApE" to="x27k:5_l8w1EmTde" resolve="ImplementationModule" />
+                          <node concept="2OqwBi" id="exHFgzSQ2t" role="1m5AlR">
                             <node concept="37vLTw" id="exHFgzSQ2u" role="2Oq$k0">
                               <ref role="3cqZAo" node="exHFgzSQ2w" resolve="it" />
                             </node>
@@ -456,7 +457,7 @@
                 <node concept="3clFbS" id="exHFgzTnyr" role="1bW5cS">
                   <node concept="3clFbF" id="exHFgzTn$W" role="3cqZAp">
                     <node concept="2OqwBi" id="exHFgzTnMe" role="3clFbG">
-                      <node concept="37vLTw" id="exHFgzTn$V" role="2Oq$k0">
+                      <node concept="37vLTw" id="3tp$LrD_BM9" role="2Oq$k0">
                         <ref role="3cqZAo" node="exHFgzTnys" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="exHFgzTpV3" role="2OqNvi">
diff --git a/languages/mbeddr.arduino.statemachine/languageModels/typesystem.mps b/languages/mbeddr.arduino.statemachine/languageModels/typesystem.mps
old mode 100644
new mode 100755
index 1ae2a18..de47913
--- a/languages/mbeddr.arduino.statemachine/languageModels/typesystem.mps
+++ b/languages/mbeddr.arduino.statemachine/languageModels/typesystem.mps
@@ -101,6 +101,10 @@
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+      </concept>
       <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
       <concept id="3562215692195599741" name="jetbrains.mps.lang.smodel.structure.SLinkImplicitSelect" flags="nn" index="13MTOL">
         <reference id="3562215692195600259" name="link" index="13MTZf" />
@@ -112,10 +116,7 @@
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <reference id="1140138128738" name="concept" index="1PxNhF" />
-        <child id="1140138123956" name="leftExpression" index="1PxMeX" />
-      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -167,15 +168,15 @@
           <node concept="3Tqbb2" id="2NO1T5RJVrF" role="1tU5fm">
             <ref role="ehGHo" to="ttha:2NO1T5RDqn0" resolve="ArduinoStatemachineInterruptConfigItem" />
           </node>
-          <node concept="1PxgMI" id="2NO1T5RJYdL" role="33vP2m">
-            <ref role="1PxNhF" to="ttha:2NO1T5RDqn0" resolve="ArduinoStatemachineInterruptConfigItem" />
-            <node concept="2OqwBi" id="2NO1T5RJVrU" role="1PxMeX">
+          <node concept="1PxgMI" id="3tp$LrD_Yu$" role="33vP2m">
+            <ref role="1m5ApE" to="ttha:2NO1T5RDqn0" resolve="ArduinoStatemachineInterruptConfigItem" />
+            <node concept="2OqwBi" id="2NO1T5RJVrU" role="1m5AlR">
               <node concept="2OqwBi" id="2NO1T5RJVrV" role="2Oq$k0">
                 <node concept="1YBJjd" id="2NO1T5RJVrW" role="2Oq$k0">
                   <ref role="1YBMHb" node="2NO1T5RGYZG" resolve="buildConfiguration" />
                 </node>
                 <node concept="3Tsc0h" id="2NO1T5RJVrX" role="2OqNvi">
-                  <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" />
+                  <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" resolve="configurationItems" />
                 </node>
               </node>
               <node concept="1z4cxt" id="2NO1T5RJVrY" role="2OqNvi">
@@ -239,11 +240,11 @@
                   <ref role="1YBMHb" node="2NO1T5RGYZG" resolve="buildConfiguration" />
                 </node>
                 <node concept="3Tsc0h" id="2NO1T5RHznX" role="2OqNvi">
-                  <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" />
+                  <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" resolve="binaries" />
                 </node>
               </node>
               <node concept="13MTOL" id="2NO1T5RHznY" role="2OqNvi">
-                <ref role="13MTZf" to="51wr:4o9sgv8QoKn" />
+                <ref role="13MTZf" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
               </node>
             </node>
             <node concept="3$u5V9" id="2NO1T5RHznZ" role="2OqNvi">
@@ -255,7 +256,7 @@
                         <ref role="3cqZAo" node="2NO1T5RHzo6" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="2NO1T5RHzo5" role="2OqNvi">
-                        <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" />
+                        <ref role="3Tt5mk" to="51wr:6GqYvBOf2Xc" resolve="module" />
                       </node>
                     </node>
                   </node>
@@ -317,7 +318,7 @@
                           <ref role="3cqZAo" node="2NO1T5RIhql" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="2NO1T5RIhqi" role="2OqNvi">
-                          <ref role="3Tt5mk" to="mj1l:hEaDaGor64" />
+                          <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
                         </node>
                       </node>
                       <node concept="1mIQ4w" id="2NO1T5RIhqj" role="2OqNvi">
@@ -356,20 +357,20 @@
                     <node concept="2OqwBi" id="2NO1T5RJx0u" role="3clFbG">
                       <node concept="2OqwBi" id="2NO1T5RJx0v" role="2Oq$k0">
                         <node concept="2OqwBi" id="2NO1T5RJx0w" role="2Oq$k0">
-                          <node concept="1PxgMI" id="2NO1T5RJx0x" role="2Oq$k0">
-                            <ref role="1PxNhF" to="clqz:6NQSyUTqXkL" resolve="StatemachineType" />
-                            <node concept="2OqwBi" id="2NO1T5RJx0y" role="1PxMeX">
+                          <node concept="3TrEf2" id="3tp$LrDAd5E" role="2OqNvi">
+                            <ref role="3Tt5mk" to="clqz:6NQSyUTqXkM" resolve="machine" />
+                          </node>
+                          <node concept="1PxgMI" id="3tp$LrDAbnh" role="2Oq$k0">
+                            <ref role="1m5ApE" to="clqz:6NQSyUTqXkL" resolve="StatemachineType" />
+                            <node concept="2OqwBi" id="2NO1T5RJx0y" role="1m5AlR">
                               <node concept="37vLTw" id="2NO1T5RJx0z" role="2Oq$k0">
                                 <ref role="3cqZAo" node="2NO1T5RJx0N" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="2NO1T5RJx0$" role="2OqNvi">
-                                <ref role="3Tt5mk" to="mj1l:hEaDaGor64" />
+                                <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
                               </node>
                             </node>
                           </node>
-                          <node concept="3TrEf2" id="2NO1T5RJx0_" role="2OqNvi">
-                            <ref role="3Tt5mk" to="clqz:6NQSyUTqXkM" />
-                          </node>
                         </node>
                         <node concept="2qgKlT" id="2NO1T5RJx0A" role="2OqNvi">
                           <ref role="37wK5l" to="ktif:6MWlM4926ut" resolve="inEvents" />
@@ -385,7 +386,7 @@
                                     <ref role="3cqZAo" node="2NO1T5RJx0L" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="2NO1T5RJx0I" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="clqz:41KMvfcjScw" />
+                                    <ref role="3Tt5mk" to="clqz:41KMvfcjScw" resolve="binding" />
                                   </node>
                                 </node>
                                 <node concept="1mIQ4w" id="2NO1T5RJx0J" role="2OqNvi">
@@ -436,20 +437,20 @@
               <node concept="2OqwBi" id="2NO1T5RLmTE" role="33vP2m">
                 <node concept="2OqwBi" id="2NO1T5RLmTF" role="2Oq$k0">
                   <node concept="2OqwBi" id="2NO1T5RLmTG" role="2Oq$k0">
-                    <node concept="1PxgMI" id="2NO1T5RLmTH" role="2Oq$k0">
-                      <ref role="1PxNhF" to="clqz:6NQSyUTqXkL" resolve="StatemachineType" />
-                      <node concept="2OqwBi" id="2NO1T5RLmTI" role="1PxMeX">
+                    <node concept="3TrEf2" id="3tp$LrDAy5d" role="2OqNvi">
+                      <ref role="3Tt5mk" to="clqz:6NQSyUTqXkM" resolve="machine" />
+                    </node>
+                    <node concept="1PxgMI" id="3tp$LrDAwCz" role="2Oq$k0">
+                      <ref role="1m5ApE" to="clqz:6NQSyUTqXkL" resolve="StatemachineType" />
+                      <node concept="2OqwBi" id="2NO1T5RLmTI" role="1m5AlR">
                         <node concept="2GrUjf" id="2NO1T5RLmTJ" role="2Oq$k0">
                           <ref role="2Gs0qQ" node="2NO1T5RK8QC" resolve="decl" />
                         </node>
                         <node concept="3TrEf2" id="2NO1T5RLmTK" role="2OqNvi">
-                          <ref role="3Tt5mk" to="mj1l:hEaDaGor64" />
+                          <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3TrEf2" id="2NO1T5RLmTL" role="2OqNvi">
-                      <ref role="3Tt5mk" to="clqz:6NQSyUTqXkM" />
-                    </node>
                   </node>
                   <node concept="2qgKlT" id="2NO1T5RLmTM" role="2OqNvi">
                     <ref role="37wK5l" to="ktif:6MWlM4926ut" resolve="inEvents" />
@@ -465,7 +466,7 @@
                               <ref role="3cqZAo" node="2NO1T5RLmTX" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="2NO1T5RLmTU" role="2OqNvi">
-                              <ref role="3Tt5mk" to="clqz:41KMvfcjScw" />
+                              <ref role="3Tt5mk" to="clqz:41KMvfcjScw" resolve="binding" />
                             </node>
                           </node>
                           <node concept="1mIQ4w" id="2NO1T5RLmTV" role="2OqNvi">
@@ -500,7 +501,7 @@
                     <ref role="3cqZAo" node="2NO1T5RJVrT" resolve="ci" />
                   </node>
                   <node concept="3Tsc0h" id="2NO1T5RK_G9" role="2OqNvi">
-                    <ref role="3TtcxE" to="ttha:2NO1T5REU$T" />
+                    <ref role="3TtcxE" to="ttha:2NO1T5REU$T" resolve="bindings" />
                   </node>
                 </node>
                 <node concept="3zZkjj" id="2NO1T5RK_Ga" role="2OqNvi">
@@ -516,7 +517,7 @@
                               <ref role="3cqZAo" node="2NO1T5RK_Gj" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="2NO1T5RK_Gi" role="2OqNvi">
-                              <ref role="3Tt5mk" to="ttha:2NO1T5RzgPG" />
+                              <ref role="3Tt5mk" to="ttha:2NO1T5RzgPG" resolve="var" />
                             </node>
                           </node>
                         </node>
@@ -555,7 +556,7 @@
                                 <ref role="3cqZAo" node="2NO1T5RM6Dg" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="2NO1T5RM8mK" role="2OqNvi">
-                                <ref role="3Tt5mk" to="ttha:2NO1T5R$isZ" />
+                                <ref role="3Tt5mk" to="ttha:2NO1T5R$isZ" resolve="event" />
                               </node>
                             </node>
                             <node concept="2GrUjf" id="2NO1T5RMa5w" role="3uHU7w">

From 579adca7749cb00ec1bb335dd6ff802c7980ff8c Mon Sep 17 00:00:00 2001
From: danielratiu <ratiud@googlemail.com>
Date: Wed, 2 Nov 2016 13:03:57 +0100
Subject: [PATCH 04/48] migrated to MPS 3.4.1 - fixing concept casts

---
 .../generator/template/main@generator.mps     | 53 +++++++--------
 .../languageModels/constraints.mps            | 65 ++++++++++---------
 2 files changed, 60 insertions(+), 58 deletions(-)
 mode change 100644 => 100755 languages/mbeddr.arduino.statemachine/generator/template/main@generator.mps
 mode change 100644 => 100755 languages/mbeddr.arduino.statemachine/languageModels/constraints.mps

diff --git a/languages/mbeddr.arduino.statemachine/generator/template/main@generator.mps b/languages/mbeddr.arduino.statemachine/generator/template/main@generator.mps
old mode 100644
new mode 100755
index 50f5896..817a22e
--- a/languages/mbeddr.arduino.statemachine/generator/template/main@generator.mps
+++ b/languages/mbeddr.arduino.statemachine/generator/template/main@generator.mps
@@ -134,6 +134,10 @@
       <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+      </concept>
       <concept id="1171315804604" name="jetbrains.mps.lang.smodel.structure.Model_RootsOperation" flags="nn" index="2RRcyG">
         <reference id="1171315804605" name="concept" index="2RRcyH" />
       </concept>
@@ -144,10 +148,7 @@
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <reference id="1140138128738" name="concept" index="1PxNhF" />
-        <child id="1140138123956" name="leftExpression" index="1PxMeX" />
-      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -224,15 +225,15 @@
             <node concept="3Tqbb2" id="2NO1T5RZ9O9" role="1tU5fm">
               <ref role="ehGHo" to="ttha:2NO1T5RDqn0" resolve="ArduinoStatemachineInterruptConfigItem" />
             </node>
-            <node concept="1PxgMI" id="2NO1T5RZiAG" role="33vP2m">
-              <ref role="1PxNhF" to="ttha:2NO1T5RDqn0" resolve="ArduinoStatemachineInterruptConfigItem" />
-              <node concept="2OqwBi" id="2NO1T5RZ9Of" role="1PxMeX">
+            <node concept="1PxgMI" id="3tp$LrDA_cr" role="33vP2m">
+              <ref role="1m5ApE" to="ttha:2NO1T5RDqn0" resolve="ArduinoStatemachineInterruptConfigItem" />
+              <node concept="2OqwBi" id="2NO1T5RZ9Of" role="1m5AlR">
                 <node concept="2OqwBi" id="2NO1T5RZ9Og" role="2Oq$k0">
                   <node concept="37vLTw" id="2NO1T5RZ9Oh" role="2Oq$k0">
                     <ref role="3cqZAo" node="2NO1T5RYNbm" resolve="bc" />
                   </node>
                   <node concept="3Tsc0h" id="2NO1T5RZ9Oi" role="2OqNvi">
-                    <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" />
+                    <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" resolve="configurationItems" />
                   </node>
                 </node>
                 <node concept="1z4cxt" id="2NO1T5RZ9Oj" role="2OqNvi">
@@ -271,7 +272,7 @@
               <ref role="3cqZAo" node="2NO1T5RZ9Oe" resolve="ci" />
             </node>
             <node concept="3Tsc0h" id="2NO1T5RZhxH" role="2OqNvi">
-              <ref role="3TtcxE" to="ttha:2NO1T5REU$T" />
+              <ref role="3TtcxE" to="ttha:2NO1T5REU$T" resolve="bindings" />
             </node>
           </node>
           <node concept="3clFbS" id="2NO1T5RZffN" role="2LFqv$">
@@ -287,7 +288,7 @@
                       <ref role="2Gs0qQ" node="2NO1T5RZffJ" resolve="b" />
                     </node>
                     <node concept="3TrEf2" id="2NO1T5RZBF8" role="2OqNvi">
-                      <ref role="3Tt5mk" to="ttha:2NO1T5RzgPG" />
+                      <ref role="3Tt5mk" to="ttha:2NO1T5RzgPG" resolve="var" />
                     </node>
                   </node>
                   <node concept="2Xjw5R" id="2NO1T5RZBF9" role="2OqNvi">
@@ -310,34 +311,34 @@
                 <node concept="1sne9v" id="2NO1T5RZKiA" role="33vP2m">
                   <property role="3ekCvb" value="true" />
                   <node concept="1sne01" id="2NO1T5RZKiB" role="1sne8H">
-                    <ref role="1snh0D" to="tpck:4uZwTti3__2" />
+                    <ref role="1snh0D" to="tpck:4uZwTti3__2" resolve="smodelAttribute" />
                     <node concept="1sh8R2" id="2NO1T5RZKiC" role="1sne05">
-                      <ref role="1sh8R3" to="nbyu:SwwM9UHwwO" />
+                      <ref role="1sh8R3" to="nbyu:SwwM9UHwwO" resolve="interrupt" />
                       <node concept="2OqwBi" id="2NO1T5RZKiD" role="1sh8R0">
                         <node concept="2GrUjf" id="2NO1T5RZKiE" role="2Oq$k0">
                           <ref role="2Gs0qQ" node="2NO1T5RZffJ" resolve="b" />
                         </node>
                         <node concept="3TrEf2" id="2NO1T5RZKiF" role="2OqNvi">
-                          <ref role="3Tt5mk" to="ttha:2NO1T5RzfCx" />
+                          <ref role="3Tt5mk" to="ttha:2NO1T5RzfCx" resolve="interrupt" />
                         </node>
                       </node>
                     </node>
                     <node concept="1sne01" id="2NO1T5RZKiG" role="1sne05">
-                      <ref role="1snh0D" to="nbyu:SwwM9UHwwK" />
+                      <ref role="1snh0D" to="nbyu:SwwM9UHwwK" resolve="body" />
                       <node concept="1sne01" id="3ZE3IPbQyyI" role="1sne05">
-                        <ref role="1snh0D" to="c4fa:3CmSUB7Fp_m" />
+                        <ref role="1snh0D" to="c4fa:3CmSUB7Fp_m" resolve="statements" />
                         <node concept="1sne01" id="3ZE3IPbQyzV" role="1sne05">
-                          <ref role="1snh0D" to="c4fa:6iIoqg1yCmj" />
+                          <ref role="1snh0D" to="c4fa:6iIoqg1yCmj" resolve="expr" />
                           <node concept="1sne01" id="3ZE3IPbQyLs" role="1sne05">
-                            <ref role="1snh0D" to="mj1l:6iIoqg1yDLg" />
+                            <ref role="1snh0D" to="mj1l:6iIoqg1yDLg" resolve="expression" />
                             <node concept="1sh8R2" id="3ZE3IPbQyMh" role="1sne05">
-                              <ref role="1sh8R3" to="x27k:5IYyAOzCwFF" />
+                              <ref role="1sh8R3" to="x27k:5IYyAOzCwFF" resolve="var" />
                               <node concept="2OqwBi" id="3ZE3IPbQzqX" role="1sh8R0">
                                 <node concept="2GrUjf" id="3ZE3IPbQzpr" role="2Oq$k0">
                                   <ref role="2Gs0qQ" node="2NO1T5RZffJ" resolve="b" />
                                 </node>
                                 <node concept="3TrEf2" id="3ZE3IPbQzUV" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="ttha:2NO1T5RzgPG" />
+                                  <ref role="3Tt5mk" to="ttha:2NO1T5RzgPG" resolve="var" />
                                 </node>
                               </node>
                             </node>
@@ -346,15 +347,15 @@
                             </node>
                           </node>
                           <node concept="1sne01" id="3ZE3IPbQ$qq" role="1sne05">
-                            <ref role="1snh0D" to="mj1l:66uzewbvZib" />
+                            <ref role="1snh0D" to="mj1l:66uzewbvZib" resolve="target" />
                             <node concept="1sh8R2" id="3ZE3IPbQ$OH" role="1sne05">
-                              <ref role="1sh8R3" to="clqz:5jCi3tKclJc" />
+                              <ref role="1sh8R3" to="clqz:5jCi3tKclJc" resolve="event" />
                               <node concept="2OqwBi" id="3ZE3IPbQ$QD" role="1sh8R0">
                                 <node concept="2GrUjf" id="3ZE3IPbQ$P7" role="2Oq$k0">
                                   <ref role="2Gs0qQ" node="2NO1T5RZffJ" resolve="b" />
                                 </node>
                                 <node concept="3TrEf2" id="3ZE3IPbQ_sk" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="ttha:2NO1T5R$isZ" />
+                                  <ref role="3Tt5mk" to="ttha:2NO1T5R$isZ" resolve="event" />
                                 </node>
                               </node>
                             </node>
@@ -390,13 +391,13 @@
                         <ref role="3cqZAo" node="2NO1T5RZBF4" resolve="im" />
                       </node>
                       <node concept="3Tsc0h" id="60mYxM6r2JH" role="2OqNvi">
-                        <ref role="3TtcxE" to="x27k:19a6$uAA8hU" />
+                        <ref role="3TtcxE" to="x27k:19a6$uAA8hU" resolve="imports" />
                       </node>
                     </node>
                     <node concept="TSZUe" id="60mYxM6rk4u" role="2OqNvi">
                       <node concept="1sne9v" id="60mYxM6rk9R" role="25WWJ7">
                         <node concept="1sne01" id="60mYxM6rk9S" role="1sne8H">
-                          <ref role="1snh0D" to="tpck:4uZwTti3__2" />
+                          <ref role="1snh0D" to="tpck:4uZwTti3__2" resolve="smodelAttribute" />
                           <node concept="1snrkl" id="60mYxM6rkFM" role="1sne05">
                             <ref role="1snrk2" to="x27k:4GT16cGgLYC" resolve="addToHeader" />
                             <node concept="3clFbT" id="60mYxM6rkQi" role="1snq_E">
@@ -426,7 +427,7 @@
                         <ref role="3cqZAo" node="2NO1T5RZBF4" resolve="im" />
                       </node>
                       <node concept="3Tsc0h" id="60mYxM6p6pL" role="2OqNvi">
-                        <ref role="3TtcxE" to="x27k:19a6$uAA8hU" />
+                        <ref role="3TtcxE" to="x27k:19a6$uAA8hU" resolve="imports" />
                       </node>
                     </node>
                     <node concept="v3k3i" id="xPyHHTtYTB" role="2OqNvi">
@@ -474,7 +475,7 @@
                     <ref role="3cqZAo" node="2NO1T5RZBF4" resolve="im" />
                   </node>
                   <node concept="3Tsc0h" id="2NO1T5RZVdZ" role="2OqNvi">
-                    <ref role="3TtcxE" to="x27k:5_l8w1EmTdh" />
+                    <ref role="3TtcxE" to="x27k:5_l8w1EmTdh" resolve="contents" />
                   </node>
                 </node>
                 <node concept="TSZUe" id="2NO1T5S0oYv" role="2OqNvi">
diff --git a/languages/mbeddr.arduino.statemachine/languageModels/constraints.mps b/languages/mbeddr.arduino.statemachine/languageModels/constraints.mps
old mode 100644
new mode 100755
index c228c30..dd5cf7d
--- a/languages/mbeddr.arduino.statemachine/languageModels/constraints.mps
+++ b/languages/mbeddr.arduino.statemachine/languageModels/constraints.mps
@@ -91,6 +91,10 @@
       <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+      </concept>
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="3562215692195599741" name="jetbrains.mps.lang.smodel.structure.SLinkImplicitSelect" flags="nn" index="13MTOL">
         <reference id="3562215692195600259" name="link" index="13MTZf" />
@@ -101,10 +105,7 @@
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <reference id="1140138128738" name="concept" index="1PxNhF" />
-        <child id="1140138123956" name="leftExpression" index="1PxMeX" />
-      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -140,7 +141,7 @@
   <node concept="1M2fIO" id="2NO1T5R$iRt">
     <ref role="1M2myG" to="ttha:2NO1T5Rz3Od" resolve="ArduinoInterruptInEventBinding" />
     <node concept="1N5Pfh" id="2NO1T5R$iSh" role="1Mr941">
-      <ref role="1N5Vy1" to="ttha:2NO1T5RzgPG" />
+      <ref role="1N5Vy1" to="ttha:2NO1T5RzgPG" resolve="var" />
       <node concept="1MUpDS" id="2NO1T5R$j0V" role="1N6uqs">
         <node concept="3clFbS" id="2NO1T5R$j0W" role="2VODD2">
           <node concept="3cpWs8" id="2NO1T5R$lgG" role="3cqZAp">
@@ -176,7 +177,7 @@
                       <ref role="3cqZAo" node="2NO1T5R$lgH" resolve="bc" />
                     </node>
                     <node concept="3Tsc0h" id="2NO1T5RAmqT" role="2OqNvi">
-                      <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" />
+                      <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" resolve="binaries" />
                     </node>
                   </node>
                   <node concept="3$u5V9" id="2NO1T5RAmqU" role="2OqNvi">
@@ -188,7 +189,7 @@
                               <ref role="3cqZAo" node="2NO1T5RAmr1" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="2NO1T5RAmr0" role="2OqNvi">
-                              <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" />
+                              <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
                             </node>
                           </node>
                         </node>
@@ -212,11 +213,11 @@
                                   <ref role="3cqZAo" node="2NO1T5RAmrr" resolve="it" />
                                 </node>
                                 <node concept="13MTOL" id="2NO1T5RAmrc" role="2OqNvi">
-                                  <ref role="13MTZf" to="51wr:6GqYvBOf2Xc" />
+                                  <ref role="13MTZf" to="51wr:6GqYvBOf2Xc" resolve="module" />
                                 </node>
                               </node>
                               <node concept="13MTOL" id="2NO1T5RAmrd" role="2OqNvi">
-                                <ref role="13MTZf" to="x27k:5_l8w1EmTdh" />
+                                <ref role="13MTZf" to="x27k:5_l8w1EmTdh" resolve="contents" />
                               </node>
                             </node>
                             <node concept="v3k3i" id="xPyHHTtYTz" role="2OqNvi">
@@ -235,7 +236,7 @@
                                         <ref role="3cqZAo" node="2NO1T5RAmrp" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="2NO1T5RAmrm" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="mj1l:hEaDaGor64" />
+                                        <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
                                       </node>
                                     </node>
                                     <node concept="1mIQ4w" id="2NO1T5RAmrn" role="2OqNvi">
@@ -285,20 +286,20 @@
                         <node concept="2OqwBi" id="2NO1T5RBgDa" role="3clFbG">
                           <node concept="2OqwBi" id="2NO1T5RBgDb" role="2Oq$k0">
                             <node concept="2OqwBi" id="2NO1T5RBgDc" role="2Oq$k0">
-                              <node concept="1PxgMI" id="2NO1T5RBgDd" role="2Oq$k0">
-                                <ref role="1PxNhF" to="clqz:6NQSyUTqXkL" resolve="StatemachineType" />
-                                <node concept="2OqwBi" id="2NO1T5RBgDe" role="1PxMeX">
+                              <node concept="3TrEf2" id="3tp$LrD_SRf" role="2OqNvi">
+                                <ref role="3Tt5mk" to="clqz:6NQSyUTqXkM" resolve="machine" />
+                              </node>
+                              <node concept="1PxgMI" id="3tp$LrD_RAT" role="2Oq$k0">
+                                <ref role="1m5ApE" to="clqz:6NQSyUTqXkL" resolve="StatemachineType" />
+                                <node concept="2OqwBi" id="2NO1T5RBgDe" role="1m5AlR">
                                   <node concept="37vLTw" id="2NO1T5RBgDf" role="2Oq$k0">
                                     <ref role="3cqZAo" node="2NO1T5RBgDv" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="2NO1T5RBgDg" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="mj1l:hEaDaGor64" />
+                                    <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3TrEf2" id="2NO1T5RBgDh" role="2OqNvi">
-                                <ref role="3Tt5mk" to="clqz:6NQSyUTqXkM" />
-                              </node>
                             </node>
                             <node concept="2qgKlT" id="2NO1T5RBgDi" role="2OqNvi">
                               <ref role="37wK5l" to="ktif:6MWlM4926ut" resolve="inEvents" />
@@ -314,7 +315,7 @@
                                         <ref role="3cqZAo" node="2NO1T5RBgDt" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="2NO1T5RBgDq" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="clqz:41KMvfcjScw" />
+                                        <ref role="3Tt5mk" to="clqz:41KMvfcjScw" resolve="binding" />
                                       </node>
                                     </node>
                                     <node concept="1mIQ4w" id="2NO1T5RBgDr" role="2OqNvi">
@@ -399,33 +400,33 @@
       </node>
     </node>
     <node concept="1N5Pfh" id="2NO1T5RBj1f" role="1Mr941">
-      <ref role="1N5Vy1" to="ttha:2NO1T5R$isZ" />
+      <ref role="1N5Vy1" to="ttha:2NO1T5R$isZ" resolve="event" />
       <node concept="1MUpDS" id="2NO1T5RBj1g" role="1N6uqs">
         <node concept="3clFbS" id="2NO1T5RBj1h" role="2VODD2">
           <node concept="3clFbF" id="2NO1T5RC1fq" role="3cqZAp">
             <node concept="2OqwBi" id="2NO1T5RCOq_" role="3clFbG">
               <node concept="2OqwBi" id="2NO1T5RCFo2" role="2Oq$k0">
                 <node concept="2OqwBi" id="2NO1T5RCxya" role="2Oq$k0">
-                  <node concept="1PxgMI" id="2NO1T5RCwxa" role="2Oq$k0">
-                    <ref role="1PxNhF" to="clqz:6NQSyUTqXkL" resolve="StatemachineType" />
-                    <node concept="2OqwBi" id="2NO1T5RC5cZ" role="1PxMeX">
+                  <node concept="3TrEf2" id="3tp$LrD_KMP" role="2OqNvi">
+                    <ref role="3Tt5mk" to="clqz:6NQSyUTqXkM" resolve="machine" />
+                  </node>
+                  <node concept="1PxgMI" id="3tp$LrD_J$v" role="2Oq$k0">
+                    <ref role="1m5ApE" to="clqz:6NQSyUTqXkL" resolve="StatemachineType" />
+                    <node concept="2OqwBi" id="2NO1T5RC5cZ" role="1m5AlR">
                       <node concept="2OqwBi" id="2NO1T5RC21e" role="2Oq$k0">
-                        <node concept="1PxgMI" id="2NO1T5RC1_d" role="2Oq$k0">
-                          <ref role="1PxNhF" to="ttha:2NO1T5Rz3Od" resolve="ArduinoInterruptInEventBinding" />
-                          <node concept="2rP1CM" id="2NO1T5RC1fp" role="1PxMeX" />
+                        <node concept="3TrEf2" id="3tp$LrD_Idx" role="2OqNvi">
+                          <ref role="3Tt5mk" to="ttha:2NO1T5RzgPG" resolve="var" />
                         </node>
-                        <node concept="3TrEf2" id="2NO1T5RC3kP" role="2OqNvi">
-                          <ref role="3Tt5mk" to="ttha:2NO1T5RzgPG" />
+                        <node concept="1PxgMI" id="3tp$LrD_Hjv" role="2Oq$k0">
+                          <ref role="1m5ApE" to="ttha:2NO1T5Rz3Od" resolve="ArduinoInterruptInEventBinding" />
+                          <node concept="2rP1CM" id="3tp$LrD_GH1" role="1m5AlR" />
                         </node>
                       </node>
                       <node concept="3TrEf2" id="2NO1T5RCqov" role="2OqNvi">
-                        <ref role="3Tt5mk" to="mj1l:hEaDaGor64" />
+                        <ref role="3Tt5mk" to="mj1l:hEaDaGor64" resolve="type" />
                       </node>
                     </node>
                   </node>
-                  <node concept="3TrEf2" id="2NO1T5RCCzI" role="2OqNvi">
-                    <ref role="3Tt5mk" to="clqz:6NQSyUTqXkM" />
-                  </node>
                 </node>
                 <node concept="2qgKlT" id="2NO1T5RCNyy" role="2OqNvi">
                   <ref role="37wK5l" to="ktif:6MWlM4926ut" resolve="inEvents" />
@@ -441,7 +442,7 @@
                             <ref role="3cqZAo" node="2NO1T5RCQ4w" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="2NO1T5RCTL8" role="2OqNvi">
-                            <ref role="3Tt5mk" to="clqz:41KMvfcjScw" />
+                            <ref role="3Tt5mk" to="clqz:41KMvfcjScw" resolve="binding" />
                           </node>
                         </node>
                         <node concept="1mIQ4w" id="2NO1T5RCYnI" role="2OqNvi">

From acd157f0284ef5ff6c685d8173aa8f4cbecb234f Mon Sep 17 00:00:00 2001
From: danielratiu <ratiud@googlemail.com>
Date: Wed, 2 Nov 2016 13:28:18 +0100
Subject: [PATCH 05/48] fixing generator priority to cut the cycle in the
 generators

---
 languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl b/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl
index b3563ec..f9f147e 100755
--- a/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl
+++ b/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl
@@ -173,7 +173,7 @@
             </external-mapping>
           </lesser-priority-mapping>
         </mapping-priority-rule>
-        <mapping-priority-rule kind="strictly_together">
+        <mapping-priority-rule kind="strictly_before">
           <greater-priority-mapping>
             <generator generatorUID="151f32f8-2c45-4b6c-ad8c-3b4e2f69cfdb(mbeddr.arduino.core#2350648883898979172)" />
             <external-mapping>

From 4f3ccfebe7c90e472acf8447dc4cee3378e70a03 Mon Sep 17 00:00:00 2001
From: danielratiu <ratiud@googlemail.com>
Date: Wed, 2 Nov 2016 13:28:41 +0100
Subject: [PATCH 06/48] fixing the examples

---
 .../BuildConfiguration (a.s.Atomic).mpsr      | 16 ++++++++++++++++
 .../models/arduino/samples/Blinker/.model     |  0
 .../BuildConfiguration (a.s.Blinker).mpsr     |  9 +++++++++
 .../TypeSizeConfiguration (a.s.Blinker).mpsr  |  0
 .../models/arduino/samples/Blinker/main.mpsr  |  0
 .../models/arduino/samples/Serial/.model      |  0
 .../BuildConfiguration (a.s.Serial).mpsr      | 11 +++++++++++
 .../TypeSizeConfiguration (a.s.Serial).mpsr   |  0
 .../models/arduino/samples/Serial/serial.mpsr |  0
 .../arduino/samples/statemachine/.model       | 18 ++++++++++++++++++
 ...BuildConfiguration (a.s.statemachine).mpsr | 19 +++++++++++++++++++
 .../BuildConfiguration (a.s.weather).mpsr     |  4 ++++
 12 files changed, 77 insertions(+)
 mode change 100644 => 100755 solutions/arduino.samples/models/arduino/samples/Blinker/.model
 mode change 100644 => 100755 solutions/arduino.samples/models/arduino/samples/Blinker/BuildConfiguration (a.s.Blinker).mpsr
 mode change 100644 => 100755 solutions/arduino.samples/models/arduino/samples/Blinker/TypeSizeConfiguration (a.s.Blinker).mpsr
 mode change 100644 => 100755 solutions/arduino.samples/models/arduino/samples/Blinker/main.mpsr
 mode change 100644 => 100755 solutions/arduino.samples/models/arduino/samples/Serial/.model
 mode change 100644 => 100755 solutions/arduino.samples/models/arduino/samples/Serial/BuildConfiguration (a.s.Serial).mpsr
 mode change 100644 => 100755 solutions/arduino.samples/models/arduino/samples/Serial/TypeSizeConfiguration (a.s.Serial).mpsr
 mode change 100644 => 100755 solutions/arduino.samples/models/arduino/samples/Serial/serial.mpsr

diff --git a/solutions/arduino.samples/models/arduino/samples/Atomic/BuildConfiguration (a.s.Atomic).mpsr b/solutions/arduino.samples/models/arduino/samples/Atomic/BuildConfiguration (a.s.Atomic).mpsr
index c41b09e..c23a924 100755
--- a/solutions/arduino.samples/models/arduino/samples/Atomic/BuildConfiguration (a.s.Atomic).mpsr	
+++ b/solutions/arduino.samples/models/arduino/samples/Atomic/BuildConfiguration (a.s.Atomic).mpsr	
@@ -19,12 +19,22 @@
         <reference id="7717755763392524108" name="module" index="2v9HqP" />
       </concept>
     </language>
+    <language id="2693fc71-9b0e-4b05-ab13-f57227d675f2" name="com.mbeddr.core.util">
+      <concept id="4459718605982051949" name="com.mbeddr.core.util.structure.ReportingConfiguration" flags="ng" index="2Q9Fgs">
+        <child id="4459718605982051999" name="strategy" index="2Q9FjI" />
+      </concept>
+      <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
+    </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
       <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
       </concept>
     </language>
     <language id="783af01f-87a7-412c-be99-293a162652b5" name="com.mbeddr.core.embedded">
+      <concept id="9172009453269286222" name="com.mbeddr.core.embedded.structure.EmulatedInterruptKind" flags="ng" index="3_UBHe" />
+      <concept id="9172009453269230746" name="com.mbeddr.core.embedded.structure.InterruptConfigItem" flags="ng" index="3_UEaq">
+        <child id="9172009453269286214" name="kind" index="3_UBH6" />
+      </concept>
       <concept id="6847490852669234129" name="com.mbeddr.core.embedded.structure.RegisterConfigurationItem" flags="ng" index="3V4jtR">
         <child id="6847490852670616471" name="kind" index="3Vb1WL" />
       </concept>
@@ -50,6 +60,9 @@
     </language>
   </registry>
   <node concept="2v9HqL" id="EvPvZE4n_c">
+    <node concept="2Q9Fgs" id="3tp$LrDH1rA" role="2Q9xDr">
+      <node concept="2Q9FjX" id="3tp$LrDH1rB" role="2Q9FjI" />
+    </node>
     <node concept="3V4jtR" id="3vlJV9ey2Fq" role="2Q9xDr">
       <node concept="3VbeTE" id="3vlJV9ey2Gp" role="3Vb1WL" />
     </node>
@@ -65,6 +78,9 @@
         <ref role="2v9HqP" to="aelz:3kpMhm4HRQv" resolve="avr_interrupt" />
       </node>
     </node>
+    <node concept="3_UEaq" id="3tp$LrDH1dc" role="2Q9xDr">
+      <node concept="3_UBHe" id="3tp$LrDH1dQ" role="3_UBH6" />
+    </node>
     <node concept="A5USz" id="EvPvZE4n_e" role="2Q9xDr">
       <node concept="A5USx" id="EvPvZE4n_f" role="A5$Ns">
         <property role="TrG5h" value="digitalPin0" />
diff --git a/solutions/arduino.samples/models/arduino/samples/Blinker/.model b/solutions/arduino.samples/models/arduino/samples/Blinker/.model
old mode 100644
new mode 100755
diff --git a/solutions/arduino.samples/models/arduino/samples/Blinker/BuildConfiguration (a.s.Blinker).mpsr b/solutions/arduino.samples/models/arduino/samples/Blinker/BuildConfiguration (a.s.Blinker).mpsr
old mode 100644
new mode 100755
index 870f359..d6c303d
--- a/solutions/arduino.samples/models/arduino/samples/Blinker/BuildConfiguration (a.s.Blinker).mpsr	
+++ b/solutions/arduino.samples/models/arduino/samples/Blinker/BuildConfiguration (a.s.Blinker).mpsr	
@@ -19,6 +19,12 @@
         <reference id="7717755763392524108" name="module" index="2v9HqP" />
       </concept>
     </language>
+    <language id="2693fc71-9b0e-4b05-ab13-f57227d675f2" name="com.mbeddr.core.util">
+      <concept id="4459718605982051949" name="com.mbeddr.core.util.structure.ReportingConfiguration" flags="ng" index="2Q9Fgs">
+        <child id="4459718605982051999" name="strategy" index="2Q9FjI" />
+      </concept>
+      <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
+    </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
       <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
@@ -54,6 +60,9 @@
     </language>
   </registry>
   <node concept="2v9HqL" id="nYCWklJB88">
+    <node concept="2Q9Fgs" id="3tp$LrDH1Gl" role="2Q9xDr">
+      <node concept="2Q9FjX" id="3tp$LrDH1Gm" role="2Q9FjI" />
+    </node>
     <node concept="3V4jtR" id="3vlJV9e9MuL" role="2Q9xDr">
       <node concept="3VbeTE" id="3vlJV9e9Mwk" role="3Vb1WL" />
     </node>
diff --git a/solutions/arduino.samples/models/arduino/samples/Blinker/TypeSizeConfiguration (a.s.Blinker).mpsr b/solutions/arduino.samples/models/arduino/samples/Blinker/TypeSizeConfiguration (a.s.Blinker).mpsr
old mode 100644
new mode 100755
diff --git a/solutions/arduino.samples/models/arduino/samples/Blinker/main.mpsr b/solutions/arduino.samples/models/arduino/samples/Blinker/main.mpsr
old mode 100644
new mode 100755
diff --git a/solutions/arduino.samples/models/arduino/samples/Serial/.model b/solutions/arduino.samples/models/arduino/samples/Serial/.model
old mode 100644
new mode 100755
diff --git a/solutions/arduino.samples/models/arduino/samples/Serial/BuildConfiguration (a.s.Serial).mpsr b/solutions/arduino.samples/models/arduino/samples/Serial/BuildConfiguration (a.s.Serial).mpsr
old mode 100644
new mode 100755
index 66c80d5..962bb52
--- a/solutions/arduino.samples/models/arduino/samples/Serial/BuildConfiguration (a.s.Serial).mpsr	
+++ b/solutions/arduino.samples/models/arduino/samples/Serial/BuildConfiguration (a.s.Serial).mpsr	
@@ -23,6 +23,7 @@
       <concept id="4459718605982051949" name="com.mbeddr.core.util.structure.ReportingConfiguration" flags="ng" index="2Q9Fgs">
         <child id="4459718605982051999" name="strategy" index="2Q9FjI" />
       </concept>
+      <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
       <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
@@ -30,6 +31,10 @@
       </concept>
     </language>
     <language id="783af01f-87a7-412c-be99-293a162652b5" name="com.mbeddr.core.embedded">
+      <concept id="9172009453269286222" name="com.mbeddr.core.embedded.structure.EmulatedInterruptKind" flags="ng" index="3_UBHe" />
+      <concept id="9172009453269230746" name="com.mbeddr.core.embedded.structure.InterruptConfigItem" flags="ng" index="3_UEaq">
+        <child id="9172009453269286214" name="kind" index="3_UBH6" />
+      </concept>
       <concept id="6847490852669234129" name="com.mbeddr.core.embedded.structure.RegisterConfigurationItem" flags="ng" index="3V4jtR">
         <child id="6847490852670616471" name="kind" index="3Vb1WL" />
       </concept>
@@ -68,6 +73,9 @@
     </language>
   </registry>
   <node concept="2v9HqL" id="7fU3Y2eTN93">
+    <node concept="2Q9Fgs" id="3tp$LrDH2he" role="2Q9xDr">
+      <node concept="2Q9FjX" id="3tp$LrDH2hf" role="2Q9FjI" />
+    </node>
     <node concept="3V4jtR" id="3vlJV9eya7C" role="2Q9xDr">
       <node concept="3VbeTE" id="3vlJV9eyaap" role="3Vb1WL" />
     </node>
@@ -80,6 +88,9 @@
         <ref role="2v9HqP" to="aelz:Yv2B6LBx6E" resolve="util_delay" />
       </node>
     </node>
+    <node concept="3_UEaq" id="3tp$LrDH2fj" role="2Q9xDr">
+      <node concept="3_UBHe" id="3tp$LrDH2gf" role="3_UBH6" />
+    </node>
     <node concept="A5USz" id="1qwvy7xHcdC" role="2Q9xDr">
       <node concept="A5USx" id="1qwvy7xHcdD" role="A5$Ns">
         <property role="TrG5h" value="doorLock" />
diff --git a/solutions/arduino.samples/models/arduino/samples/Serial/TypeSizeConfiguration (a.s.Serial).mpsr b/solutions/arduino.samples/models/arduino/samples/Serial/TypeSizeConfiguration (a.s.Serial).mpsr
old mode 100644
new mode 100755
diff --git a/solutions/arduino.samples/models/arduino/samples/Serial/serial.mpsr b/solutions/arduino.samples/models/arduino/samples/Serial/serial.mpsr
old mode 100644
new mode 100755
diff --git a/solutions/arduino.samples/models/arduino/samples/statemachine/.model b/solutions/arduino.samples/models/arduino/samples/statemachine/.model
index c0eb8a6..fdaf55e 100755
--- a/solutions/arduino.samples/models/arduino/samples/statemachine/.model
+++ b/solutions/arduino.samples/models/arduino/samples/statemachine/.model
@@ -12,6 +12,24 @@
     <use id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements" version="1" />
     <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="2" />
     <use id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base" version="2" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2" name="com.mbeddr.mpsutil.suppresswarning" version="0" />
+    <use id="a482b416-d0c9-473f-8f67-725ed642b3f3" name="com.mbeddr.mpsutil.breadcrumb" version="0" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="479c7a8c-02f9-43b5-9139-d910cb22f298" name="jetbrains.mps.core.xml" version="0" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" name="com.mbeddr.mpsutil.jung" version="0" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="3" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
+    <use id="bd640b8f-4be4-42b6-8dc0-2c94d1ddf606" name="com.mbeddr.ext.components.gen_nomw" version="0" />
+    <use id="97d24244-51db-4e2e-97fc-7bd73b1f5f40" name="com.mbeddr.ext.components" version="1" />
+    <use id="b4d28e19-7d2d-47e9-943e-3a41f97a0e52" name="com.mbeddr.mpsutil.plantuml.node" version="0" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
+    <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
+    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
     <devkit ref="6845f348-7ea5-449c-ae3b-3d600bc3b73d(mbeddr.arduino)" />
   </languages>
   <imports>
diff --git a/solutions/arduino.samples/models/arduino/samples/statemachine/BuildConfiguration (a.s.statemachine).mpsr b/solutions/arduino.samples/models/arduino/samples/statemachine/BuildConfiguration (a.s.statemachine).mpsr
index 4ee191e..d1bec56 100755
--- a/solutions/arduino.samples/models/arduino/samples/statemachine/BuildConfiguration (a.s.statemachine).mpsr	
+++ b/solutions/arduino.samples/models/arduino/samples/statemachine/BuildConfiguration (a.s.statemachine).mpsr	
@@ -32,6 +32,11 @@
         <reference id="7717755763392524108" name="module" index="2v9HqP" />
       </concept>
     </language>
+    <language id="bd640b8f-4be4-42b6-8dc0-2c94d1ddf606" name="com.mbeddr.ext.components.gen_nomw">
+      <concept id="2103658896110278831" name="com.mbeddr.ext.components.gen_nomw.structure.NoMwComponentsGenStrategy" flags="ng" index="3i3YCL">
+        <property id="4768833643347725006" name="generateContracts" index="3Ewwow" />
+      </concept>
+    </language>
     <language id="2693fc71-9b0e-4b05-ab13-f57227d675f2" name="com.mbeddr.core.util">
       <concept id="4459718605982051949" name="com.mbeddr.core.util.structure.ReportingConfiguration" flags="ng" index="2Q9Fgs">
         <child id="4459718605982051999" name="strategy" index="2Q9FjI" />
@@ -57,11 +62,19 @@
       </concept>
       <concept id="6847490852670653132" name="com.mbeddr.core.embedded.structure.EmulatedRegisterKind" flags="ng" index="3VbeTE" />
     </language>
+    <language id="13a36f90-83c5-4bf6-9dd6-70e455f1ef36" name="com.mbeddr.ext.components.statemachine">
+      <concept id="1656687801206464316" name="com.mbeddr.ext.components.statemachine.structure.StatemachineInCompsConfigItem" flags="ng" index="0nYfV" />
+    </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="97d24244-51db-4e2e-97fc-7bd73b1f5f40" name="com.mbeddr.ext.components">
+      <concept id="2103658896110121032" name="com.mbeddr.ext.components.structure.ComponentsConfigItem" flags="ng" index="3i2$bm">
+        <child id="2103658896110238743" name="genStrategy" index="3i30U9" />
+      </concept>
+    </language>
     <language id="3c4c8461-a533-4459-916a-dc0176793b4c" name="mbeddr.arduino.core">
       <concept id="2350648883898812438" name="mbeddr.arduino.core.structure.ArduinoPlatform" flags="ng" index="24Uyqy">
         <property id="5865116309641288761" name="libPath" index="FSswc" />
@@ -183,6 +196,12 @@
     <node concept="3yF7LM" id="2NO1T5RXSmJ" role="2Q9xDr">
       <property role="3yF7Mc" value="true" />
     </node>
+    <node concept="3i2$bm" id="3tp$LrDH2Z4" role="2Q9xDr">
+      <node concept="3i3YCL" id="3tp$LrDH2ZY" role="3i30U9">
+        <property role="3Ewwow" value="true" />
+      </node>
+    </node>
+    <node concept="0nYfV" id="3tp$LrDH2Ds" role="2Q9xDr" />
     <node concept="2Q9Fgs" id="2NO1T5S11ZL" role="2Q9xDr">
       <node concept="2Q9FjX" id="2NO1T5S11ZM" role="2Q9FjI" />
     </node>
diff --git a/solutions/arduino.samples/models/arduino/samples/weather/BuildConfiguration (a.s.weather).mpsr b/solutions/arduino.samples/models/arduino/samples/weather/BuildConfiguration (a.s.weather).mpsr
index 9756955..896bcd3 100755
--- a/solutions/arduino.samples/models/arduino/samples/weather/BuildConfiguration (a.s.weather).mpsr	
+++ b/solutions/arduino.samples/models/arduino/samples/weather/BuildConfiguration (a.s.weather).mpsr	
@@ -6,6 +6,9 @@
     <import index="1o4w" ref="r:442bb4e7-6f10-4ceb-b79f-652568158259(mbeddr.arduino.platform.Main)" implicit="true" />
   </imports>
   <registry>
+    <language id="0d04a6cc-773e-4069-b9b0-11884b2ff1c8" name="com.mbeddr.ext.units">
+      <concept id="5348704582971040037" name="com.mbeddr.ext.units.structure.UnitConfigItem" flags="ng" index="2eh4Hv" />
+    </language>
     <language id="e562f51e-6403-4857-b773-44632077c67d" name="mbeddr.arduino.interrupts">
       <concept id="5152824560131535438" name="mbeddr.arduino.interrupts.structure.ArduinoInterruptKind" flags="ng" index="2Z3J3G" />
     </language>
@@ -180,6 +183,7 @@
         <ref role="3XGs4S" node="3dH4Jop39aI" />
       </node>
     </node>
+    <node concept="2eh4Hv" id="3tp$LrDH3Wd" role="2Q9xDr" />
     <node concept="3V4jtR" id="4u2wEbSv7z5" role="2Q9xDr">
       <node concept="3VbeTE" id="4u2wEbSwIS$" role="3Vb1WL" />
     </node>

From ed46ae990e5dc6feb37e40b36644b1d767b273a7 Mon Sep 17 00:00:00 2001
From: The Gitter Badger <badger@gitter.im>
Date: Sun, 13 Nov 2016 22:17:02 +0000
Subject: [PATCH 07/48] Add Gitter badge

---
 Readme.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Readme.md b/Readme.md
index d10d959..d4bf52a 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,5 +1,7 @@
 # mbeddr.arduino
 
+[![Join the chat at https://gitter.im/mbeddr-arduino/Lobby](https://badges.gitter.im/mbeddr-arduino/Lobby.svg)](https://gitter.im/mbeddr-arduino/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 ## Background
 
 This is a DSL to write programs for the [Arduino][ar] platform. It is based on the [mbeddr][mbddr] project which is an extensible C implementation in [JetBrains MPS][mps].

From 06e8f2b92fff511046a47ff79d2cd189091c81c2 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Mon, 14 Nov 2016 15:03:58 +0100
Subject: [PATCH 08/48] use gradle build

---
 .gitignore                                    |    2 +
 .mps/modules.xml                              |    3 +-
 build.gradle                                  |  246 +++
 build.xml                                     |   36 +-
 build/allScripts.xml                          |  182 ++
 build/build.xml                               | 1605 ++++++++++-------
 gradle.properties.example                     |    2 +
 gradle/.gitignore                             |    1 +
 gradle/wrapper/gradle-wrapper.jar             |  Bin 0 -> 52928 bytes
 gradle/wrapper/gradle-wrapper.properties      |    6 +
 gradlew                                       |  169 ++
 gradlew.bat                                   |   84 +
 .../languageModels/intentions.mps             |    1 -
 .../languageModels/typesystem.mps             |    1 -
 .../mbeddr.arduino.core.mpl                   |   15 +-
 .../mbeddr.arduino.interrupts.mpl             |   24 +-
 projectlibraries.properties                   |    2 +
 .../mbeddr.arduino.all-scripts.msd            |   28 +
 .../mbeddr/arduino/allScripts/build.mps       |  223 +++
 .../mbeddr.arduino.build.msd                  |   12 +
 .../models/mbeddr/arduino/build/build.mps     |  871 ++++++++-
 21 files changed, 2853 insertions(+), 660 deletions(-)
 create mode 100644 build.gradle
 create mode 100644 build/allScripts.xml
 create mode 100644 gradle.properties.example
 create mode 100644 gradle/.gitignore
 create mode 100644 gradle/wrapper/gradle-wrapper.jar
 create mode 100644 gradle/wrapper/gradle-wrapper.properties
 create mode 100755 gradlew
 create mode 100644 gradlew.bat
 create mode 100644 projectlibraries.properties
 create mode 100644 solutions/mbeddr.arduino.all-scripts/mbeddr.arduino.all-scripts.msd
 create mode 100644 solutions/mbeddr.arduino.all-scripts/models/mbeddr/arduino/allScripts/build.mps

diff --git a/.gitignore b/.gitignore
index 786f6f6..e5e9015 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@ source_gen.caches
 
 */.DS_Store
 .mps/workspace.xml
+.gradle
+gradle/build
diff --git a/.mps/modules.xml b/.mps/modules.xml
index 6c5301a..b3daa32 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -12,7 +12,8 @@
       <modulePath path="$PROJECT_DIR$/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl" folder="core" />
       <modulePath path="$PROJECT_DIR$/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl" folder="ext" />
       <modulePath path="$PROJECT_DIR$/solutions/arduino.samples/arduino.samples.msd" folder="" />
-      <modulePath path="$PROJECT_DIR$/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd" folder="" />
+      <modulePath path="$PROJECT_DIR$/solutions/mbeddr.arduino.all-scripts/mbeddr.arduino.all-scripts.msd" folder="build" />
+      <modulePath path="$PROJECT_DIR$/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd" folder="build" />
       <modulePath path="$PROJECT_DIR$/solutions/mbeddr.arduino.header/mbeddr.arduino.header.msd" folder="lib" />
       <modulePath path="$PROJECT_DIR$/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd" folder="lib" />
     </projectModules>
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..b7b54f2
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,246 @@
+group 'com.mbeddr.'
+
+apply plugin: 'base'
+
+buildDir 'gradle/build'
+
+// Project version
+if (project.hasProperty('projectVersion')) {
+    version project.projectVersion
+} else {
+    def gitBranchCmd
+    if (System.getProperty('os.name').toLowerCase().contains('windows')) {
+        gitBranchCmd = 'cmd /c git rev-parse --abbrev-ref HEAD'
+    } else {
+        gitBranchCmd = 'git rev-parse --abbrev-ref HEAD'
+    }
+    def gitBranch = gitBranchCmd.execute().in.text.trim().toString().replace("/","-")
+
+    if (gitBranch == null || gitBranch.empty) {
+        gitBranch = 'HEAD'
+    }
+
+    version "0.1-$gitBranch-SNAPSHOT"
+}
+
+// Dependency versions
+ext.mpsVersion = '3.4.1'
+ext.mbeddrVersion = '1.0.+'
+ext.iets3Version = '0.1.+'
+
+// Default repository credentials
+if (!project.hasProperty('nexusUsername')) {
+    ext.nexusUsername = ''
+    ext.nexusPassword = ''
+}
+logger.info 'Repository username: {}', project.nexusUsername
+
+ext.releaseRepository = ''
+ext.snapshotRepository = ''
+ext.publishingRepository = version.toString().endsWith("-SNAPSHOT") ? snapshotRepository : releaseRepository
+
+ext.dependencyRepositories = [
+        'https://projects.itemis.de/nexus/content/repositories/mbeddr',
+        'https://projects.itemis.de/nexus/content/repositories/mbeddr_snapshots',
+]
+
+ext.artifactsDir = new File(buildDir, 'artifacts')
+ext.projectLibrariesDir = new File(buildDir, 'project-libraries')
+
+apply plugin: 'maven-publish'
+
+task wrapper(type: Wrapper) {
+    gradleVersion '3.1'
+    distributionType 'all'
+}
+
+configurations {
+    mps
+    mpsArtifacts
+}
+
+dependencies {
+    mps "com.jetbrains:mps:$mpsVersion"
+    mpsArtifacts "com.mbeddr:allScripts:$mbeddrVersion"
+    mpsArtifacts "com.mbeddr:allInOne:$mbeddrVersion"
+}
+
+repositories {
+    for (repoUrl in project.dependencyRepositories) {
+        maven {
+            url repoUrl
+            if (project.hasProperty('nexusUsername')) {
+                credentials {
+                    username project.nexusUsername
+                    password project.nexusPassword
+                }
+            }
+        }
+    }
+}
+
+task resolveMps(type: Copy) {
+    def outputDir = "$buildDir/mps"
+
+    dependsOn configurations.mps
+    from {
+        configurations.mps.resolve().collect { zipTree(it) }
+    }
+    into outputDir
+    doFirst { delete outputDir }
+}
+
+task resolveMpsArtifacts(type: Copy) {
+    dependsOn configurations.mpsArtifacts
+    from {
+        configurations.mpsArtifacts.resolve().collect { zipTree(it) }
+    }
+    into artifactsDir
+    doFirst { delete artifactsDir }
+}
+
+task resolveProjectLibraries {
+    description "Downloads dependencies, unzips them, unzips the zips inside, and puts them into $projectLibrariesDir"
+    dependsOn resolveMpsArtifacts
+    File inputDir = resolveMpsArtifacts.destinationDir
+    File outputDir = projectLibrariesDir
+    inputs.dir inputDir
+    outputs.dir projectLibrariesDir
+
+    doFirst { delete projectLibrariesDir }
+    doLast {
+        fileTree(inputDir).visit new EmptyFileVisitor() {
+            @Override
+            void visitFile(FileVisitDetails f) {
+                def outputName = f.relativePath.getFile(outputDir)
+                if (f.name.endsWith('.zip')) {
+                    copy {
+                        from zipTree(f.file)
+                        into outputName
+                    }
+                } else {
+                    copy {
+                        from f.file
+                        into outputName.parent
+                    }
+                }
+            }
+        }
+    }
+}
+
+task generateLibrariesXml {
+    def defaultsFile = file('projectlibraries.properties')
+    def overridesFile = file('projectlibraries.overrides.properties')
+    def librariesFile = file('.mps/libraries.xml')
+
+    description "Generates libraries.xml for MPS from $defaultsFile and $overridesFile (if present)"
+
+    inputs.files defaultsFile, overridesFile
+    outputs.file librariesFile
+
+    def properties = new Properties()
+    defaultsFile.withInputStream { properties.load(it) }
+    if (overridesFile.exists()) {
+        overridesFile.withInputStream { properties.load(it) }
+    }
+
+    doLast {
+        librariesFile.withWriter { writer ->
+            def xml = new groovy.xml.MarkupBuilder(writer)
+            xml.project(version: 4) {
+                component(name: 'ProjectLibraryManager') {
+                    option(name: 'libraries') {
+                        map() {
+                            for (lib in properties.entrySet()) {
+                                entry(key: lib.key) {
+                                    value() {
+                                        Library() {
+                                            option(name: 'name', value: lib.key)
+                                            option(name: 'path', value: lib.value)
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+task setup {
+    // We resolve MPS not for the users to use it but for the distribution packaging script to be able to refer to it.
+    dependsOn resolveMps
+    dependsOn resolveProjectLibraries, generateLibrariesXml
+    description 'Set up MPS project libraries'
+}
+
+ant.properties['mbeddr.arduino'] = projectDir
+ant.properties['build.dir'] = buildDir
+ant.properties['mps.home'] = resolveMps.destinationDir
+ant.properties['artifacts.root'] = resolveMpsArtifacts.destinationDir
+
+ant.importBuild('build.xml') { target -> 'ant-' + target }
+
+//tasks['ant-check-mps-home'].dependsOn resolveMps
+tasks['ant-build-allScripts'].dependsOn resolveMps, resolveMpsArtifacts, 'ant-clean'
+tasks['ant-build-arduino'].dependsOn 'ant-build-allScripts', 'ant-clean'
+
+task packageArduino(type: Zip, dependsOn: 'ant-build-arduino') {
+    baseName ''
+    from artifactsDir
+    include ''
+}
+
+task packageArduinoDistribution(dependsOn: 'ant-build-arduino') {
+    doLast {
+        ant.ant(antfile: file('build/<fixme>/build-distribution.xml'), target: 'build')
+    }
+}
+
+assemble.dependsOn packageArduino, packageArduinoDistribution
+
+publishing {
+    repositories {
+        maven {
+            url project.publishingRepository
+            if (project.hasProperty('nexusUsername')) {
+                credentials {
+                    username project.nexusUsername
+                    password project.nexusPassword
+                }
+            }
+        }
+    }
+    publications {
+        arduino(MavenPublication) {
+            artifactId 'arduino'
+            artifact packageArduino
+        }
+    }
+}
+
+// Ant <junit> task support
+repositories {
+    mavenCentral()
+}
+configurations {
+    junitAnt
+}
+dependencies {
+    junitAnt 'junit:junit:4.12'
+    junitAnt('org.apache.ant:ant-junit:1.9.7') {
+        transitive = false
+    }
+    junitAnt('org.apache.ant:ant-junit4:1.9.7') {
+        transitive = false
+    }
+}
+ant.taskdef(name: 'junit', classname: 'org.apache.tools.ant.taskdefs.optional.junit.JUnitTask',
+        classpath: configurations.junitAnt.asPath)
+ant.taskdef(name: 'junitreport', classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',
+        classpath: configurations.junitAnt.asPath)
+
+check.dependsOn 'ant-build-arduino'
diff --git a/build.xml b/build.xml
index db5ff14..522037d 100644
--- a/build.xml
+++ b/build.xml
@@ -1,12 +1,12 @@
 <project name="mbeddr download and deploy plugins" default="build-arduino">
-  <property file="build.properties"/>
   <property name="plugins.folder.name" value="plugins"/>
 
   <!-- mbeddr.platform -->
-  <property name="mbeddr.arduino.build-path.postfix" value="${mbeddr.arduino.home}build/build/artifacts/mbeddr.arduino" />
-  <property name="mbeddr.arduino.build-file.location" value="${mbeddr.arduino.home}/build/" />
+  <property name="mbeddr.arduino.build-path.postfix" value="${mbeddr.arduino}build/build/artifacts/mbeddr.arduino" />
+  <property name="mbeddr.arduino.build-file.location" value="${mbeddr.arduino}/build/" />
   <property name="mbeddr.arduino.build-file.name" value="build.xml" />
-  <property name="mbeddr.arduino.working-dir" value="${mbeddr.arduino.home}" />
+  <property name="mbeddr.arduino.allScripts.build-file.name" value="allScripts.xml" />
+  <property name="mbeddr.arduino.working-dir" value="${mbeddr.arduino}" />
   <!-- misc -->
   <property name="clean-generated-code.task" value="cleanSources" />
   <property name="clean-plugins.task" value="clean" />
@@ -14,24 +14,20 @@
   <property name="build-plugin.task" value="assemble" />
   <property name="run-tests.task" value="check" />
   <!-- validations -->
-  <fail unless="mps.home">mps.home must be set in your build.properties</fail>
-  <fail unless="mbeddr.github.core.home">mbeddr.github.core.home must be set in your build.properties</fail>
-  <fail unless="mbeddr.arduino.home">mbeddr.arduino.home must be set in your build.properties</fail>
-  <fail message="Your MPS installation (${mps.home}) doesn't contain a ${plugins.folder.name} folder">
-      <condition>
-          <not>
-              <resourcecount count="1">
-				  <dirset dir="${mps.home}" >
-					  <include name="${plugins.folder.name}"/>
-				  </dirset>
-              </resourcecount>
-          </not>
-      </condition>
-  </fail>
+
   <target name="build-arduino">
-	  <ant antfile="${mbeddr.arduino.build-file.name}" dir="${mbeddr.arduino.build-file.location}" target="${clean-plugins.task}" />
-	  <ant antfile="${mbeddr.arduino.build-file.name}" dir="${mbeddr.arduino.build-file.location}" target="${clean-generated-code.task}" />
       <ant antfile="${mbeddr.arduino.build-file.name}" dir="${mbeddr.arduino.build-file.location}" target="${generate-code.task}" />
       <ant antfile="${mbeddr.arduino.build-file.name}" dir="${mbeddr.arduino.build-file.location}" target="${build-plugin.task}" />
   </target>
+  <target name="build-allScripts">
+      <ant antfile="${mbeddr.arduino.allScripts.build-file.name}" dir="${mbeddr.arduino.build-file.location}" target="${generate-code.task}" />
+      <ant antfile="${mbeddr.arduino.allScripts.build-file.name}" dir="${mbeddr.arduino.build-file.location}" target="${build-plugin.task}" />
+  </target>
+    <target name="clean">
+      <ant antfile="${mbeddr.arduino.allScripts.build-file.name}" dir="${mbeddr.arduino.build-file.location}" target="${clean-plugins.task}" />
+	    <ant antfile="${mbeddr.arduino.allScripts.build-file.name}" dir="${mbeddr.arduino.build-file.location}" target="${clean-generated-code.task}" />
+      <ant antfile="${mbeddr.arduino.build-file.name}" dir="${mbeddr.arduino.build-file.location}" target="${clean-plugins.task}" />
+	    <ant antfile="${mbeddr.arduino.build-file.name}" dir="${mbeddr.arduino.build-file.location}" target="${clean-generated-code.task}" />
+    </target>
+
 </project>
\ No newline at end of file
diff --git a/build/allScripts.xml b/build/allScripts.xml
new file mode 100644
index 0000000..04c4094
--- /dev/null
+++ b/build/allScripts.xml
@@ -0,0 +1,182 @@
+<project name="mbeddr-arduino-allScripts" default="build">
+  <!-- Generated by MPS -->
+  <property name="build.dir" location="build" />
+  <property name="build.tmp" location="${build.dir}/tmp/mbeddr-arduino-allScripts" />
+  <property name="build.layout" location="${build.dir}/artifacts/mbeddr-arduino-allScripts" />
+  <property name="mbeddr.arduino" location="${basedir}/.." />
+  <property name="artifacts.root" location="" />
+  <property name="mps.home" location="${basedir}/../../../../../.." />
+  <property name="mbeddr-allScripts.artifacts" location="${artifacts.root}/com.mbeddr.allScripts.build" />
+  <property name="artifacts.mps" location="${mps.home}" />
+  <property name="artifacts.com.mbeddr.allScripts.build" location="${mbeddr-allScripts.artifacts}" />
+  <property file="${artifacts.mps}/build.properties" prefix="import.mps" />
+  <property file="${artifacts.com.mbeddr.allScripts.build}/build.properties" prefix="import.com.mbeddr.allScripts.build" />
+  <property name="mps.build.number" value="${import.mps.mps.build.number}" />
+  <property name="mps.date" value="${import.mps.mps.date}" />
+  <property name="mps.build.vcs.number" value="${import.mps.mps.build.vcs.number}" />
+  <property name="mps.teamcity.buildConfName" value="${import.mps.mps.teamcity.buildConfName}" />
+  <property name="mps.idea.platform.build.number" value="${import.mps.mps.idea.platform.build.number}" />
+  <property name="mps.mps.build.counter" value="${import.mps.mps.mps.build.counter}" />
+  <property name="mpsBootstrapCore.version" value="${import.mps.mpsBootstrapCore.version}" />
+  <property name="com.mbeddr.allScripts.build.major.version" value="${import.com.mbeddr.allScripts.build.com.mbeddr.allScripts.build.major.version}" />
+  <property name="com.mbeddr.allScripts.build.minor.version" value="${import.com.mbeddr.allScripts.build.com.mbeddr.allScripts.build.minor.version}" />
+  <property name="com.mbeddr.allScripts.build.build" value="${import.com.mbeddr.allScripts.build.com.mbeddr.allScripts.build.build}" />
+  <property name="com.mbeddr.allScripts.build.mbeddr.version" value="${import.com.mbeddr.allScripts.build.com.mbeddr.allScripts.build.mbeddr.version}" />
+  <property name="environment" value="env" />
+  <property name="env.JAVA_HOME" value="${java.home}/.." />
+  <property name="jdk.home" value="${env.JAVA_HOME}" />
+  
+  <path id="path.mps.ant.path">
+    <pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
+    <pathelement location="${artifacts.mps}/lib/jdom.jar" />
+    <pathelement location="${artifacts.mps}/lib/log4j.jar" />
+  </path>
+  
+  <target name="assemble" depends="classes, declare-mps-tasks">
+    <mkdir dir="${build.layout}" />
+    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}com.mbeddr.allScripts.build.major.version=${com.mbeddr.allScripts.build.major.version}${line.separator}com.mbeddr.allScripts.build.minor.version=${com.mbeddr.allScripts.build.minor.version}${line.separator}com.mbeddr.allScripts.build.build=${com.mbeddr.allScripts.build.build}${line.separator}com.mbeddr.allScripts.build.mbeddr.version=${com.mbeddr.allScripts.build.mbeddr.version}</echo>
+  </target>
+  
+  <target name="buildDependents" />
+  
+  <target name="fetchDependencies">
+    <mkdir dir="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip" />
+    <unzip src="http://github.com/$%7Bartifacts.com.mbeddr.allScripts.build%7D/com.mbeddr.allScripts.zip" dest="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip" />
+  </target>
+  
+  <target name="build" depends="assemble" />
+  
+  <target name="clean">
+    <delete dir="${build.tmp}" />
+    <delete dir="${build.layout}" />
+  </target>
+  
+  <target name="compileJava" depends="java.compile.mbeddr.arduino.build" />
+  
+  <target name="processResources" />
+  
+  <target name="classes" depends="compileJava, processResources" />
+  
+  <target name="test" depends="classes" />
+  
+  <target name="check" depends="test" />
+  
+  <target name="generate" depends="declare-mps-tasks, fetchDependencies">
+    <echo message="generating" />
+    <generate strictMode="true" parallelMode="true" parallelThreads="4" useInplaceTransform="true" hideWarnings="false" createStaticRefs="true" fork="true" targetJavaVersion="1.8">
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.extensionMethods.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.javadoc.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk7.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jetbrains.mps.baseLanguage.unitTest.libs.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.dataFlow.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.editor.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.editor.menus.extras.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.extension.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationContext.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.intentions.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.runtime.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.quotation.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.refactoring.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.resources.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.script.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.textGen.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
+      <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.reduced.jar" />
+      <library file="${artifacts.mps}/languages/make/jetbrains.mps.tool.gentest.jar" />
+      <library file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
+      <library file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+      <library file="${artifacts.mps}/lib/mps-closures.jar" />
+      <library file="${artifacts.mps}/lib/mps-collections.jar" />
+      <library file="${artifacts.mps}/lib/mps-core.jar" />
+      <library file="${artifacts.mps}/lib/mps-editor.jar" />
+      <library file="${artifacts.mps}/lib/mps-environment.jar" />
+      <library file="${artifacts.mps}/lib/mps-openapi.jar" />
+      <library file="${artifacts.mps}/lib/mps-platform.jar" />
+      <library file="${artifacts.mps}/lib/mps-test.jar" />
+      <library file="${artifacts.mps}/lib/mps-tool.jar" />
+      <library file="${artifacts.mps}/lib/mps-tuples.jar" />
+      <library file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.jar" />
+      <library file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.mps.jar" />
+      <library file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.workflow.jar" />
+      <library file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.workflow.preset.jar" />
+      <library file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.ide.build.jar" />
+      <library file="${artifacts.mps}/plugins/mps-core/languages/util/jetbrains.mps.core.properties.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip/mbeddr.allScripts/languages/com.mbeddr.allInOne.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip/mbeddr.allScripts/languages/com.mbeddr.build.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip/mbeddr.allScripts/languages/de.slisson.mps.all.build.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip/mbeddr.allScripts/languages/mbeddr-platform/com.mbeddr.platform.jar" />
+      <chunk>
+        <module file="${mbeddr.arduino}/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd" />
+      </chunk>
+      <jvmargs>
+        <arg value="-Xmx512m" />
+      </jvmargs>
+      <macro name="mbeddr.arduino" path="${mbeddr.arduino}" />
+      <macro name="artifacts.root" path="${artifacts.root}" />
+      <macro name="mps.home" path="${mps.home}" />
+      <macro name="mbeddr-allScripts.artifacts" path="${mbeddr-allScripts.artifacts}" />
+    </generate>
+  </target>
+  
+  <target name="declare-mps-tasks">
+    <taskdef resource="jetbrains/mps/build/ant/antlib.xml" classpathref="http://github.com/path.mps.ant.path" />
+  </target>
+  
+  <target name="makeDependents" />
+  
+  <target name="java.compile.mbeddr.arduino.build" depends="fetchDependencies">
+    <mkdir dir="${mbeddr.arduino}/solutions/mbeddr.arduino.build/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/mbeddr.arduino.build" />
+    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.build" fork="false" encoding="utf8" includeantruntime="false" debug="true" source="1.8" target="1.8">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mbeddr.arduino}/solutions/mbeddr.arduino.build/source_gen" />
+      </src>
+      <classpath>
+        <fileset file="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip/mbeddr.allScripts/languages/com.mbeddr.allInOne.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip/mbeddr.allScripts/languages/com.mbeddr.build.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip/mbeddr.allScripts/languages/mbeddr-platform/com.mbeddr.platform.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip/mbeddr.allScripts/languages/de.slisson.mps.all.build.jar" />
+      </classpath>
+    </javac>
+    <copy todir="${build.tmp}/java/out/mbeddr.arduino.build">
+      <fileset dir="${mbeddr.arduino}/solutions/mbeddr.arduino.build/source_gen">
+        <include name="**/*.info" />
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="cleanSources">
+    <delete dir="${mbeddr.arduino}/solutions/mbeddr.arduino.build/source_gen" />
+  </target>
+</project>
\ No newline at end of file
diff --git a/build/build.xml b/build/build.xml
index ec03498..09f0ab1 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1,44 +1,44 @@
-<project name="mbeddr.arduino" default="build">
+<project name="mbeddr-arduino" default="build">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
-  <property name="build.tmp" location="${build.dir}/tmp/mbeddr.arduino" />
-  <property name="build.layout" location="${build.dir}/artifacts/mbeddr.arduino" />
-  <property name="mbeddr.arduino.home" location="${basedir}/.." />
-  <property name="mbeddr.arduino" location="${mbeddr.arduino.home}" />
-  <property name="mps.home" location="${basedir}/../../../MPS 3.0.app" />
-  <property name="mbeddr.hombeddr.github.core.home" location="${basedir}/../../mbeddr.core" />
-  <property name="mebddr.core.artifacts" location="${mbeddr.hombeddr.github.core.home}/build/com.mbeddr.core/build/artifacts/com.mbeddr.core.build" />
-  <property name="mbeddr.comp.artifacts" location="${mbeddr.hombeddr.github.core.home}/build/com.mbeddr.ext/build/artifacts/com.mbeddr.ext.components" />
-  <property name="mbeddr.statemachines.artifacts" location="${mbeddr.hombeddr.github.core.home}/build/com.mbeddr.ext/build/artifacts/com.mbeddr.ext.statemachine" />
-  <property name="mbeddr.statemachines.comp.artifacts" location="${mbeddr.hombeddr.github.core.home}/build/com.mbeddr.ext/build/artifacts/com.mbeddr.ext.statemachinesInComponents" />
-  <property name="mbeddr.mpsutil.artifacts" location="${mbeddr.hombeddr.github.core.home}/build/com.mbeddr.mpsutil/build/artifacts/com.mbeddr.mpsutil.build" />
-  <property name="mbeddr.platform.artifacts" location="${mbeddr.hombeddr.github.core.home}/build/com.mbeddr.platform/build/artifacts/com.mbeddr.platform.build" />
-  <property name="mbeddr.spawner.artifacts" location="${mbeddr.hombeddr.github.core.home}/build/com.mbeddr.spawner/build/artifacts/com.mbeddr.spawner.build" />
-  <property name="mbeddr.debugger.artifacts" location="${mbeddr.hombeddr.github.core.home}/build/com.mbeddr.debugger/build/artifacts/com.mbeddr.debugger.build" />
-  <property name="richtext.artifacts" location="${basedir}/../../mps-richtext/build/artifacts/mps-richtext" />
-  <property name="multiline.artifacts" location="${basedir}/../../mps-multiline/build/artifacts/mps-multiline" />
-  <property name="tables.artifacts" location="${basedir}/../../mps-tables/build/artifacts/mps-tables" />
+  <property name="build.tmp" location="${build.dir}/tmp/mbeddr-arduino" />
+  <property name="build.layout" location="${build.dir}/artifacts/mbeddr-arduino" />
+  <property name="mbeddr.arduino" location="${basedir}/.." />
+  <property name="mps.home" location="${basedir}/../../../../../../Applications/MPS_3.3.app/Contents" />
+  <property name="mbeddr.github.core.home" location="${basedir}/../../../mbeddr.core" />
+  <property name="artifacts.root" location="" />
+  <property name="mbeddr.artifacts" location="${artifacts.root}/com.mbeddr.allInOne" />
+  <property name="sl-all.artifacts" location="${artifacts.root}/mps-sl-all" />
+  <property name="platform.artifacts" location="${artifacts.root}/com.mbeddr.platform" />
+  <property name="spawner.artifacts" location="${artifacts.root}/spawner" />
   <property name="artifacts.mps" location="${mps.home}" />
-  <property name="artifacts.com.mbeddr.core.build" location="${mebddr.core.artifacts}" />
-  <property name="artifacts.mps-richtext" location="${richtext.artifacts}" />
-  <property name="artifacts.mps-multiline" location="${multiline.artifacts}" />
-  <property name="artifacts.mps-tables" location="${tables.artifacts}" />
-  <property name="artifacts.com.mbeddr.ext.components" location="${mbeddr.comp.artifacts}" />
-  <property name="artifacts.com.mbeddr.ext.statemachine" location="${mbeddr.statemachines.artifacts}" />
-  <property name="artifacts.com.mbeddr.ext.statemachinesInComponents" location="${mbeddr.statemachines.comp.artifacts}" />
-  <property name="artifacts.com.mbeddr.mpsutil.build" location="${mbeddr.mpsutil.artifacts}" />
-  <property name="artifacts.com.mbeddr.platform.build" location="${mbeddr.platform.artifacts}" />
-  <property name="artifacts.com.mbeddr.spawner.build" location="${mbeddr.spawner.artifacts}" />
-  <property name="artifacts.com.mbeddr.debugger.build" location="${mbeddr.debugger.artifacts}" />
+  <property name="artifacts.jetpad" location="${mps.home}" />
+  <property name="artifacts.mpsDiagramEditor" location="${mps.home}" />
+  <property name="artifacts.com.mbeddr.allInOne" location="${mbeddr.artifacts}" />
+  <property name="artifacts.com.mbeddr.platform" location="${platform.artifacts}" />
+  <property name="artifacts.mps-sl-all" location="${sl-all.artifacts}" />
+  <property name="artifacts.spawner" location="${spawner.artifacts}" />
   <property file="${artifacts.mps}/build.properties" prefix="import.mps" />
-  <property file="${artifacts.com.mbeddr.core.build}/build.properties" prefix="import.com.mbeddr.core.build" />
+  <property file="${artifacts.com.mbeddr.allInOne}/build.properties" prefix="import.com.mbeddr.allInOne" />
   <property name="mps.build.number" value="${import.mps.mps.build.number}" />
   <property name="mps.date" value="${import.mps.mps.date}" />
   <property name="mps.build.vcs.number" value="${import.mps.mps.build.vcs.number}" />
   <property name="mps.teamcity.buildConfName" value="${import.mps.mps.teamcity.buildConfName}" />
   <property name="mps.idea.platform.build.number" value="${import.mps.mps.idea.platform.build.number}" />
+  <property name="mps.mps.build.counter" value="${import.mps.mps.mps.build.counter}" />
   <property name="mpsBootstrapCore.version" value="${import.mps.mpsBootstrapCore.version}" />
-  <property name="com.mbeddr.mpsutil.build.build.number" value="${import.com.mbeddr.core.build.com.mbeddr.mpsutil.build.build.number}" />
+  <property name="mps-sl-all.versionNumber" value="${import.com.mbeddr.allInOne.mps-sl-all.versionNumber}" />
+  <property name="com.mbeddr.platform.major.version" value="${import.com.mbeddr.allInOne.com.mbeddr.platform.major.version}" />
+  <property name="com.mbeddr.platform.minor.version" value="${import.com.mbeddr.allInOne.com.mbeddr.platform.minor.version}" />
+  <property name="com.mbeddr.platform.build" value="${import.com.mbeddr.allInOne.com.mbeddr.platform.build}" />
+  <property name="com.mbeddr.platform.mbeddr.version" value="${import.com.mbeddr.allInOne.com.mbeddr.platform.mbeddr.version}" />
+  <property name="spawner.major.version" value="${import.com.mbeddr.allInOne.spawner.major.version}" />
+  <property name="spawner.minor.version" value="${import.com.mbeddr.allInOne.spawner.minor.version}" />
+  <property name="spawner.build" value="${import.com.mbeddr.allInOne.spawner.build}" />
+  <property name="spawner.mbeddr.version" value="${import.com.mbeddr.allInOne.spawner.mbeddr.version}" />
+  <property name="environment" value="env" />
+  <property name="env.JAVA_HOME" value="${java.home}/.." />
+  <property name="jdk.home" value="${env.JAVA_HOME}" />
   
   <path id="path.mps.ant.path">
     <pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
@@ -48,33 +48,29 @@
   
   <target name="assemble" depends="classes, declare-mps-tasks">
     <mkdir dir="${build.layout}" />
-    <mkdir dir="${build.tmp}/default/mbeddr.arduino.zip" />
-    <mkdir dir="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino" />
-    <mkdir dir="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/META-INF" />
-    <echoxml file="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/META-INF/plugin.xml">
+    <mkdir dir="${build.tmp}/default/mbeddr-arduino.zip" />
+    <mkdir dir="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino" />
+    <mkdir dir="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/META-INF" />
+    <echoxml file="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/META-INF/plugin.xml">
       <idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
         <id>mbeddr.arduino</id>
-        <name>mbeddr.arduino</name>
-        <version>0.2</version>
-        <depends>jetbrains.mps.core</depends>
+        <name>mbeddr arduino</name>
+        <version>0.1</version>
         <depends>com.mbeddr.mpsutil</depends>
-        <depends>com.mbeddr.spawner</depends>
-        <depends>com.mbeddr.debugger</depends>
-        <depends>com.mbeddr.platform</depends>
-        <depends>com.mbeddr.ext.components</depends>
+        <depends>com.mbeddr.core</depends>
         <depends>com.mbeddr.ext.statemachine</depends>
-        <depends>com.mbeddr.ext.statemachineInComponents</depends>
-        <depends>de.slisson.mps.richtext</depends>
         <depends>de.slisson.mps.tables</depends>
-        <depends>jetbrains.mps.execution.languages</depends>
+        <depends>com.mbeddr.ext.components</depends>
+        <depends>com.mbeddr.ext.statemachineInComponents</depends>
+        <depends>jetbrains.mps.ide.make</depends>
         
         <extensions defaultExtensionNs="com.intellij">
           <mps.LanguageLibrary dir="/languages" />
         </extensions>
       </idea-plugin>
     </echoxml>
-    <mkdir dir="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages" />
-    <mkdir dir="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages/mbeddr.arduino.core" />
+    <mkdir dir="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages" />
+    <mkdir dir="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages/mbeddr.arduino" />
     <mkdir dir="${build.tmp}/default/mbeddr.arduino.core.jar" />
     <mkdir dir="${build.tmp}/default/mbeddr.arduino.core.jar/META-INF" />
     <echoxml file="${build.tmp}/default/mbeddr.arduino.core.jar/META-INF/module.xml">
@@ -87,14 +83,29 @@
           <module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
           <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="be896c0f-4f34-4122-95ff-1aef962f5725(com.mbeddr.mpsutil.typesystem.trace.rt)" />
+          <module ref="5b4466c8-31fa-473f-b8a2-d6b76e26eed6(com.mbeddr.core.debug.blext.runtime)" />
+          <module ref="984f0332-8a86-4f5c-9184-03eae96b5d16(com.mbeddr.core.expressions.runtime)" />
+          <module ref="360a4e25-e902-4667-a0a6-0e971c4f3177(com.mbeddr.mpsutil.blutil.rt)" />
+          <module ref="fd28f7ed-d277-425b-a282-684ac4cbead6(com.mbeddr.mpsutil.breadcrumb.runtime)" />
+          <module ref="94b17d5e-87d9-4868-8101-157e83e33243(com.mbeddr.mpsutil.editor.querylist.runtime)" />
+          <module ref="735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)" />
+          <module ref="9ea6119e-d73d-42a8-8d7b-e60e0d7b845d(com.mbeddr.mpsutil.margincell.runtime)" />
+          <module ref="eedc5a6f-c2e8-4009-a7ab-5fc307bf77ec(com.mbeddr.mpsutil.multilingual.common.runtime)" />
+          <module ref="bb6926d3-ebcc-4ca6-a3be-c618633c0dc1(com.mbeddr.mpsutil.review.runtime)" />
+          <module ref="e78f91af-08a8-4a7a-bed6-b22739ed069a(com.mbeddr.mpsutil.spreferences.runtime)" />
+          <module ref="278dc825-2faf-4320-b29f-78b1e6994ed4(de.itemis.mps.editor.bool.runtime)" />
           <module ref="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" />
+          <module ref="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" />
           <module ref="da21218f-a674-474d-8b4e-d59e33007003(de.slisson.mps.tables.runtime)" />
           <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
           <module ref="83f155ff-422c-4b5a-a2f2-b459302dd215(jetbrains.mps.baseLanguage.unitTest.libs)" />
           <module ref="2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime)" />
+          <module ref="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" />
+          <module ref="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
@@ -102,24 +113,35 @@
         <sources jar="mbeddr.arduino.core-src.jar" descriptor="mbeddr.arduino.core.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages/mbeddr.arduino.core/mbeddr.arduino.core.jar">
+    <jar destfile="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages/mbeddr.arduino/mbeddr.arduino.core.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/mbeddr.arduino.core" />
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.core" includes="icons/**, resources/**" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.core" includes="icons/**, resources/**" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/mbeddr.arduino.core.jar" />
     </jar>
-    <jar destfile="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages/mbeddr.arduino.core/mbeddr.arduino.core-generator.jar">
+    <jar destfile="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages/mbeddr.arduino/mbeddr.arduino.core-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/mbeddr.arduino.core#2350648883898979172" />
     </jar>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.core-generator-template">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.core-languageModels">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages/mbeddr.arduino.core/mbeddr.arduino.core-src.jar">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/generator/source_gen" includes="**/*.java" />
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/source_gen" includes="**/*.java" />
-      <zipfileset file="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl" prefix="module" />
+    <jar destfile="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages/mbeddr.arduino/mbeddr.arduino.core-src.jar" duplicate="preserve">
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/generator/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${mbeddr.arduino}/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.core-generator-template" prefix="module/generator/template" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.core-languageModels" prefix="module/languageModels" />
     </jar>
@@ -137,30 +159,44 @@
           <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
           <module ref="2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime)" />
+          <module ref="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
         <sources jar="mbeddr.arduino.interrupts-src.jar" descriptor="mbeddr.arduino.interrupts.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages/mbeddr.arduino.core/mbeddr.arduino.interrupts.jar">
+    <jar destfile="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages/mbeddr.arduino/mbeddr.arduino.interrupts.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/mbeddr.arduino.interrupts" />
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.interrupts" includes="icons/**, resources/**" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.interrupts" includes="icons/**, resources/**" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.interrupts/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/mbeddr.arduino.interrupts.jar" />
     </jar>
-    <jar destfile="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages/mbeddr.arduino.core/mbeddr.arduino.interrupts-generator.jar">
+    <jar destfile="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages/mbeddr.arduino/mbeddr.arduino.interrupts-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/mbeddr.arduino.interrupts#5152824560131035305" />
     </jar>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.interrupts-generator-template">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.interrupts/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.interrupts/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.interrupts-languageModels">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.interrupts/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.interrupts/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages/mbeddr.arduino.core/mbeddr.arduino.interrupts-src.jar">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.interrupts/generator/source_gen" includes="**/*.java" />
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.interrupts/source_gen" includes="**/*.java" />
-      <zipfileset file="${mbeddr.arduino.home}/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl" prefix="module" />
+    <jar destfile="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages/mbeddr.arduino/mbeddr.arduino.interrupts-src.jar" duplicate="preserve">
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.interrupts/generator/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.interrupts/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${mbeddr.arduino}/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.interrupts-generator-template" prefix="module/generator/template" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.interrupts-languageModels" prefix="module/languageModels" />
     </jar>
@@ -178,30 +214,44 @@
           <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
           <module ref="2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime)" />
+          <module ref="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
         <sources jar="mbeddr.arduino.registers-src.jar" descriptor="mbeddr.arduino.registers.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages/mbeddr.arduino.core/mbeddr.arduino.registers.jar">
+    <jar destfile="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages/mbeddr.arduino/mbeddr.arduino.registers.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/mbeddr.arduino.registers" />
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.registers" includes="icons/**, resources/**" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.registers" includes="icons/**, resources/**" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.registers/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/mbeddr.arduino.registers.jar" />
     </jar>
-    <jar destfile="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages/mbeddr.arduino.core/mbeddr.arduino.registers-generator.jar">
+    <jar destfile="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages/mbeddr.arduino/mbeddr.arduino.registers-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/mbeddr.arduino.registers#5152824560130938155" />
     </jar>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.registers-generator-template">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.registers/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.registers/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.registers-languageModels">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.registers/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.registers/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages/mbeddr.arduino.core/mbeddr.arduino.registers-src.jar">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.registers/generator/source_gen" includes="**/*.java" />
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.registers/source_gen" includes="**/*.java" />
-      <zipfileset file="${mbeddr.arduino.home}/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl" prefix="module" />
+    <jar destfile="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages/mbeddr.arduino/mbeddr.arduino.registers-src.jar" duplicate="preserve">
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.registers/generator/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.registers/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${mbeddr.arduino}/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.registers-generator-template" prefix="module/generator/template" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.registers-languageModels" prefix="module/languageModels" />
     </jar>
@@ -217,77 +267,52 @@
           <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
           <module ref="360a4e25-e902-4667-a0a6-0e971c4f3177(com.mbeddr.mpsutil.blutil.rt)" />
-          <module ref="be896c0f-4f34-4122-95ff-1aef962f5725(com.mbeddr.mpsutil.typesystem.trace.rt)" />
+          <module ref="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" />
           <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
           <module ref="2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime)" />
+          <module ref="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
         <sources jar="mbeddr.arduino.statemachine-src.jar" descriptor="mbeddr.arduino.statemachine.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages/mbeddr.arduino.core/mbeddr.arduino.statemachine.jar">
+    <jar destfile="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages/mbeddr.arduino/mbeddr.arduino.statemachine.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/mbeddr.arduino.statemachine" />
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.statemachine" includes="icons/**, resources/**" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine" includes="icons/**, resources/**" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/mbeddr.arduino.statemachine.jar" />
     </jar>
-    <jar destfile="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages/mbeddr.arduino.core/mbeddr.arduino.statemachine-generator.jar">
+    <jar destfile="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages/mbeddr.arduino/mbeddr.arduino.statemachine-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/mbeddr.arduino.statemachine#7156732329349908700" />
     </jar>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.statemachine-generator-template">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.statemachine/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.statemachine-languageModels">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.statemachine/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages/mbeddr.arduino.core/mbeddr.arduino.statemachine-src.jar">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.statemachine/generator/source_gen" includes="**/*.java" />
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.statemachine/source_gen" includes="**/*.java" />
-      <zipfileset file="${mbeddr.arduino.home}/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl" prefix="module" />
+    <jar destfile="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages/mbeddr.arduino/mbeddr.arduino.statemachine-src.jar" duplicate="preserve">
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine/generator/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.statemachine-generator-template" prefix="module/generator/template" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.statemachine-languageModels" prefix="module/languageModels" />
     </jar>
-    <mkdir dir="${build.tmp}/default/mbeddr.arduino.core.pluginSolution.jar" />
-    <mkdir dir="${build.tmp}/default/mbeddr.arduino.core.pluginSolution.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/mbeddr.arduino.core.pluginSolution.jar/META-INF/module.xml">
-      <module namespace="mbeddr.arduino.core.pluginSolution" type="solution" uuid="8e15ed0b-eb5e-477c-a001-d8e231c8fba9">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
-          <module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="be896c0f-4f34-4122-95ff-1aef962f5725(com.mbeddr.mpsutil.typesystem.trace.rt)" />
-          <module ref="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" />
-          <module ref="36c11d2d-1875-4a95-8bdb-70ea1ac63222(jetbrains.mps.execution.api)" />
-          <module ref="365fb593-3c1a-40a0-a7d7-c98144281283(jetbrains.mps.execution.impl)" />
-          <module ref="ceb47609-02c2-4927-bb6d-d58368388a62(jetbrains.mps.ide.uiLanguage.runtime)" />
-          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
-          <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <sources jar="mbeddr.arduino.core.pluginSolution-src.jar" descriptor="mbeddr.arduino.util.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages/mbeddr.arduino.core/mbeddr.arduino.core.pluginSolution.jar">
-      <fileset dir="${build.tmp}/java/out/mbeddr.arduino.core.pluginSolution" />
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/solutions/pluginSolution" includes="icons/**, resources/**" />
-      <fileset dir="${build.tmp}/default/mbeddr.arduino.core.pluginSolution.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.core-solutions-pluginSolution-models">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/solutions/pluginSolution/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages/mbeddr.arduino.core/mbeddr.arduino.core.pluginSolution-src.jar">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/solutions/pluginSolution/source_gen" includes="**/*.java" />
-      <zipfileset file="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/solutions/pluginSolution/mbeddr.arduino.util.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.core-solutions-pluginSolution-models" prefix="module/models" />
-    </jar>
     <mkdir dir="${build.tmp}/default/mbeddr.arduino.platform.jar" />
     <mkdir dir="${build.tmp}/default/mbeddr.arduino.platform.jar/META-INF" />
     <echoxml file="${build.tmp}/default/mbeddr.arduino.platform.jar/META-INF/module.xml">
@@ -299,25 +324,45 @@
           <module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
           <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="be896c0f-4f34-4122-95ff-1aef962f5725(com.mbeddr.mpsutil.typesystem.trace.rt)" />
+          <module ref="5b4466c8-31fa-473f-b8a2-d6b76e26eed6(com.mbeddr.core.debug.blext.runtime)" />
+          <module ref="984f0332-8a86-4f5c-9184-03eae96b5d16(com.mbeddr.core.expressions.runtime)" />
+          <module ref="360a4e25-e902-4667-a0a6-0e971c4f3177(com.mbeddr.mpsutil.blutil.rt)" />
+          <module ref="fd28f7ed-d277-425b-a282-684ac4cbead6(com.mbeddr.mpsutil.breadcrumb.runtime)" />
+          <module ref="94b17d5e-87d9-4868-8101-157e83e33243(com.mbeddr.mpsutil.editor.querylist.runtime)" />
+          <module ref="735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)" />
+          <module ref="9ea6119e-d73d-42a8-8d7b-e60e0d7b845d(com.mbeddr.mpsutil.margincell.runtime)" />
+          <module ref="eedc5a6f-c2e8-4009-a7ab-5fc307bf77ec(com.mbeddr.mpsutil.multilingual.common.runtime)" />
+          <module ref="bb6926d3-ebcc-4ca6-a3be-c618633c0dc1(com.mbeddr.mpsutil.review.runtime)" />
+          <module ref="e78f91af-08a8-4a7a-bed6-b22739ed069a(com.mbeddr.mpsutil.spreferences.runtime)" />
           <module ref="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
           <module ref="83f155ff-422c-4b5a-a2f2-b459302dd215(jetbrains.mps.baseLanguage.unitTest.libs)" />
+          <module ref="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" />
+          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
         <sources jar="mbeddr.arduino.platform-src.jar" descriptor="mbeddr.arduino.platform.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages/mbeddr.arduino.core/mbeddr.arduino.platform.jar">
+    <jar destfile="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages/mbeddr.arduino/mbeddr.arduino.platform.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/mbeddr.arduino.platform" />
-      <fileset dir="${mbeddr.arduino.home}/solutions/mbeddr.arduino.platform" includes="icons/**, resources/**" />
+      <fileset dir="${mbeddr.arduino}/solutions/mbeddr.arduino.platform" includes="icons/**, resources/**" />
+      <fileset dir="${mbeddr.arduino}/solutions/mbeddr.arduino.platform/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/mbeddr.arduino.platform.jar" />
     </jar>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-mbeddr.arduino.platform-models">
-      <fileset dir="${mbeddr.arduino.home}/solutions/mbeddr.arduino.platform/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+      <fileset dir="${mbeddr.arduino}/solutions/mbeddr.arduino.platform/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages/mbeddr.arduino.core/mbeddr.arduino.platform-src.jar">
-      <fileset dir="${mbeddr.arduino.home}/solutions/mbeddr.arduino.platform/source_gen" includes="**/*.java" />
-      <zipfileset file="${mbeddr.arduino.home}/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd" prefix="module" />
+    <jar destfile="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages/mbeddr.arduino/mbeddr.arduino.platform-src.jar" duplicate="preserve">
+      <fileset dir="${mbeddr.arduino}/solutions/mbeddr.arduino.platform/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${mbeddr.arduino}/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-mbeddr.arduino.platform-models" prefix="module/models" />
     </jar>
     <mkdir dir="${build.tmp}/default/mbeddr.arduino.header.jar" />
@@ -331,59 +376,103 @@
           <module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
           <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="be896c0f-4f34-4122-95ff-1aef962f5725(com.mbeddr.mpsutil.typesystem.trace.rt)" />
+          <module ref="5b4466c8-31fa-473f-b8a2-d6b76e26eed6(com.mbeddr.core.debug.blext.runtime)" />
+          <module ref="984f0332-8a86-4f5c-9184-03eae96b5d16(com.mbeddr.core.expressions.runtime)" />
+          <module ref="360a4e25-e902-4667-a0a6-0e971c4f3177(com.mbeddr.mpsutil.blutil.rt)" />
+          <module ref="fd28f7ed-d277-425b-a282-684ac4cbead6(com.mbeddr.mpsutil.breadcrumb.runtime)" />
+          <module ref="94b17d5e-87d9-4868-8101-157e83e33243(com.mbeddr.mpsutil.editor.querylist.runtime)" />
+          <module ref="735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)" />
+          <module ref="9ea6119e-d73d-42a8-8d7b-e60e0d7b845d(com.mbeddr.mpsutil.margincell.runtime)" />
+          <module ref="eedc5a6f-c2e8-4009-a7ab-5fc307bf77ec(com.mbeddr.mpsutil.multilingual.common.runtime)" />
+          <module ref="bb6926d3-ebcc-4ca6-a3be-c618633c0dc1(com.mbeddr.mpsutil.review.runtime)" />
+          <module ref="e78f91af-08a8-4a7a-bed6-b22739ed069a(com.mbeddr.mpsutil.spreferences.runtime)" />
           <module ref="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
           <module ref="83f155ff-422c-4b5a-a2f2-b459302dd215(jetbrains.mps.baseLanguage.unitTest.libs)" />
+          <module ref="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" />
+          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
         <sources jar="mbeddr.arduino.header-src.jar" descriptor="mbeddr.arduino.header.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages/mbeddr.arduino.core/mbeddr.arduino.header.jar">
+    <jar destfile="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages/mbeddr.arduino/mbeddr.arduino.header.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/mbeddr.arduino.header" />
-      <fileset dir="${mbeddr.arduino.home}/solutions/mbeddr.arduino.header" includes="icons/**, resources/**" />
+      <fileset dir="${mbeddr.arduino}/solutions/mbeddr.arduino.header" includes="icons/**, resources/**" />
+      <fileset dir="${mbeddr.arduino}/solutions/mbeddr.arduino.header/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/mbeddr.arduino.header.jar" />
     </jar>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-mbeddr.arduino.header-models">
-      <fileset dir="${mbeddr.arduino.home}/solutions/mbeddr.arduino.header/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+      <fileset dir="${mbeddr.arduino}/solutions/mbeddr.arduino.header/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/mbeddr.arduino.zip/mbeddr.arduino/languages/mbeddr.arduino.core/mbeddr.arduino.header-src.jar">
-      <fileset dir="${mbeddr.arduino.home}/solutions/mbeddr.arduino.header/source_gen" includes="**/*.java" />
-      <zipfileset file="${mbeddr.arduino.home}/solutions/mbeddr.arduino.header/mbeddr.arduino.header.msd" prefix="module" />
+    <jar destfile="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages/mbeddr.arduino/mbeddr.arduino.header-src.jar" duplicate="preserve">
+      <fileset dir="${mbeddr.arduino}/solutions/mbeddr.arduino.header/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${mbeddr.arduino}/solutions/mbeddr.arduino.header/mbeddr.arduino.header.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-mbeddr.arduino.header-models" prefix="module/models" />
     </jar>
-    <zip destfile="${build.layout}/mbeddr.arduino.zip">
-      <zipfileset file="${mbeddr.arduino.home}/devkits/mbeddr.arduino/mbeddr.arduino.devkit" prefix="mbeddr.arduino/languages/mbeddr.arduino.core" />
-      <fileset dir="${build.tmp}/default/mbeddr.arduino.zip" />
+    <mkdir dir="${build.tmp}/default/mbeddr.arduino.core.pluginSolution.jar" />
+    <mkdir dir="${build.tmp}/default/mbeddr.arduino.core.pluginSolution.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/mbeddr.arduino.core.pluginSolution.jar/META-INF/module.xml">
+      <module namespace="mbeddr.arduino.core.pluginSolution" type="solution" uuid="8e15ed0b-eb5e-477c-a001-d8e231c8fba9">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" />
+          <module ref="36c11d2d-1875-4a95-8bdb-70ea1ac63222(jetbrains.mps.execution.api)" />
+          <module ref="365fb593-3c1a-40a0-a7d7-c98144281283(jetbrains.mps.execution.impl)" />
+          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <sources jar="mbeddr.arduino.core.pluginSolution-src.jar" descriptor="mbeddr.arduino.util.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages/mbeddr.arduino/mbeddr.arduino.core.pluginSolution.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/mbeddr.arduino.core.pluginSolution" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/solutions/pluginSolution" includes="icons/**, resources/**" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/solutions/pluginSolution/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/mbeddr.arduino.core.pluginSolution.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.core-solutions-pluginSolution-models">
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/solutions/pluginSolution/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.tmp}/default/mbeddr-arduino.zip/mbeddr-arduino/languages/mbeddr.arduino/mbeddr.arduino.core.pluginSolution-src.jar" duplicate="preserve">
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/solutions/pluginSolution/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${mbeddr.arduino}/languages/mbeddr.arduino.core/solutions/pluginSolution/mbeddr.arduino.util.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-mbeddr.arduino.core-solutions-pluginSolution-models" prefix="module/models" />
+    </jar>
+    <zip destfile="${build.layout}/mbeddr-arduino.zip">
+      <zipfileset file="${mbeddr.arduino}/devkits/mbeddr.arduino/mbeddr.arduino.devkit" prefix="mbeddr-arduino/languages/mbeddr.arduino" />
+      <fileset dir="${build.tmp}/default/mbeddr-arduino.zip" />
     </zip>
-    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}com.mbeddr.mpsutil.build.build.number=${com.mbeddr.mpsutil.build.build.number}</echo>
+    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}mps-sl-all.versionNumber=${mps-sl-all.versionNumber}${line.separator}com.mbeddr.platform.major.version=${com.mbeddr.platform.major.version}${line.separator}com.mbeddr.platform.minor.version=${com.mbeddr.platform.minor.version}${line.separator}com.mbeddr.platform.build=${com.mbeddr.platform.build}${line.separator}com.mbeddr.platform.mbeddr.version=${com.mbeddr.platform.mbeddr.version}${line.separator}spawner.major.version=${spawner.major.version}${line.separator}spawner.minor.version=${spawner.minor.version}${line.separator}spawner.build=${spawner.build}${line.separator}spawner.mbeddr.version=${spawner.mbeddr.version}</echo>
   </target>
   
   <target name="buildDependents" />
   
   <target name="fetchDependencies">
-    <mkdir dir="${build.tmp}/deps/com.mbeddr.ext.statemachine/com.mbeddr.ext.statemachine.zip" />
-    <unzip src="http://github.com/$%7Bartifacts.com.mbeddr.ext.statemachine%7D/com.mbeddr.ext.statemachine.zip" dest="${build.tmp}/deps/com.mbeddr.ext.statemachine/com.mbeddr.ext.statemachine.zip" />
-    <mkdir dir="${build.tmp}/deps/com.mbeddr.ext.statemachinesInComponents/com.mbeddr.ext.statemachineInComponents.zip" />
-    <unzip src="http://github.com/$%7Bartifacts.com.mbeddr.ext.statemachinesInComponents%7D/com.mbeddr.ext.statemachineInComponents.zip" dest="${build.tmp}/deps/com.mbeddr.ext.statemachinesInComponents/com.mbeddr.ext.statemachineInComponents.zip" />
-    <mkdir dir="${build.tmp}/deps/mps-multiline/mps-multiline.zip" />
-    <unzip src="http://github.com/$%7Bartifacts.mps-multiline%7D/mps-multiline.zip" dest="${build.tmp}/deps/mps-multiline/mps-multiline.zip" />
-    <mkdir dir="${build.tmp}/deps/com.mbeddr.ext.components/com.mbeddr.ext.components.zip" />
-    <unzip src="http://github.com/$%7Bartifacts.com.mbeddr.ext.components%7D/com.mbeddr.ext.components.zip" dest="${build.tmp}/deps/com.mbeddr.ext.components/com.mbeddr.ext.components.zip" />
-    <mkdir dir="${build.tmp}/deps/mps-richtext/mps-richtext.zip" />
-    <unzip src="http://github.com/$%7Bartifacts.mps-richtext%7D/mps-richtext.zip" dest="${build.tmp}/deps/mps-richtext/mps-richtext.zip" />
-    <mkdir dir="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip" />
-    <unzip src="http://github.com/$%7Bartifacts.com.mbeddr.mpsutil.build%7D/com.mbeddr.mpsutil.zip" dest="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip" />
-    <mkdir dir="${build.tmp}/deps/com.mbeddr.debugger.build/com.mbeddr.core.debugger.zip" />
-    <unzip src="http://github.com/$%7Bartifacts.com.mbeddr.debugger.build%7D/com.mbeddr.core.debugger.zip" dest="${build.tmp}/deps/com.mbeddr.debugger.build/com.mbeddr.core.debugger.zip" />
-    <mkdir dir="${build.tmp}/deps/com.mbeddr.spawner.build/com.mbeddr.spawner.zip" />
-    <unzip src="http://github.com/$%7Bartifacts.com.mbeddr.spawner.build%7D/com.mbeddr.spawner.zip" dest="${build.tmp}/deps/com.mbeddr.spawner.build/com.mbeddr.spawner.zip" />
-    <mkdir dir="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip" />
-    <unzip src="http://github.com/$%7Bartifacts.com.mbeddr.core.build%7D/com.mbeddr.core.zip" dest="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip" />
-    <mkdir dir="${build.tmp}/deps/com.mbeddr.platform.build/com.mbeddr.platform.zip" />
-    <unzip src="http://github.com/$%7Bartifacts.com.mbeddr.platform.build%7D/com.mbeddr.platform.zip" dest="${build.tmp}/deps/com.mbeddr.platform.build/com.mbeddr.platform.zip" />
-    <mkdir dir="${build.tmp}/deps/mps-tables/mps-tables.zip" />
-    <unzip src="http://github.com/$%7Bartifacts.mps-tables%7D/mps-tables.zip" dest="${build.tmp}/deps/mps-tables/mps-tables.zip" />
+    <mkdir dir="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip" />
+    <unzip src="http://github.com/$%7Bartifacts.com.mbeddr.allInOne%7D/com.mbeddr.allInOne.zip" dest="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip" />
   </target>
   
   <target name="build" depends="assemble" />
@@ -393,7 +482,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.mbeddr.arduino.core, java.compile.mbeddr.arduino.core#2350648883898979172, java.compile.mbeddr.arduino.interrupts, java.compile.mbeddr.arduino.interrupts#5152824560131035305, java.compile.mbeddr.arduino.registers, java.compile.mbeddr.arduino.registers#5152824560130938155, java.compile.mbeddr.arduino.statemachine, java.compile.mbeddr.arduino.statemachine#7156732329349908700, java.compile.mbeddr.arduino.core.pluginSolution, java.compile.mbeddr.arduino.platform, java.compile.mbeddr.arduino.header" />
+  <target name="compileJava" depends="java.compile.mbeddr.arduino.core, java.compile.mbeddr.arduino.core#2350648883898979172, java.compile.mbeddr.arduino.interrupts, java.compile.mbeddr.arduino.interrupts#5152824560131035305, java.compile.mbeddr.arduino.registers, java.compile.mbeddr.arduino.registers#5152824560130938155, java.compile.mbeddr.arduino.statemachine, java.compile.mbeddr.arduino.statemachine#7156732329349908700, java.compile.mbeddr.arduino.platform, java.compile.mbeddr.arduino.header, java.compile.mbeddr.arduino.core.pluginSolution" />
   
   <target name="processResources" />
   
@@ -405,27 +494,41 @@
   
   <target name="generate" depends="declare-mps-tasks, fetchDependencies">
     <echo message="generating" />
-    <generate parallelMode="true" fork="true">
+    <generate strictMode="true" parallelMode="true" parallelThreads="4" useInplaceTransform="true" hideWarnings="false" createStaticRefs="true" fork="true" targetJavaVersion="1.8">
       <plugin path="${artifacts.mps}/plugins/mps-build" />
       <plugin path="${artifacts.mps}/plugins/mps-core/META-INF/plugin.xml/../.." />
       <plugin path="${artifacts.mps}/plugins/mps-debugger-api" />
       <plugin path="${artifacts.mps}/plugins/mps-debugger-java" />
       <plugin path="${artifacts.mps}/plugins/mps-execution-api" />
-      <plugin path="${artifacts.mps}/plugins/mps-execution-configurations" />
       <plugin path="${artifacts.mps}/plugins/mps-execution-languages" />
+      <plugin path="${artifacts.mps}/plugins/mps-make" />
       <plugin path="${artifacts.mps}/plugins/mps-testing" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.debugger.build/com.mbeddr.core.debugger.zip/mbeddr.debugger" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.ext.components/com.mbeddr.ext.components.zip/mbeddr.components" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.ext.statemachine/com.mbeddr.ext.statemachine.zip/mbeddr.statemachine" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.ext.statemachinesInComponents/com.mbeddr.ext.statemachineInComponents.zip/mbeddr.SmInComp" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip/mbeddr.mpsutil" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.platform.build/com.mbeddr.platform.zip/mbeddr.platform" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.spawner.build/com.mbeddr.spawner.zip/mbeddr.spawner" />
-      <plugin path="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline" />
-      <plugin path="${build.tmp}/deps/mps-richtext/mps-richtext.zip/mps-richtext" />
-      <plugin path="${build.tmp}/deps/mps-tables/mps-tables.zip/mps-tables" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.diagram" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.layout" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.widgets" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.tooltips" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.slisson.mps.conditionalEditor" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.slisson.mps.hacks" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.SmInComp" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.concurrency" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.math" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.spawner" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.statemachine" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.units" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-apache-commons" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-math-editor" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext" />
+      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-tables" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.checkedDots.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
@@ -444,20 +547,26 @@
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.bootstrap-languages.devkit" />
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.devkit" />
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-design.devkit" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.dataFlow.analyzers.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.dataFlow.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.editor.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.editor.menus.extras.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.extension.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.findUsages.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationContext.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationParameters.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.intentions.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.runtime.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
@@ -469,101 +578,165 @@
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.script.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.stubs.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.textGen.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
+      <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.facet.jar" />
+      <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.reduced.jar" />
+      <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.script.jar" />
+      <library file="${artifacts.mps}/languages/make/jetbrains.mps.tool.gentest.jar" />
       <library file="${artifacts.mps}/languages/workbench/jetbrains.mps.lang.plugin.standalone.jar" />
-      <library file="${artifacts.mps}/languages/workbench/jetbrains.mps.uiLanguage.jar" />
       <library file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
+      <library file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+      <library file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
       <library file="${artifacts.mps}/lib/mps-closures.jar" />
       <library file="${artifacts.mps}/lib/mps-collections.jar" />
       <library file="${artifacts.mps}/lib/mps-core.jar" />
       <library file="${artifacts.mps}/lib/mps-editor.jar" />
+      <library file="${artifacts.mps}/lib/mps-environment.jar" />
       <library file="${artifacts.mps}/lib/mps-openapi.jar" />
       <library file="${artifacts.mps}/lib/mps-platform.jar" />
       <library file="${artifacts.mps}/lib/mps-test.jar" />
       <library file="${artifacts.mps}/lib/mps-tool.jar" />
       <library file="${artifacts.mps}/lib/mps-tuples.jar" />
       <library file="${artifacts.mps}/lib/mps-workbench.jar" />
+      <library file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.jar" />
+      <library file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.workflow.jar" />
+      <library file="${artifacts.mps}/plugins/mps-core/languages/util/jetbrains.mps.core.properties.jar" />
       <library file="${artifacts.mps}/plugins/mps-debugger-api/languages/mps-debugger-api/jetbrains.mps.debugger.api.lang.jar" />
       <library file="${artifacts.mps}/plugins/mps-debugger-api/lib/debugger-api.jar" />
+      <library file="${artifacts.mps}/plugins/mps-debugger-java/languages/mps-debugger-java/JDK-tools.jar" />
+      <library file="${artifacts.mps}/plugins/mps-debugger-java/languages/mps-debugger-java/jetbrains.mps.debugger.java.evaluation.jar" />
+      <library file="${artifacts.mps}/plugins/mps-debugger-java/languages/mps-debugger-java/jetbrains.mps.debugger.java.privateMembers.jar" />
+      <library file="${artifacts.mps}/plugins/mps-debugger-java/lib/debugger-java.jar" />
       <library file="${artifacts.mps}/plugins/mps-execution-api/languages/mps-execution-api/jetbrains.mps.execution.common.jar" />
       <library file="${artifacts.mps}/plugins/mps-execution-api/languages/mps-execution-api/jetbrains.mps.execution.settings.jar" />
       <library file="${artifacts.mps}/plugins/mps-execution-api/lib/execution-api.jar" />
       <library file="${artifacts.mps}/plugins/mps-execution-languages/languages/mps-execution-languages/jetbrains.mps.execution.commands.jar" />
       <library file="${artifacts.mps}/plugins/mps-execution-languages/languages/mps-execution-languages/jetbrains.mps.execution.configurations.jar" />
       <library file="${artifacts.mps}/plugins/mps-execution-languages/lib/execution-languages.jar" />
+      <library file="${artifacts.mps}/plugins/mps-make/solutions/jetbrains.mps.ide.make.jar" />
       <library file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbddr.core.buildconfig.pluginSolution.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.legacy.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.gen.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.runconfiguration.pluginSolution.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.unittest.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/core.devkit" />
-      <library file="${build.tmp}/deps/com.mbeddr.debugger.build/com.mbeddr.core.debugger.zip/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.blext.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.debugger.build/com.mbeddr.core.debugger.zip/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.ext.components/com.mbeddr.ext.components.zip/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.embedded.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.ext.components/com.mbeddr.ext.components.zip/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.gen_nomw.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.ext.components/com.mbeddr.ext.components.zip/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.ext.components/com.mbeddr.ext.components.zip/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.mock.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.ext.components/com.mbeddr.ext.components.zip/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.test.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.ext.components/com.mbeddr.ext.components.zip/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.compositecomponents.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.ext.components/com.mbeddr.ext.components.zip/mbeddr.components/languages/com.mbeddr.ext.components/components.devkit" />
-      <library file="${build.tmp}/deps/com.mbeddr.ext.statemachine/com.mbeddr.ext.statemachine.zip/mbeddr.statemachine/languages/com.mbeddr.ext.statemachine/com.mbeddr.ext.statemachines.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.ext.statemachinesInComponents/com.mbeddr.ext.statemachineInComponents.zip/mbeddr.SmInComp/languages/com.mbeddr.ext.statemachineInComponents/com.mbeddr.ext.components.statemachine.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip/mbeddr.mpsutil/languages/com.mbeddr.mpsutil/com.mbeddr.mpsutil.blutil.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip/mbeddr.mpsutil/languages/com.mbeddr.mpsutil/com.mbeddr.mpsutil.blutil.rt.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip/mbeddr.mpsutil/languages/com.mbeddr.mpsutil/com.mbeddr.mpsutil.genutil.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip/mbeddr.mpsutil/languages/com.mbeddr.mpsutil/com.mbeddr.mpsutil.typesystem.trace.rt.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip/mbeddr.mpsutil/languages/com.mbeddr.mpsutil/com.mbeddr.mpsutil.typsystem.trace.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.platform.build/com.mbeddr.platform.zip/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.spawner.build/com.mbeddr.spawner.zip/mbeddr.spawner/languages/Eclipse.Debugger.jar" />
-      <library file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
-      <library file="${build.tmp}/deps/mps-richtext/mps-richtext.zip/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.customcell.jar" />
-      <library file="${build.tmp}/deps/mps-richtext/mps-richtext.zip/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
-      <library file="${build.tmp}/deps/mps-tables/mps-tables.zip/mps-tables/languages/mps-tables/de.slisson.mps.tables.jar" />
-      <library file="${build.tmp}/deps/mps-tables/mps-tables.zip/mps-tables/languages/mps-tables/de.slisson.mps.tables.runtime.jar" />
-      <chunk>
-        <module file="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl" />
-        <module file="${mbeddr.arduino.home}/solutions/mbeddr.arduino.header/mbeddr.arduino.header.msd" />
-        <module file="${mbeddr.arduino.home}/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl" />
-        <module file="${mbeddr.arduino.home}/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl" />
-        <module file="${mbeddr.arduino.home}/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl" />
-      </chunk>
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.styles.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.layout.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.styles.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.layout/languages/de.itemis.mps.editor.miglayout/de.itemis.mps.editor.layout.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.widgets/languages/de.itemis.mps.editor.widgets/de.itemis.mps.editor.bool.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.widgets/languages/de.itemis.mps.editor.widgets/de.itemis.mps.editor.bool.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.widgets/languages/de.itemis.mps.editor.widgets/de.itemis.mps.editor.collapsible.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.widgets/languages/de.itemis.mps.editor.widgets/de.itemis.mps.mouselistener.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.tooltips/languages/de.itemis.mps.tooltips/de.itemis.mps.tooltips.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.slisson.mps.conditionalEditor/languages/de.slisson.mps.conditionalEditor/de.slisson.mps.conditionalEditor.hints.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.slisson.mps.conditionalEditor/languages/de.slisson.mps.conditionalEditor/de.slisson.mps.conditionalEditor.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.slisson.mps.hacks/languages/de.slisson.mps.hacks/de.slisson.mps.hacks.editor.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.slisson.mps.hacks/languages/de.slisson.mps.hacks/de.slisson.mps.reflection.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.SmInComp/languages/com.mbeddr.ext.statemachineInComponents/com.mbeddr.ext.components.statemachine.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.embedded.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.gen_nomw.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.mock.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.test.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.compositecomponents.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components/languages/com.mbeddr.ext.components/components.devkit" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbddr.core.buildconfig.pluginSolution.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.checks.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.cinterpreter.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.debugger.gdb.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.legacy.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.gen.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.runconfiguration.pluginSolution.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.stdlib.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.unittest.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddt.core.expressions.pluginSolution.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/core.devkit" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.blext.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.blext.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.baseLanguage/com.mbeddr.mpsutil.common.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/com.mbeddr.mpsutil.ccmenu.reftarget.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/com.mbeddr.mpsutil.compare.pattern.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/com.mbeddr.mpsutil.contextactions.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/com.mbeddr.mpsutil.dataflow.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/com.mbeddr.mpsutil.dataflow.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.gen-support/com.mbeddr.mpsutil.genutil.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells/com.mbeddr.mpsutil.grammarcells.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells/com.mbeddr.mpsutil.grammarcells.runtimelang.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/com.mbeddr.mpsutil.httpsupport.rt.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.infrastructure-support/com.mbeddr.mpsutil.nodeaccess.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.infrastructure-support/com.mbeddr.mpsutil.serializer.xml.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.rt.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.test.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.pluginSolution.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.editor.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.annotation.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.readonly.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.context.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.spawner/languages/Eclipse.Debugger.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.statemachine/languages/com.mbeddr.ext.statemachine/com.mbeddr.ext.statemachines.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-apache-commons/languages/mps-apache-commons/org.apache.commons.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.customcell.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-tables/languages/mps-tables/de.slisson.mps.tables.jar" />
+      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-tables/languages/mps-tables/de.slisson.mps.tables.runtime.jar" />
       <chunk>
-        <module file="${mbeddr.arduino.home}/devkits/mbeddr.arduino/mbeddr.arduino.devkit" />
-        <module file="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/solutions/pluginSolution/mbeddr.arduino.util.msd" />
-        <module file="${mbeddr.arduino.home}/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd" />
+        <module file="${mbeddr.arduino}/devkits/mbeddr.arduino/mbeddr.arduino.devkit" />
+        <module file="${mbeddr.arduino}/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl" />
+        <module file="${mbeddr.arduino}/languages/mbeddr.arduino.core/solutions/pluginSolution/mbeddr.arduino.util.msd" />
+        <module file="${mbeddr.arduino}/solutions/mbeddr.arduino.header/mbeddr.arduino.header.msd" />
+        <module file="${mbeddr.arduino}/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl" />
+        <module file="${mbeddr.arduino}/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd" />
+        <module file="${mbeddr.arduino}/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl" />
+        <module file="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl" />
       </chunk>
+      <chunk />
       <jvmargs>
-        <arg value="-Xmx512m" />
+        <arg value="-Xmx2048m" />
+        <arg value="-XX:MaxPermSize=512m" />
       </jvmargs>
-      <macro name="mbeddr.arduino.home" path="${mbeddr.arduino.home}" />
       <macro name="mbeddr.arduino" path="${mbeddr.arduino}" />
       <macro name="mps.home" path="${mps.home}" />
-      <macro name="mbeddr.hombeddr.github.core.home" path="${mbeddr.hombeddr.github.core.home}" />
-      <macro name="mebddr.core.artifacts" path="${mebddr.core.artifacts}" />
-      <macro name="mbeddr.comp.artifacts" path="${mbeddr.comp.artifacts}" />
-      <macro name="mbeddr.statemachines.artifacts" path="${mbeddr.statemachines.artifacts}" />
-      <macro name="mbeddr.statemachines.comp.artifacts" path="${mbeddr.statemachines.comp.artifacts}" />
-      <macro name="mbeddr.mpsutil.artifacts" path="${mbeddr.mpsutil.artifacts}" />
-      <macro name="mbeddr.platform.artifacts" path="${mbeddr.platform.artifacts}" />
-      <macro name="mbeddr.spawner.artifacts" path="${mbeddr.spawner.artifacts}" />
-      <macro name="mbeddr.debugger.artifacts" path="${mbeddr.debugger.artifacts}" />
-      <macro name="richtext.artifacts" path="${richtext.artifacts}" />
-      <macro name="multiline.artifacts" path="${multiline.artifacts}" />
-      <macro name="tables.artifacts" path="${tables.artifacts}" />
+      <macro name="mbeddr.github.core.home" path="${mbeddr.github.core.home}" />
+      <macro name="artifacts.root" path="${artifacts.root}" />
+      <macro name="mbeddr.artifacts" path="${mbeddr.artifacts}" />
+      <macro name="sl-all.artifacts" path="${sl-all.artifacts}" />
+      <macro name="platform.artifacts" path="${platform.artifacts}" />
+      <macro name="spawner.artifacts" path="${spawner.artifacts}" />
     </generate>
   </target>
   
@@ -574,79 +747,104 @@
   <target name="makeDependents" />
   
   <target name="java.compile.mbeddr.arduino.core" depends="java.compile.mbeddr.arduino.header, java.compile.mbeddr.arduino.interrupts, fetchDependencies">
-    <mkdir dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/source_gen" />
+    <mkdir dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/source_gen" />
     <mkdir dir="${build.tmp}/java/out/mbeddr.arduino.core" />
-    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.core" fork="true" includeantruntime="false" debug="true">
+    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.core" fork="false" encoding="utf8" includeantruntime="false" debug="true" source="1.8" target="1.8">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/source_gen" />
+        <path location="${mbeddr.arduino}/languages/mbeddr.arduino.core/source_gen" />
       </src>
       <classpath>
+        <fileset file="${artifacts.mps}/plugins/mps-execution-api/lib/execution-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.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-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.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-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-debugger-api/lib/debugger-api.jar" />
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.header" />
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.interrupts" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/bsh-core-2.0b4.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/cglib-nodep-2.1_3.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-core-1.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.5.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit3-2.5.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.5.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/objenesis-1.0.jar" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-core-1.3.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/junit-4.10.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/diff_match_patch.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/commons-lang3-3.1.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/commons-lang-2.6.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/lib/diff_match_patch.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.3.jar" />
-        <fileset file="${artifacts.mps}/lib/asm4-all.jar" />
+        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
+        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.platform.build/com.mbeddr.platform.zip/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.debugger.build/com.mbeddr.core.debugger.zip/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip/mbeddr.mpsutil/languages/com.mbeddr.mpsutil/com.mbeddr.mpsutil.blutil.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip/mbeddr.mpsutil/languages/com.mbeddr.mpsutil/com.mbeddr.mpsutil.typesystem.trace.rt.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
-        <fileset file="${build.tmp}/deps/mps-richtext/mps-richtext.zip/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
-        <fileset file="${build.tmp}/deps/mps-tables/mps-tables.zip/mps-tables/languages/mps-tables/de.slisson.mps.tables.jar" />
-        <fileset file="${build.tmp}/deps/mps-tables/mps-tables.zip/mps-tables/languages/mps-tables/de.slisson.mps.tables.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.blext.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.rt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.widgets/languages/de.itemis.mps.editor.widgets/de.itemis.mps.editor.bool.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.slisson.mps.hacks/languages/de.slisson.mps.hacks/de.slisson.mps.hacks.editor.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-tables/languages/mps-tables/de.slisson.mps.tables.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-tables/languages/mps-tables/de.slisson.mps.tables.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.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.jdk7.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.workflow.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-core/languages/util/jetbrains.mps.core.properties.jar" />
+        <fileset file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.editor.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
@@ -656,80 +854,102 @@
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/mbeddr.arduino.core">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/source_gen" excludes="**/*.java" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/source_gen" excludes="**/*.java" />
     </copy>
   </target>
   
   <target name="java.compile.mbeddr.arduino.core#2350648883898979172" depends="java.compile.mbeddr.arduino.core, java.compile.mbeddr.arduino.header, java.compile.mbeddr.arduino.interrupts, java.compile.mbeddr.arduino.interrupts#5152824560131035305, fetchDependencies">
-    <mkdir dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/generator/source_gen" />
+    <mkdir dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/mbeddr.arduino.core#2350648883898979172" />
-    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.core#2350648883898979172" fork="true" includeantruntime="false" debug="true">
+    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.core#2350648883898979172" fork="false" encoding="utf8" includeantruntime="false" debug="true" source="1.8" target="1.8">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/generator/source_gen" />
+        <path location="${mbeddr.arduino}/languages/mbeddr.arduino.core/generator/source_gen" />
       </src>
       <classpath>
+        <fileset file="${artifacts.mps}/plugins/mps-execution-api/lib/execution-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.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-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.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-editor.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-debugger-api/lib/debugger-api.jar" />
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.core" />
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.header" />
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.interrupts" />
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.interrupts#5152824560131035305" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/bsh-core-2.0b4.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/cglib-nodep-2.1_3.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-core-1.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.5.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit3-2.5.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.5.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/objenesis-1.0.jar" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-core-1.3.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/junit-4.10.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/diff_match_patch.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/commons-lang3-3.1.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/commons-lang-2.6.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/lib/diff_match_patch.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.3.jar" />
-        <fileset file="${artifacts.mps}/lib/asm4-all.jar" />
+        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
+        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.platform.build/com.mbeddr.platform.zip/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.debugger.build/com.mbeddr.core.debugger.zip/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip/mbeddr.mpsutil/languages/com.mbeddr.mpsutil/com.mbeddr.mpsutil.blutil.rt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip/mbeddr.mpsutil/languages/com.mbeddr.mpsutil/com.mbeddr.mpsutil.typesystem.trace.rt.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
-        <fileset file="${build.tmp}/deps/mps-richtext/mps-richtext.zip/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.blext.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.rt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.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.jdk7.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
+        <fileset file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.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" />
@@ -737,56 +957,76 @@
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/mbeddr.arduino.core#2350648883898979172">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/generator/source_gen" excludes="**/*.java" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/generator/source_gen" excludes="**/*.java" />
     </copy>
   </target>
   
   <target name="java.compile.mbeddr.arduino.interrupts" depends="fetchDependencies">
-    <mkdir dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.interrupts/source_gen" />
+    <mkdir dir="${mbeddr.arduino}/languages/mbeddr.arduino.interrupts/source_gen" />
     <mkdir dir="${build.tmp}/java/out/mbeddr.arduino.interrupts" />
-    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.interrupts" fork="true" includeantruntime="false" debug="true">
+    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.interrupts" fork="false" encoding="utf8" includeantruntime="false" debug="true" source="1.8" target="1.8">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mbeddr.arduino.home}/languages/mbeddr.arduino.interrupts/source_gen" />
+        <path location="${mbeddr.arduino}/languages/mbeddr.arduino.interrupts/source_gen" />
       </src>
       <classpath>
+        <fileset file="${artifacts.mps}/plugins/mps-execution-api/lib/execution-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.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-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.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-editor.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-debugger-api/lib/debugger-api.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.3.jar" />
-        <fileset file="${artifacts.mps}/lib/asm4-all.jar" />
+        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
+        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.platform.build/com.mbeddr.platform.zip/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.debugger.build/com.mbeddr.core.debugger.zip/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-        <fileset file="${build.tmp}/deps/mps-richtext/mps-richtext.zip/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.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.jdk7.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
+        <fileset file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.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" />
@@ -794,64 +1034,86 @@
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/mbeddr.arduino.interrupts">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.interrupts/source_gen" excludes="**/*.java" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.interrupts/source_gen" excludes="**/*.java" />
     </copy>
   </target>
   
   <target name="java.compile.mbeddr.arduino.interrupts#5152824560131035305" depends="java.compile.mbeddr.arduino.interrupts, fetchDependencies">
-    <mkdir dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.interrupts/generator/source_gen" />
+    <mkdir dir="${mbeddr.arduino}/languages/mbeddr.arduino.interrupts/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/mbeddr.arduino.interrupts#5152824560131035305" />
-    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.interrupts#5152824560131035305" fork="true" includeantruntime="false" debug="true">
+    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.interrupts#5152824560131035305" fork="false" encoding="utf8" includeantruntime="false" debug="true" source="1.8" target="1.8">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mbeddr.arduino.home}/languages/mbeddr.arduino.interrupts/generator/source_gen" />
+        <path location="${mbeddr.arduino}/languages/mbeddr.arduino.interrupts/generator/source_gen" />
       </src>
       <classpath>
+        <fileset file="${artifacts.mps}/plugins/mps-execution-api/lib/execution-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.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-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.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-editor.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-debugger-api/lib/debugger-api.jar" />
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.interrupts" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/diff_match_patch.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/commons-lang3-3.1.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/commons-lang-2.6.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/lib/diff_match_patch.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.3.jar" />
-        <fileset file="${artifacts.mps}/lib/asm4-all.jar" />
+        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
+        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.platform.build/com.mbeddr.platform.zip/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.debugger.build/com.mbeddr.core.debugger.zip/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip/mbeddr.mpsutil/languages/com.mbeddr.mpsutil/com.mbeddr.mpsutil.typesystem.trace.rt.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
-        <fileset file="${build.tmp}/deps/mps-richtext/mps-richtext.zip/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.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.jdk7.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
+        <fileset file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.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" />
@@ -859,56 +1121,76 @@
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/mbeddr.arduino.interrupts#5152824560131035305">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.interrupts/generator/source_gen" excludes="**/*.java" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.interrupts/generator/source_gen" excludes="**/*.java" />
     </copy>
   </target>
   
   <target name="java.compile.mbeddr.arduino.registers" depends="fetchDependencies">
-    <mkdir dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.registers/source_gen" />
+    <mkdir dir="${mbeddr.arduino}/languages/mbeddr.arduino.registers/source_gen" />
     <mkdir dir="${build.tmp}/java/out/mbeddr.arduino.registers" />
-    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.registers" fork="true" includeantruntime="false" debug="true">
+    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.registers" fork="false" encoding="utf8" includeantruntime="false" debug="true" source="1.8" target="1.8">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mbeddr.arduino.home}/languages/mbeddr.arduino.registers/source_gen" />
+        <path location="${mbeddr.arduino}/languages/mbeddr.arduino.registers/source_gen" />
       </src>
       <classpath>
+        <fileset file="${artifacts.mps}/plugins/mps-execution-api/lib/execution-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.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-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.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-editor.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-debugger-api/lib/debugger-api.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.3.jar" />
-        <fileset file="${artifacts.mps}/lib/asm4-all.jar" />
+        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
+        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.platform.build/com.mbeddr.platform.zip/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.debugger.build/com.mbeddr.core.debugger.zip/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-        <fileset file="${build.tmp}/deps/mps-richtext/mps-richtext.zip/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.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.jdk7.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
+        <fileset file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.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" />
@@ -916,62 +1198,77 @@
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/mbeddr.arduino.registers">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.registers/source_gen" excludes="**/*.java" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.registers/source_gen" excludes="**/*.java" />
     </copy>
   </target>
   
   <target name="java.compile.mbeddr.arduino.registers#5152824560130938155" depends="java.compile.mbeddr.arduino.registers, fetchDependencies">
-    <mkdir dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.registers/generator/source_gen" />
+    <mkdir dir="${mbeddr.arduino}/languages/mbeddr.arduino.registers/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/mbeddr.arduino.registers#5152824560130938155" />
-    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.registers#5152824560130938155" fork="true" includeantruntime="false" debug="true">
+    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.registers#5152824560130938155" fork="false" encoding="utf8" includeantruntime="false" debug="true" source="1.8" target="1.8">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mbeddr.arduino.home}/languages/mbeddr.arduino.registers/generator/source_gen" />
+        <path location="${mbeddr.arduino}/languages/mbeddr.arduino.registers/generator/source_gen" />
       </src>
       <classpath>
+        <fileset file="${artifacts.mps}/plugins/mps-execution-api/lib/execution-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.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-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.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-editor.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-debugger-api/lib/debugger-api.jar" />
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.registers" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/diff_match_patch.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/commons-lang3-3.1.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/commons-lang-2.6.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.3.jar" />
-        <fileset file="${artifacts.mps}/lib/asm4-all.jar" />
+        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
+        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.platform.build/com.mbeddr.platform.zip/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.debugger.build/com.mbeddr.core.debugger.zip/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip/mbeddr.mpsutil/languages/com.mbeddr.mpsutil/com.mbeddr.mpsutil.typesystem.trace.rt.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
-        <fileset file="${build.tmp}/deps/mps-richtext/mps-richtext.zip/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.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.jdk7.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
+        <fileset file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.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" />
@@ -979,70 +1276,89 @@
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/mbeddr.arduino.registers#5152824560130938155">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.registers/generator/source_gen" excludes="**/*.java" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.registers/generator/source_gen" excludes="**/*.java" />
     </copy>
   </target>
   
-  <target name="java.compile.mbeddr.arduino.statemachine" depends="java.compile.mbeddr.arduino.core, java.compile.mbeddr.arduino.header, fetchDependencies">
-    <mkdir dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.statemachine/source_gen" />
+  <target name="java.compile.mbeddr.arduino.statemachine" depends="java.compile.mbeddr.arduino.core, java.compile.mbeddr.arduino.header, java.compile.mbeddr.arduino.platform, fetchDependencies">
+    <mkdir dir="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine/source_gen" />
     <mkdir dir="${build.tmp}/java/out/mbeddr.arduino.statemachine" />
-    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.statemachine" fork="true" includeantruntime="false" debug="true">
+    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.statemachine" fork="false" encoding="utf8" includeantruntime="false" debug="true" source="1.8" target="1.8">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mbeddr.arduino.home}/languages/mbeddr.arduino.statemachine/source_gen" />
+        <path location="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine/source_gen" />
       </src>
       <classpath>
+        <fileset file="${artifacts.mps}/plugins/mps-execution-api/lib/execution-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.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-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.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-editor.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-debugger-api/lib/debugger-api.jar" />
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.core" />
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.header" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <pathelement path="${build.tmp}/java/out/mbeddr.arduino.platform" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/lib/diff_match_patch.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.3.jar" />
-        <fileset file="${artifacts.mps}/lib/asm4-all.jar" />
+        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
+        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.platform.build/com.mbeddr.platform.zip/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.debugger.build/com.mbeddr.core.debugger.zip/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.gen.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.unittest.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.ext.components/com.mbeddr.ext.components.zip/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.ext.statemachinesInComponents/com.mbeddr.ext.statemachineInComponents.zip/mbeddr.SmInComp/languages/com.mbeddr.ext.statemachineInComponents/com.mbeddr.ext.components.statemachine.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.ext.statemachine/com.mbeddr.ext.statemachine.zip/mbeddr.statemachine/languages/com.mbeddr.ext.statemachine/com.mbeddr.ext.statemachines.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip/mbeddr.mpsutil/languages/com.mbeddr.mpsutil/com.mbeddr.mpsutil.blutil.rt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip/mbeddr.mpsutil/languages/com.mbeddr.mpsutil/com.mbeddr.mpsutil.typesystem.trace.rt.jar" />
-        <fileset file="${build.tmp}/deps/mps-richtext/mps-richtext.zip/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.gen.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.unittest.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.SmInComp/languages/com.mbeddr.ext.statemachineInComponents/com.mbeddr.ext.components.statemachine.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.statemachine/languages/com.mbeddr.ext.statemachine/com.mbeddr.ext.statemachines.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.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.jdk7.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
+        <fileset file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.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" />
@@ -1050,76 +1366,95 @@
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/mbeddr.arduino.statemachine">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.statemachine/source_gen" excludes="**/*.java" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine/source_gen" excludes="**/*.java" />
     </copy>
   </target>
   
   <target name="java.compile.mbeddr.arduino.statemachine#7156732329349908700" depends="java.compile.mbeddr.arduino.core, java.compile.mbeddr.arduino.header, java.compile.mbeddr.arduino.platform, java.compile.mbeddr.arduino.statemachine, fetchDependencies">
-    <mkdir dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.statemachine/generator/source_gen" />
+    <mkdir dir="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/mbeddr.arduino.statemachine#7156732329349908700" />
-    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.statemachine#7156732329349908700" fork="true" includeantruntime="false" debug="true">
+    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.statemachine#7156732329349908700" fork="false" encoding="utf8" includeantruntime="false" debug="true" source="1.8" target="1.8">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mbeddr.arduino.home}/languages/mbeddr.arduino.statemachine/generator/source_gen" />
+        <path location="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine/generator/source_gen" />
       </src>
       <classpath>
+        <fileset file="${artifacts.mps}/plugins/mps-execution-api/lib/execution-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.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-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.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-editor.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-debugger-api/lib/debugger-api.jar" />
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.core" />
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.header" />
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.platform" />
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.statemachine" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/diff_match_patch.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/commons-lang3-3.1.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/commons-lang-2.6.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/lib/diff_match_patch.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.3.jar" />
-        <fileset file="${artifacts.mps}/lib/asm4-all.jar" />
+        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
+        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.platform.build/com.mbeddr.platform.zip/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.debugger.build/com.mbeddr.core.debugger.zip/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.gen.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.unittest.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.ext.components/com.mbeddr.ext.components.zip/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.ext.statemachinesInComponents/com.mbeddr.ext.statemachineInComponents.zip/mbeddr.SmInComp/languages/com.mbeddr.ext.statemachineInComponents/com.mbeddr.ext.components.statemachine.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.ext.statemachine/com.mbeddr.ext.statemachine.zip/mbeddr.statemachine/languages/com.mbeddr.ext.statemachine/com.mbeddr.ext.statemachines.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip/mbeddr.mpsutil/languages/com.mbeddr.mpsutil/com.mbeddr.mpsutil.blutil.rt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip/mbeddr.mpsutil/languages/com.mbeddr.mpsutil/com.mbeddr.mpsutil.typesystem.trace.rt.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
-        <fileset file="${build.tmp}/deps/mps-richtext/mps-richtext.zip/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.gen.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.unittest.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.SmInComp/languages/com.mbeddr.ext.statemachineInComponents/com.mbeddr.ext.components.statemachine.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.statemachine/languages/com.mbeddr.ext.statemachine/com.mbeddr.ext.statemachines.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.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.jdk7.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
+        <fileset file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.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" />
@@ -1127,195 +1462,239 @@
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/mbeddr.arduino.statemachine#7156732329349908700">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.statemachine/generator/source_gen" excludes="**/*.java" />
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine/generator/source_gen" excludes="**/*.java" />
     </copy>
   </target>
   
-  <target name="java.compile.mbeddr.arduino.core.pluginSolution" depends="java.compile.mbeddr.arduino.core, java.compile.mbeddr.arduino.header, fetchDependencies">
-    <mkdir dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/solutions/pluginSolution/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/mbeddr.arduino.core.pluginSolution" />
-    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.core.pluginSolution" fork="true" includeantruntime="false" debug="true">
+  <target name="java.compile.mbeddr.arduino.platform" depends="java.compile.mbeddr.arduino.header, fetchDependencies">
+    <mkdir dir="${mbeddr.arduino}/solutions/mbeddr.arduino.platform/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/mbeddr.arduino.platform" />
+    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.platform" fork="false" encoding="utf8" includeantruntime="false" debug="true" source="1.8" target="1.8">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/solutions/pluginSolution/source_gen" />
+        <path location="${mbeddr.arduino}/solutions/mbeddr.arduino.platform/source_gen" />
       </src>
       <classpath>
+        <fileset file="${artifacts.mps}/plugins/mps-execution-api/lib/execution-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.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-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.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-editor.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
-        <pathelement path="${build.tmp}/java/out/mbeddr.arduino.core" />
-        <pathelement path="${build.tmp}/java/out/mbeddr.arduino.header" />
-        <fileset file="${artifacts.mps}/plugins/mps-execution-api/lib/execution-api.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-execution-languages/lib/execution-languages.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-debugger-api/lib/debugger-api.jar" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <pathelement path="${build.tmp}/java/out/mbeddr.arduino.header" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-core-1.3.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/diff_match_patch.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/commons-lang3-3.1.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/commons-lang-2.6.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/lib/diff_match_patch.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.3.jar" />
-        <fileset file="${artifacts.mps}/lib/asm4-all.jar" />
+        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
+        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.platform.build/com.mbeddr.platform.zip/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.debugger.build/com.mbeddr.core.debugger.zip/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.runconfiguration.pluginSolution.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.core.build/com.mbeddr.core.zip/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip/mbeddr.mpsutil/languages/com.mbeddr.mpsutil/com.mbeddr.mpsutil.typesystem.trace.rt.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
-        <fileset file="${build.tmp}/deps/mps-richtext/mps-richtext.zip/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.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.jdk7.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.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" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.blext.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.rt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
       </classpath>
     </javac>
-    <copy todir="${build.tmp}/java/out/mbeddr.arduino.core.pluginSolution">
-      <fileset dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/solutions/pluginSolution/source_gen" excludes="**/*.java" />
+    <copy todir="${build.tmp}/java/out/mbeddr.arduino.platform">
+      <fileset dir="${mbeddr.arduino}/solutions/mbeddr.arduino.platform/source_gen" excludes="**/*.java" />
     </copy>
   </target>
   
-  <target name="java.compile.mbeddr.arduino.platform" depends="fetchDependencies">
-    <mkdir dir="${mbeddr.arduino.home}/solutions/mbeddr.arduino.platform/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/mbeddr.arduino.platform" />
-    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.platform" fork="true" includeantruntime="false" debug="true">
+  <target name="java.compile.mbeddr.arduino.header" depends="fetchDependencies">
+    <mkdir dir="${mbeddr.arduino}/solutions/mbeddr.arduino.header/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/mbeddr.arduino.header" />
+    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.header" fork="false" encoding="utf8" includeantruntime="false" debug="true" source="1.8" target="1.8">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mbeddr.arduino.home}/solutions/mbeddr.arduino.platform/source_gen" />
+        <path location="${mbeddr.arduino}/solutions/mbeddr.arduino.header/source_gen" />
       </src>
       <classpath>
+        <fileset file="${artifacts.mps}/plugins/mps-execution-api/lib/execution-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.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-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.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-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/bsh-core-2.0b4.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/cglib-nodep-2.1_3.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-core-1.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.5.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit3-2.5.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.5.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/objenesis-1.0.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-debugger-api/lib/debugger-api.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-core-1.3.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2.jar" />
+        <fileset file="${artifacts.mps}/lib/log4j.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/lib/diff_match_patch.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/junit-4.10.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/diff_match_patch.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/commons-lang3-3.1.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/commons-lang-2.6.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.3.jar" />
-        <fileset file="${artifacts.mps}/lib/asm4-all.jar" />
+        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
+        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip/mbeddr.mpsutil/languages/com.mbeddr.mpsutil/com.mbeddr.mpsutil.typesystem.trace.rt.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.blext.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.rt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
       </classpath>
     </javac>
-    <copy todir="${build.tmp}/java/out/mbeddr.arduino.platform">
-      <fileset dir="${mbeddr.arduino.home}/solutions/mbeddr.arduino.platform/source_gen" excludes="**/*.java" />
+    <copy todir="${build.tmp}/java/out/mbeddr.arduino.header">
+      <fileset dir="${mbeddr.arduino}/solutions/mbeddr.arduino.header/source_gen" excludes="**/*.java" />
     </copy>
   </target>
   
-  <target name="java.compile.mbeddr.arduino.header" depends="fetchDependencies">
-    <mkdir dir="${mbeddr.arduino.home}/solutions/mbeddr.arduino.header/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/mbeddr.arduino.header" />
-    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.header" fork="true" includeantruntime="false" debug="true">
+  <target name="java.compile.mbeddr.arduino.core.pluginSolution" depends="java.compile.mbeddr.arduino.core, java.compile.mbeddr.arduino.header, fetchDependencies">
+    <mkdir dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/solutions/pluginSolution/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/mbeddr.arduino.core.pluginSolution" />
+    <javac destdir="${build.tmp}/java/out/mbeddr.arduino.core.pluginSolution" fork="false" encoding="utf8" includeantruntime="false" debug="true" source="1.8" target="1.8">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mbeddr.arduino.home}/solutions/mbeddr.arduino.header/source_gen" />
+        <path location="${mbeddr.arduino}/languages/mbeddr.arduino.core/solutions/pluginSolution/source_gen" />
       </src>
       <classpath>
+        <fileset file="${artifacts.mps}/plugins/mps-execution-api/lib/execution-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.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-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.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-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/bsh-core-2.0b4.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/cglib-nodep-2.1_3.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-core-1.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.5.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit3-2.5.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.5.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/objenesis-1.0.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-debugger-api/lib/debugger-api.jar" />
+        <pathelement path="${build.tmp}/java/out/mbeddr.arduino.core" />
+        <pathelement path="${build.tmp}/java/out/mbeddr.arduino.header" />
+        <fileset file="${artifacts.mps}/plugins/mps-debugger-java/lib/debugger-java.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-execution-languages/lib/execution-languages.jar" />
+        <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/junit-4.10.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/diff_match_patch.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/commons-lang3-3.1.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/lib/commons-lang-2.6.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.3.jar" />
-        <fileset file="${artifacts.mps}/lib/asm4-all.jar" />
+        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
+        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.mpsutil.build/com.mbeddr.mpsutil.zip/mbeddr.mpsutil/languages/com.mbeddr.mpsutil/com.mbeddr.mpsutil.typesystem.trace.rt.jar" />
-        <fileset file="${build.tmp}/deps/mps-multiline/mps-multiline.zip/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.runconfiguration.pluginSolution.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.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.logging.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.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" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
       </classpath>
     </javac>
-    <copy todir="${build.tmp}/java/out/mbeddr.arduino.header">
-      <fileset dir="${mbeddr.arduino.home}/solutions/mbeddr.arduino.header/source_gen" excludes="**/*.java" />
+    <copy todir="${build.tmp}/java/out/mbeddr.arduino.core.pluginSolution">
+      <fileset dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/solutions/pluginSolution/source_gen" excludes="**/*.java" />
     </copy>
   </target>
   
   <target name="cleanSources">
-    <delete dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/source_gen" />
-    <delete dir="${mbeddr.arduino.home}/solutions/mbeddr.arduino.header/source_gen" />
-    <delete dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.interrupts/source_gen" />
-    <delete dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.registers/source_gen" />
-    <delete dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.statemachine/source_gen" />
-    <delete dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/generator/source_gen" />
-    <delete dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.core/solutions/pluginSolution/source_gen" />
-    <delete dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.interrupts/generator/source_gen" />
-    <delete dir="${mbeddr.arduino.home}/solutions/mbeddr.arduino.platform/source_gen" />
-    <delete dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.registers/generator/source_gen" />
-    <delete dir="${mbeddr.arduino.home}/languages/mbeddr.arduino.statemachine/generator/source_gen" />
+    <delete dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/source_gen" />
+    <delete dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/solutions/pluginSolution/source_gen" />
+    <delete dir="${mbeddr.arduino}/solutions/mbeddr.arduino.header/source_gen" />
+    <delete dir="${mbeddr.arduino}/languages/mbeddr.arduino.interrupts/source_gen" />
+    <delete dir="${mbeddr.arduino}/solutions/mbeddr.arduino.platform/source_gen" />
+    <delete dir="${mbeddr.arduino}/languages/mbeddr.arduino.registers/source_gen" />
+    <delete dir="${mbeddr.arduino}/languages/mbeddr.arduino.registers/generator/source_gen" />
+    <delete dir="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine/source_gen" />
+    <delete dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/generator/source_gen" />
+    <delete dir="${mbeddr.arduino}/languages/mbeddr.arduino.interrupts/generator/source_gen" />
+    <delete dir="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine/generator/source_gen" />
   </target>
 </project>
\ No newline at end of file
diff --git a/gradle.properties.example b/gradle.properties.example
new file mode 100644
index 0000000..7f617b6
--- /dev/null
+++ b/gradle.properties.example
@@ -0,0 +1,2 @@
+nexusUsername=<username>
+nexusPassword=<password>
diff --git a/gradle/.gitignore b/gradle/.gitignore
new file mode 100644
index 0000000..84c048a
--- /dev/null
+++ b/gradle/.gitignore
@@ -0,0 +1 @@
+/build/
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..6ffa237849ef3607e39c3b334a92a65367962071
GIT binary patch
literal 52928
zcmagGb95)swk{ew9kXNGwr$(C^NZ85ZQHifv2EM7)3?vv`<-+5e*3;xW6Y}hW3I6<
zCcd@iSEV2g3I+oN1O)|jZN@AK^!Eb!uiM`X`me}}stD3b%8Ai~0xA59VoR-HEdO5x
zmA``ee=5of%1MfeDyz`Riap3qPRK~p(#^q3(^5@O&NM19EHdvN-A~evN>0g6QA^SQ
z!<>hhq#PD$QMO@_mK+utjrKQVUtrxk-8ljOA06)g+sMHFc4+Tp{x5_2cOBS&>X<tj
zn%J2Bf2yMVtE#(`p@V~|)Bmf9MSzJ};a}CIze4<<n~2!E+u7I~nvgKk8QT~-JNrb*
z!t^sB2Jcv~YEiq<2f(g`<n-Y?5Yq7o+6db~OG;LBXTl=v<`1GeUho|A;!S$jz8pXk
z2>1WSG!pV|VNad#DJM1TXs(`9L%opN1UGD9Zg1&fIj6|1q{So)3U-a4CWoQ*xDe5m
z9`W<5i~<sJVi4<yM&Fi}m*B=;>8J4RP+_u%df<<9!9wKqF2xU;C4v(Y!-T*OjUIq^
zrN#C6w^bh64qit6YXA;^mssTgXO7Aq&Mv053QqQa7t6)c)cNllz(dg0#lqCi#nRZ&
z#op;3i%_g=YmY35=!;GfIx@FkZcv@PzU--T6k$JSfDIiT4$UZAAuGdgYY1vy<8ERf
ze_#6;Y0Gj4`C1s&D3DA5jB+zDeaZ7M$-~|Ga&WS812hh>B8m=xh6M+;rrcz!kBLTQ
zQ`T6%#zoO?vnKj6^1J1i7u*<z-fp>WNSiW`iNs=miGfCi*Dt^VFDLpvE&ns6(aHeC
z3qt$jqc5sVSqlbZ75*bJsob;aDw2{15z$SP{#8W_RMN^WRTA9t1p#8i@dE|&pob=c
z>4dH1_G9oyVwbRrJN+fN?`US`1FRZminh>|a=RWyrg0hu1l&)#`tM(Uhjs)>+`Q#R
zyL_M$J<Q6|?FEo1+*^helaeM32>mrSVd^<}^2Z=lmXzpB8b#R7CX6&K$>&L2@1r+F
zgz!9d3IWpYw~%eSRwg3?YyHAJ^SF3F0sVC!egmeXUuvAdRnu8O!fpbO9<xrNKA7|G
zIU!r`aN2S{G@_F97OD|`p_n<clAq#MZcJiCDjL?#n#l=?VL{3~6^w_aO&k?x7kcTA
zGF5Z>W`cf>gOAno#99T}(kXhV=q)pdA2M=qnp%m01S6(e)rKH8I>ea*Ki-hqr4*x&
zdI`U`<+6<X<kp8dmGm9X;Eqefos6n<d^KWz!`VfR^OFDkX=%97d>8^vOuMe#HwA3#
z8s`VAKDK^XtT>34)+UF(wn+a!!Q{XE_T*B-x#F+2ZTuCY|7>-V|Bq|^!=^-|`~Er>
zT*#lvvtv}GE*QNhqr0w37*IilN4-`iHYx6N7rsnL{NJI-+{su_W2v8S58hk&K<KAl
zr=Czyz6I2ztnyHaXJjYp(@7L-h8V&6<1E_dN<odpgc@5$ib?5e<_NqKUOtTVWiLU3
zO`n=m7sCA-nMuVV<Vtnpw*`nHtl0gx#`Nt{YtKoMZ6s0Og~!UF0uBn0?Lp`|6SmT>
zSF4XUH^2Qr|8=Hd<(^wQfBj4GuYb}0=b4KC?|`N1Z0aOoZ)+-JZ*T4D@Q+DHD{ISR
z3!;9D#p^CVDOFK4w^(U|X|HKrsV)poRD`QQ5kSkE1Vh)*b((0}e5!YoSXs@F@I8vN
z@(w6bj|O&*wNJVCI3G_=-thDLf@t(t1Sn390Sb00b0otkp$zoIbY8;|#p($5+5_T%
zx)D7U#gr^$`=z0!;S#mqpWg+k^w-B~?28}g1?6T^+!k_OLLAOlIapaH>MFISon<>a
z#u>JvsZATsqH?A%q`f@j4J{Vxf94o^fe%<Y?e_++yuk9Yw3)4!yu|18=TI<!v1P-M
zMit3q-mqJTZchCSMaS^rFdd-6tfBmLW7x$_hYt}McdXP}Vx>Y~;p-IZp4PQ3J;GyY
z>%3S5j62F@xLWzNts|LZMw5TiX2i7EYGpCpYpq$i7awMoXdfH>B3zGTrc6*3VGz{e
z^JtI^J46yB=~AkXLW6iRg9rALy}hn40|cU>y&#&Uo#uRqEi_SWnnLL=R01O17i&`<
zVJiW#2yhSXIFPQly%O)YX{p^Y3fEP8ci004$zE71gxEJxgy_9Kq{!WNV*q-BY{$6M
zHXo@Fi>Vq0n(gogULZ$-oP$uz>k+TTVVbRXMNizXun5Zpv>{B({=_YDKhy*EPXfYp
z4&j7E)Hw;}c~Dpk1AXl{iZKIfju=Q1ReXO+9unMs7QE&}c`cJimI0sCQ~K+#0MB57
z_%eu|pup5PF5&)H2+g#WU?LGXBDF9#xLC<)f{^x$eq?kCvS-qT^WK_NN^Ngtbtp9Y
zydcQ(Z_dSA#BgUgzfhXze!ELjA*T{mx95Lz$XYnLX9fr$pyt0>l=(lKsVKnM#?{%<
z%~Z_N##GSQ*woos*3iz--1MJOKUr<e8C4bMTaSr3TZRi-B<u&+8PGThqL_{VITAea
z+%M>G5-<=bH#0oRL^=1%Gr~b!v`u%NysCSn<RjTi7XR{qOf`>&s(bp|(V<9HJ=ETn
z>>!)L{ri-i58563tM8*7{92&ZhzCa-0d>;lLTy@kt5pnfFkWoWgRp#Q-RDYWeefS;
zUwH+Ol}B+}KPr#HLQ1I|RB&U5>fz)^42=YYdq9FY)To}5;~a5D46?*R_Ujx9KnA38
zb$`WEaX1`c4l%3VDlG0=Q&@6P*3qmauQ^u{XKuJwnfr;0Kj#VPUI%&1%dC|!r=8#N
zPGH%fl})$F&9US5&NN9Y<;}N>6=~mdM}iPhD=?q0yDi@pyU#bFF)o{Nrt}IEWK5c6
zzJn2AwF>mDXB~}p7smsiJ!OEls620WS-zy_6kjV3hVh#yN>iP929^uX(5y1C9;X);
z&P!i$CAUh8UKCx{*{tQvOc>QKxJ(M3Az4hqL4jP2%_2<5QuZw0s@>CaC%b2Rk3AF}
zlrojrQb$(HHg;WOa}Yl8C0n|zJ#6^Aw`Hc;u=CT*B06!YWZ^U6imwm-2HC<?i%)3W
zV`OqRq*$3GTB`cO7XU#U*DEu5d%R<uAZA(lX@1VLK-orY2qe^^%G~li<)u6=lb_Al
z{X0+wKxqH9nH3c)cVap)U$)`trR}c3H;pr<xMMU|r{-BDIPxfscf`Hnxd2PteURdW
zhHbe&{yQq|0F=qNQ}oSbETL!W_u|ehI#1A>DfDpIfGUOBbO1wO(mK_{!Y4>8Z9!1X
zQyVEgfAV@Wd+i{tl*R~I)R{zqq&Ra1*yEbsIR|(_w~ue@6^*8wpeI+(kTX}#2rNxH
zt(&jLNMuAEH2oO>tJJltAVu9V!=pFfSbt2hn)4v}H!oJJ2?pHAQ*;-(tUh*ONkpk)
zS`Fzz+XYrdf7HRC=_!Dg#YJpD6SwvN{uj5Mng)m|o{u+*y(K_<gd3nfasUt-@Z#DY
zfdo<Q-Ya6*JP2_*5q4`9#CapsWEhs2D4hWIPw!#uM`!b9|DDLj;$3uLoV9Qp9wX0K
zvd4^@YaAu1MG^}_+seYSD)|7bl*dyJQ{t)cz9m>Eq@GHedF<XOmePF;g|AMMiJqCo
zXu3m*sOq%$AQWDHS^5036-QF%JNKPdD3Sa!%Al+T_Zxp-HK!qhuU1vfae1|jbocpJ
zfpx0)n(e#rWyp~K(-gGy3}7ym*rv5yPlfZU$z}tl+L2?poQ;{+0J~JUelSe4kpvX<
z!t0>jV0YU?*;bj@9esA2Fa<pjmv&t#rolO(GnpEG>{2OTuko-eAN_~0mv4x94|1j5
zj~F|^e2SUk)Ghc!5JTXvKr!DY_FMOS9O%v9PQtqQR;EG4(h|rSS1W%ooPg-|bZc1q
zuS3ccy$x@q0*@yI3TwMp;G-Szer=F?s1>oAi#%U`D+@Bw2&9NTyzhJh4oYSs4oYED
zo}I{#QBh`7(9h^Hh`|;~k#}}k0<Lh4KcW^qYBG5Zbkn9Fsu=k<wtLoG31KpM?;tG|
z-N!r?i+Wzb(TN(%{G{5gSwe?3nJL{@6%yj2TyD_RE!IT3>1Cf-xLu3ZQ#*y1Q6AT@
zHo1f2-zgpMk!`%VvLfUT;#?_VvIIyD`hQpj_f*3vFd~w2+k=+$^>bA`wak9n<%t$M
zfmokkA9^g{AZF4VR||0E5cENzA}i-5-r8YG4ED;Z(@rb9vR2O+E!Hx<`|V~ZAXT9^
zTR~E**uY)OTA635woEfA8=S8&{-nZ>Wm*zX2TrU7HybySv)P<E`vU}d#TGMo)#e|1
zOFI7wQ~e5I`<kPaIwu#|=@6axDsOU!;dWqu*~dT1IHXGyVOIdqsS;2lsncdLh_yJ}
z5bLoObXOo0*PutQnOz5+wQx;%Zb=-bN~^)n!7Fk_%9?M|4{=>w6Vu{MD1bnCKqY+N
zsRxZEkiz#R?r>9Ekc+rrPQa4l6O#%`aviL$Xbl{ixfxZ-$3NCXM}3zsv+Icx`&ElH
z<|FPD6t#p33)_=p=KocMNAQKH|D)kF7L0Bwu{6XhWe-Z)2f=9^!3Bcs<s0%}andBb
zo>=@}ob>iL3H@JilKMZkX~On)W|rozPKGX)_ICfoNr|@dD1wM1e>P5*1Nj2{3kry?
z2($8bnV}I>8CBuXB)o-d98!pnVm5VI@02Zx81I7de<PS?b!+EUZ49zAH!?rueqHH&
ze9X+~10CN|gi5E48L&m-M8RD<@{dgMu)nl>{GJlRj<n=4nSHk9zr9pruhR`RtaG&R
zWr81piK?D@DuoN)evdfQhAS>BHRiG{lw>WXed%Tn1P#gGR(bfHrLSS*7K=Hre|cbm
z99yux$h=V>NE!lYZkdYHaD6Gyv0sgOYVlfZ=z1}$MA^Q&PS3VoXnfNoLFxN-#k`1J
zv%<EX)4o$5HIw7vZR0U4cc`v=Qn+>PNoG#C>AeB7OxM+=P(5Zp^Wmgi?^z$(m{P1b
zw?I{TKv(lOUSxz;{CTbr6Yoqg7g<9pZ#CZ|_T5p6QNfqv7oWc26-l;eD+?1|xbpN`
zhRwY3RcYSU{KkeygPYUSx1+0NJ@3?>dOyCdjAnO*4;*EN%km}sroLlEjayOJFPV%E
z0frad=6K50Pp;w8-xs@>U58}={tg9F3cCwO9eTaWr-#x<?IH2zd;~Sf%DrUBcB7aX
zjlJOi{it*a=GdLYA;=V^Y?$?pK2D#AE0$mb4jti?L}`#zz!;^V773wf7R57wrh}G>
zdFVk~?k9eHu~wIam=&35zVE1mvQK&*b7$xC4wmkmq?49SFg4}S@32Tpb}Iq9Gwy)P
zj!NK&WugSlBzS=K_pL|_yBh)O55woawp3gZ98)1!do_gQIDvCf`VFWOB0-{5ToqhH
z9$0%J#Mn4NtmH!xf`p>K45gqF)2K74gerVOf?$ed<2+;$iGY<<Toas<dcdjG-)Dnd
z#)^-?IEV??;^r6ZzuLBm=j2YpU;NMe_ke}rKZC1(-&#u;+WkGm_$RW8R?}A2Rz>}0
zljI=88SiG1&@O5Y(pI9EAZ?;TB|!rrg(}uNC(I%X4RPKdlLWSZde_p&F+UHq|1r%m
zy_m`{8s+mMUcMtobhtcj((t@)?c;UT+}pe&_x=76%MaWYX76)4R1`pof6j0=;3`9%
zcGpK7ZU2^Mpe9G8)S16)3+@ba>|@bigrUeuCs9u^B#W;?BMGQNngEm{QEMdcr)(aU
zU|92Q4tFYbkq><!zY7vy?+Sxw1i1ccS=F-f@cf?MpYJCcdXzatk9N*n_n}RipA?}u
zUJXfyf@P7_G#j3iF&C9Kb^Y}YJ;0J>4N~*_cZ9#!_<CNm$27x}g`2f*YijdT5?!FC
zBW-iRT1XZ~v>myn30TMp4L6e1>bjT|g6)PDSM^5zs@?EhE4pnY%E&BpV}@kw6zV!k
zhw>R32R=oSwMIS`ad9Xl%tDoMk<f!y#zj}inDOa)ihnQMPsRn!(p@4MhWcq@KNCYw
z@|sfI0j4wOtp#^1iAIz)+AWuHPA!d{#e*M;uEV0gViLZHW9+PBNE7*!`NlQvWQ9G}
zL83(m=^9gH)bIvU={TRxkY5;o8lF)cc(H%spA;SelUGFQ*tQS*!!r^aTFEV&MV*;D
z`|PLnq$M{Wc>W5@DOKU2NUdlK!vNEYeMw(plDsY^s4)W7*-?yy{#8?|q9xW<N%X4-
zMtIn+R?+F#^}%3jLy57?8R>M*xU#HS^kRq|tWH{s?Zow#+_{<k_&nR`1#gY^jqb6N
z>JZtrWV}*6xH6eZxx@i6cuNEv4!9=TOMd0*@DF;i<FLHE09`cv0~EB}eP*=WgI^K!
zx5WXqD&EodU=Z@#N+7h!sTu;b#nHBQsI}A^pKKQj9>69S6V5PMoNmd_$s&M#N^0W3
zF&7ylage1Kqr7ny5>}mG^er2Ww|XN~X#j4JB>^G`YZC<{O}X{umdi}<@2AV}wCmA>
z)NMe<;edu&T&-;V*;=IOZNf-i^*U7^NwbW~jv-WQI{vsazo)4d6^c3kooP$<WW^rI
zTgVboYICLhnVArX#yHdmSEB9=>WVuA5v!&X>0vnC7s7{lI%{$_gwC`zfkW}|Jqq~X
z1IG+LlYeTYC;kX*)>7Y0Z5#sV5vi6C4!HQtF5lpdhXlW=&-SUfzY;AFgTG)5JZ3+G
zq7F?@V5Y=wtMFp=)c`AdTHuE`AOsJ;Us(9-lQ4-@>{%>S+{t2hr4`b3lNPP_V+_x;
zFjQgX$DGJxdCM`57G?o!XiL0L6F=5;{sB-n$Xq;V7CIp4LZt(2c+1!Qhxz&^rwf1o
z?c8BIj^{A1FG6$fEa&0Np|1HE?{7{FwU=*BOiwtBw^Q-Ba7af^{&&U@N0xbF1bk8M
zBTazgkEz4@WVrV+eSFP}6Z5bpFwPjopX9WL$c+(5t4(|ag$P(rkl%)H;I+HzQOA-x
zMooM!$Y_UjhL4Eu>FdHSC~M-Lwp|gaw@j2v4uRC-XQa(dF^-S><~n`WG{N{g&MOSk
z42m>zeeQqpw>PkU>9d%g*Mt7Q#<yY*h7PsAxf=)^2nhc_$2S>!^Z(u`1}A>l&nuvg
z^rntb)iMq{$fTiU!-%Sf*fWxam_Q@pLz|I(R3~NDNL%KkM*oTM3&tKA#Qy~SEQ~s7
zfk)P8jLXS!zTwP$pz{0veuv*hluwk{H3La?p#HT{My41@BcdC|Ewq{JKp+@DYY-M&
z3gM2m3O%sSJixSh0#|=7d6lMT>-8I}L3d!kwse5ceY@NzQI4&%r6gmd!WfF1BdWc0
zI4FOy8CQ1>*VVx3sIV|bY*VqLrN+5*2$9t`J73`{ryO5pNQGAStUbo?j5b~Y`+iJh
zsT+>^hf1!$CTPg8k@ts+tEV^5QOdA(b8sX^PAi2R$ugO7h>-@4Fmuw{S&-5Jin{CI
zBUe%%wQcG8k0&#1UfU3pnH(-`ex|`yrEi-bA~M)mI3@8yT0+dxUTySyg4hU(5`|&n
zLOkgE&_~eOOasGzKJDMlbqYaRr>VoOY9i|CUtjoSb@+;4y`&Vudr=0|w&!7Vw7}Fu
z7bU*4jMuj%G)ji@beeL}_V<Ps^usBq#k*aCVSK)zXY<b1P!Edy#IhdYmL<)`xP*dy
z1(d#_$x?j@?vtya*d%I*rS6%GR>`E0IA`v=!c!o5WECv4SA_@-df?JD-?)i#<3B?z
zd_q>4+Q6Vq=WFTw8=W0e<XU(gkhp<gRe`48c9RfddQ*F8@~MM*<On}tPd9P02hgOh
z3nzfJ3h9g=r$0`k1XA72HME1(q4kI*wgM-7S8;L>c7-;Iw~2CE#I+Ws0kmDI^KkQ4
zT*33K6h&C`(!pG4-J7@j&wqgb)g+BxEvZlcLP_i&KtN>w*(4PVT`UBholR|x{yWho
ztG(&}TtWInC!wWTWlLksZ6IMPgF*;gu{CTfyPrbcf(({KJtQZD-h_S;mfX<Ukgx99
zE_*}GJKyo*leiqeIV=C*^{1?5XH8c+FO2L>@Mg*@gZ&}<W-_z&&-cv59}tHhf1>ty
zqJ)!bMihRFMI}%Uz+>g8D<)mZYHCnPF%BAx%4rs16x5lz87b_IyNQNmQrQhT;Ak`2
zO!%GL)>H7|4UpfCVe$oIh`u*P%#41nVagpiGkNO`*`n!(?ME__+$y2!BOlRE+@di)
zs>b)A53QJfi=pmB?Q1i7|J*@3p%=f~qUa$f*H^pqLE~3&u<2;3!626%X`X71uuh=?
z*II6X^C~Fgj@hH&aP{!Daq_fswKTNyeHyp1vvM_b<l}bM6!d-%@l~Edb*+rk%mc1u
zsMx&~8FSLva!P$N8d7jDvGaWnFApDjFDC}qp23JF9jU8LViO%;H%?)S%@hqJBZ|#P
zInz^`&B4)8L(HH!DtB{PZ;DDEKh7|uKerYY{)Bxs-C{GvwF%jTPb~W=m3AXM=p5f{
zcyd~+V|MQ7WE?JIE4N&jt3UKz*}t;rb9i~E&#*DQp!73qTA30WS{8M8xuxy?(G~8n
zXX8_g22MNG<Wfe^QNleOMJFQmz;Y3Z>sCI<VB=Rjj;{kgui98;!1i{0*&WECZK7Ab
zIz-*kC>W0OJ}*q$)x_fsSa87UHjv2xA8<r_e3Oc)*Q=Lx=T6-CV1F90-l$PA-)MFO
zhcV`<A30xK?oj;k8qSdeOSa6$Ce0pQPP<Zv6MGzYR9_eePbxhfF!_=71UX7OFhw(E
zjsT^3s?!kpMATC&dth3kD;Om<l1>==^&Ploq2ecjJRS&J9MNqzN=EIY4<9`W4POXQ
z8Gv+D9HPc1yA_6Cxorw5WvC>KwA4H7PGS9oa%bUz%vSHf8UhT_9K&l5#EPDfzfxk2
zS-hrKiQPHF_adI9wiWJva@RW4-%+FWE;9sbZl7-+5>xpW?zO&VN9<U?f_|6n$-g!R
z&>^gnO_>f)2`xKC2jsm+Qbg_723Uyq-Jz$e%`U8F*J{+XTVB33x)-QW9;2v@$=cL0
zpp>ZAv_bc>hz&khMy2)d+`7ZN-(`eUh<K}Sy0Wngz_V@|-v>?)N2(h#{~XI~iSV-k
z=pr*j=q~4&d>aK6Co^P=40&!-Z4spnYAZ_QMjM!|*kN9DAtCfmO^gkU^&MOBY%eYi
zcVk~jwN#y(9dXts5buwVQ)BvSyK_-co+;Q_61D}JXJXsI3Qv4z8^+!<Lcrn=XiTVe
z^;Wmu*R}RpdzC9Xy#IN`>LoYnezD2cn8w9<`xRZ$_yz_YpR?OqtKg)7tx=>jeL=??
zl(;esZbE_&6h_kcJsob+V%nfo{SGiTcO0PGN=TiH><*0OIvD$@-MBJj66qi@Mp)Y5
z)@z+3W2XI)jE9dJawjB8&n5f(*?^1N)sY)uJHpE5qjz$N+<0P#4`hO6{;KMdqi=9^
zI!xRK1b%Z;0WVp@UuT}ZAL|q6l;mX-iGzP|-kpUuy{7^{UYT=F8pAj(fG-3<#4jj%
zlX_(s=7{`t_xtz3BI;HerbMy6u=c<>Qa=cPu~3i))K^Y%Vvn1FB*`yQ0x|}y)lYif
z@+|w(dDW&B#PQ+~E2x>GkOfu|x)8Vgno<2Z>>pP|ElR?W>RM=_2jUzqp&TlXO(D~f
zdmkMm&u7CgXP)y42MQ(_BkD?9d)E^1y4+6=o``#CCKQ1jQeyIiva`ag{dE}YX!tI?
zO&e)Myj5tvxq4=F>wt5zX1cf(<+@iOT>@5=qI+m1#FFd*K!Q?GhIbYS)3{DB2SQO;
zU3UZuYgU$}$bKOHbKeaM=`9Y5`}RP}z3pN>Jb(jLKI1;2Y!CR5$Hw*^0(|@CHY*D!
zJhvkh(#d6&ms!M~x09nAnW$hJ`<)B20^mU28aXKS3CFzjC&c^>PWijWXEWLnM;y}l
z+N9y*?2X0;w&#WM8_JV0H1<{m@-2M?q&};-D~yyrBcAIWiN@=6<B${~j!)W_vbDzL
z(*_MR_Gw#?qdU>=rh0!1UT<HIMV?7{p(%^_pfTr9kYCGnJ}mwdPuZeIpK9&s+Zp0(
zLpiOR=je!VJE3IX?_xeKoOP^oSYGv^0r*&QEG$gvG)If5qQupMrtMKF`7LXN977x%
zM~+{rwMHy@M0fO>d+w6Ee@Jss#K;!zOwa;r2{Jk&Te4kvj;gtePY=$#4Cq4KNoWPT
z2gNnW_2x{j)jzzpEri}#E}pPFeNs3zOkGdCYOYLh&q$U7;Htb%9wzftaP`I1a68BU
z{96f_W4mSR=iid}B_$9L!GF$`l6KB6hBh|;IBm(+g!M)}YUU^JTw9|VphoN;w-zDt
z2xZ4cgqMt4MU1;;AUHR1Pl&oCzMf7Hsn&{=TIx~Io>QxeHKJ8jl$@nlweo3s&TnpR
zUQ)BRzqsn|etF*B_@H|6Gjn6lG(p^_@BK16_R2c>lXc^*ulMz_ARcZ(=!clcH=R06
z9!(UjpAi7U0&F=vR*Id+gjahDhH#fT15WW9#ndK&B@t9-RJkY}dzUB&J&(IhBjXGP
z5|ky`eDpINX6F9k5@^Oyc5eaH1$zem7K=yTQ>utldG8H4W8eT(XWSIH;=t*xDy~E+
zqry>ViWP?b_CY8ZV=QV2IAcb-$gey%b<DXv%qt}-8#m9W=IH^(qlRYJ8KCMvbMycL
zs8j~H`lke944)TU#+4{iR3X8fe0WqpvQT>e>d(D*Zp>Yg6qoj&K6sk9fw~RuQruex
zsy@2&-6oltnpXh_z}l<65(RIV%(nnlpIiZ3?M0$(Bju^>ZS<$UzA3%6$z)IkKLIs6
zcJ}83*`B!Zhkn_-whJF#(d^Q(iB?X0bt&f{A(2%$&<Nnxkz~AbTpv>xNm69N&C1y&
z4JU+C2D?*kqU717|2)ytoF$LY!`iKUwR-E)+UBF>YuDPdP78pKwmxTLx9@1mFLzxS
zE?LTCXRWqxcM;wyX_g6|O1<cO%m~A~sIqKEHmh<5UwC~7&{&=^T1VnZ3f^0%d&dLJ
zOXCeP=5XX)mR-mm9R|zJBu}@t#0pB*@CK#)IJQwD2cH-gY+A!*;m;iR=Bu@JUB`-$
zY-6F0+U;Q34yXGH7NWKlNRnCHv8*S<6ft11#tyl7OEwyo+7vB#_CVqus#%Onnj_8<
z=40nB4p=$cS539kx}NUp`dI4MqOfSoEjr^@i;NX`5E0JeX+8UsZd^)N&Y2Qrm~}ZL
z?TL^i@S#ZIwwSOdi-ufUDj~G9$#K>V-Aa%<OoxrB$8kzC@38B`+lZ35r&Zj>i}DmP
zFHy|Aq<YxNiDXc4?imLv*1GDUl_Q)=o7~PKQ|PQ^MbpW|MV>;k1cPgZ-5*Bn$eJn9
zL2tr-6!tSn%UL~o6ov^Pih@}(plD)+%H*v#*f4h<{VV~uiL%p7QF&#)MTQVAhpNgZ
z{<As1r!u}7Ft%X&$W$M$kAkydm^c$jBxJ_9kSIox%uwBv;p$K3ux8+fEh(+$1_cq(
zz>{ILMG5Ny&l{l_qUwEB9`i%ccl&t>s^^){U$E7s1cbqr#2|xDs$%JxYBp`nQp2_W
z7M<A8?eS>c%9!Ve1TAL%j>VH0VL8Xj61*5w5<@30g6Du4$hnM@ngNf}g3Y?8+)q4U
zpRII?S+Pl7&a4e8&CZE<UfifBT`>!DCGW;2m!>B2B?!j~5nTG;A)cdBXGj|h;9~$P
zBqkd`EVE~4bew6>6_VfJFI1I<&AqtF3UzssV?wi**rrT&qd|r^^8!i>R&L{tWGT!-
zU512`NXZg%_{w^WyoSMupHU)<GGySRVO8;qEl?9C=)|Y)b%sIg*q*DB@siXy@|v0i
z>s2d*D2iJRm(bf#O4z3^t;D=1n6AP^bYpI=<53(*b@_8ib0{W*m>~~OYrER<;J>;H
zC?Qh9RoJ6)xk-0P0-EnAPNUrU&JX6w@Pw1fHIU@1COns9>{yLgOY)jan{0lfMv-f~
zXlf#|5rq^j1Vt7zC`y)GUV+~4PvD;i7(s*1<}_@v-VO*+@S}Ck2kkrS7*nnwy@^dq
zJ(~I$ZeU4U$0cH$iX@=o#7_Yub6^o&IKKxsPtE^iGci^Os-e_u<Op>#ra@zEkkn~s
zN_>qFca|4+F{0SsN=*z*tB}@pPV7|qv1~va8%-uJLW41D8#%3AX8^3+c=01;?Rq#X
z;@%TOqER73RJaNqhWcfSX<*#-V`7;DODHmEcDx>Cy!sbY6MAmevZS+g$TD)iDl59y
zMhH56@(@N&|9<`PQrGs7uuckeDw?sIyIqrs1TB7JOGDd|+{usqrN=I-^pg39#{j9`
ze0NnYnJ=oZEZ_Wj0^Y)T*GH`6ntW?j&mcV2GqE1Ls1X&1@q(F(rc679Gtc*`{!Z1N
zU-l|*WZQ+eCx-`S$@Y8Ns^2_25m#@6Qd6K+lBYg`NA&lpd7?E5P^ZhyuBv6qsNW6a
zUT<t*Zr4Fs4&X?hf_odPJ%POi_v&wQ$uD=hqjcA%f&K24pRC^<<1e?q$u~##63)5f
zFOkRyWuF9Ja6kKI_oK_xOvR#Y`pr5ny|u|{Th(TdQ%O#&_uAqYjU1(g1+C7^WEPBl
z(o%l={!GPDt7a`>*Pn{8#+5kCn2Yq`nlGiDoW7_OOJ^MP^Z7VBReQ_y7Jz$>8{gUg
zlHr!45Xo>yrrFneOq9&KANaIQz9vjNCGZnJ5;s7*ZlI=RHYwGm-Og_xo6R2(+*^<~
zBCTipz33{Za<kC!s2j3uhsiiKU%1s^Zp~Y=q^gVDDE%m+(%9hw8=XJpPW$`BdMlg*
zUCRfXW{bQFr%tuFPc0iSbUkCSIwL*E5xIaE2PK6xBgfz3EC?cM^>TiqIYxx1;w&Rs
zf^<kv4qlZu!m@p+B&4B2jao8gkSSd;F+w3E>$+-4`0T!B*$s8n!qqLB%}U@%96UO<
z+&c_k{S`Vn7j*>x*!OZ-IK7cBe)faJr-Da-U-=D+zxaOPo((E@E;Hazpc6|PGXM7p
zmdz}Ag=0t`owDyqXh(tLB4N&vbZW&X%?%QjxGLZ94CSY8axb|74IZwwWrS9xA+TY(
zliUSf#Ys~Ppg=A0)Jty<L*<)~KPh}&F&IaA*0j=XSj9J9AGusF<v7_8eH`7Bs(0K=
zK{<?{Bt>sR=BHj=`6p;P+sA=5Tgm-9fC{-qnAZatyk6Tr4AWD|p=7LG!w6YUd@voC
z4Z`a&jdU)pAE!^B%ZQDg5Q*Z>#1-x+dz}Ap1?@Y2oc}nt>{Hnn)R<R}wCp|;F1L4x
zUmWXP>$~ic@Q=`5tLk@g-huk3-0*ziI7_l0JpO|{7&o&xm+@EKyRE04)HE(Ke;2i#
zhkP;roH)!MwWFQ8C#v2VccRuDfVRL}=2?84_*ARKCFD_*x$Vo*E8I~-QhBkg?0uGB
zggO`nj^j9voS%~A+9-Fx88O)rPGf0G2VPZkqUEs5nZ~sU-(0lN9#s9+fUsJ3z7dPR
z$J#{jR&LupmR+;5+H^O`!`az^O!mdvpcvb8zXA*vzuD5FFh}^T;R??5F$}o5_oObw
z^rXVhGCg|0H>~dTu_<{wT>5@OPh89`6f9Y5EuD3MSow9Go#b2K56F@p2Q4sr%XFOt
z8N8hIORoV(HSeogA4x^aMCxsCj(Qg@T{j#k`uav32J@ul*qq#MqjH}58oPxrH6G%T
zpglCcB&NjZIXhT!5&h8Ylq=^+it`Qe&JopIBKEPv5++MMXcW)g2F2mgjtz62U#M9)
zf}{g-a!b>O>*3!W&n7$x4RGP5dzmKqRG_bOfwV*~Fb1GSSX|R`j%Oj99Y@qe>e6Dh
zmR_rO96gtd>ICY{AQm6Tg*J=X6CBKIag?hB0eB(IGaPTp7#cDGa!;N#c*2wzj!7A6
z=T6WDC(?O*hT2Rkal-ESiQ=x~!$q0sEqWg&&QiByoAqGw0H<VPcO3)MP$M}wv=fuc
zJ@u%Ct(ljCrKJ4)N7?wtcT$|ptBbs3W1-_RY0|OOHSV8dct7WhsTR^pO%l+svN(ZB
z%C+gr*;>v1oWwKN^-lv&-QkhQp<)a3IGwcJD<}wJc3*JIA<D@<KWWT6_Fm8`*0HRB
z4cMDT=s+SW>3TZp@))v+MNu#@12NN?J!+lJ#Q!v7Geb+8Yd^aeb?0iW?;~W7>8L6n
zYwoLyEJN8dt@ue>?oaH<XyuE*)G1i1jGv68$OnEV)e(_aGpvs1lL2!Ch<*{`wBC@<
zO1L7AnFPr7ZT>tXYx25v#ian;WvTNCfFA{-T2SM#r|aPnJTXMm*K){6c^nzuC#&O@
zK!@7=$QAa&ew&>hl8P>w$BHw=n<_!>%9dm|F51kOY@MwZdCnXie9n|eHt!AB!F%-0
z>G8*lKZXLA=yO&T<(Jh7HB*v)OJo72Pqgk9wC6`#KAtd^sz&%a2<#EeSXaY)1b?8W
zu7D^j%Prv*ABv5RYlP!U33MVgsV=}$fgi(Ib*gb~Gd<D~)i0tKEb!*a?2+*jBo&Z8
zWm{bdY(8?~-h!So6PWRF!7!UDPIqD7_I_lodNw**sfRdG700&|(gz}DN0s9j>T?Zr
z(b66QnzFc~d63HynR&H-i0tzCuryO;=*=~wdqDTN;rvb=H|QyalA7jn_zWEP&CrFV
zJ!yiEQ>z4|yhVNr?#z8y^qFwsJ)*r~=sO3=)zU(tKQ8FpbhFTv$!N{Wo7=!s&9mBH
z*zx0Ye0wUKl_n52R^^Xbv<h8DS`ak@V{h#CU$KPJmAo~9hI9l?6X701&Ap+PM4QZ-
zE((&l&ZAj;%(~Nx+Mu`z^i9;g>tUAr)8!RE!gs`e7Pu@|vCn=nAQM4U;^jdS4vDOb
z?i7JCSQC<-5mwy>hz0eCA`Dbj{(jm3JnXec{Fry&Eztqx7m6(bet;7Lv!Xq!v-Xu<
zQg$I5U|)c=^wl;jf6=6}eo$$_Bh2gE#}uQEmwGM@trYv=l~ZueBLzB|2%1MdOGe;~
zoF@y+*IAb1>FmFqu+%gJ0kL5p+ehS~(Vp^S?jY|4Y|Ip;)GJ3szD6#zoWFXZvCiMY
zw#qa9e1aOXtYlf6v`pUtgBF4S-HukLXthASsl{WizO9+Ix1xCp<1vD&`7L$<xo<(~
z21$zzwb9wOR0lp}WtM}(h>D0YOoIouAU71#2I$_t#rSt9Uor%NFP~XXbXnK9S|ekn
z88NTv362NK=gFGA{Dxyf<st#jA;l9459#tbge7O4cM90c+J^-rUNfz#c&Z2Q#C;?p
z{7bx=YEp06GREW6LWEC|8ibGh+&IsA2RFWiZ>!TNd!ubYt6=rUUM6>0QcpnLHx*b<
z;B>G?IuJeh`b}$~3zh2c4)J<lE(hO9u`RgQN6xOJNC!>ui+SJ2zzhIA{RMC7iR7dA
z3ftAotyhko!#rg#C>{9eAH*;&b9@g3cqK<|(Y*>_E_d8kxOorT9`o{=Ddjfo8tSUh
zgWcYcWne3p`wi?v_O|QK&QmxN4%4{heht}RjK_u2!8yRAvNL}*w}3T7d9iKWa_iV9
zJgCbakZqF8Tm*Qg6&mBtaf{ZUNEI9vm{tx2gm>)^%L}zbG)X9oW}H0B9~-s++><W7
zO_0^(Bc>h3gmyS|y?|8V*>0%2Pei9Mo?L++j=$ZY(F(T^E_Prew?bu4e7%N^M0{xX
zeOZ^Ai2J<|PgV$f>;+|R#0Po8C;(8;zL-sT10N`LkA|P{ATc9AgYH0GI|tI<8}JU#
z1lYau^!?{6h94f`dJrSLERlM^s9(D&dFp4Zfc6x(d4$u@+Xj>5l{4{EZkyh()sW{<
z%^5$avWSz?*`JTfKi5T1JqAMDa&*j!*{5w^kymro0B1-YmyYuv<=yQC42$x6U62$z
zUbD^&KRtulVhexIFlInB$wFF*1X}(GX0cBuo7HyHI2sG~$e0O?Q>tt4>W>Mv;)!z2
zQEjBEhtATo8>n<zCfc?3?`rsEpnZ?Cc@?kGw-_ue#BukB2<{PCqdUp~08ZwGMtR9f
z@|kLhw1}FY;;##B)-Br`w2Fd=moUq#;Y{`g^8+zH)qJWs%hxuOTHfwsp>tbwmqf76
zJ&wzy_rfJ^iS%qO>CtBY$SH)-jmshSve0O*NQtjtwm8>F;Ou80D&%12Mo2XLEE;H%
z05IaClsePtPXg)P94>(a+}+ZE@p{k^dyJCKq6Pb2@UM{{f`zy)oCbogn$OJsIslX$
z_C6{0=vAVf{?iQ>Xiv!eH=a`sXxf?lmpH~9$l{&AWqb;`KR{A`0(M`-7Cu2-7x;o_
z#43n>(`5M`t5!ROJN+%(byMFzDoKZKrq&(led4w`o&zd=+aaG9A_y*lVm<p0;1hb0
zwYC_3%J1$TE^E({BT}YciptI@DF$m5*rvbOWhiKxsw4A4#{9uDI2A=L6+?IQ6a27O
zc&?=|{YE+3+#xvkGyMfrpot`%w+yU3h)nU^)7?5%?{0%&pd|Ch<Yb{LEb;SkCht0I
zHH;IFC;1-6#^O6)Y0w-c%aD07i}I1)G6d$!dYueLBx#DJv(^7q|7>T0P${r<ay)hL
zP)^I0jH9Ujl|S#|bf`yJ`;#4WR8uEY4ur4s(?S0Vtew6xd1emA<va6xBs%707xV0s
z{!4#-@}~i=B&%;4)>GX{95rdF#hp3jo8Z{m)K^_&W9G-%&49b}E$8&%`81C^8~)97
zr_&~M6@zn5CgW=MGjx=o2My1|Y9yDyy&c|GpJ*AZLsi4c+@F8re&2X%rQZDIeJuUu
zef(cIO+xneF3v80iA}PGmUhZ6hE6X3L;BEkUr<B*Mx96@7C|=$hLnIK9Go^%ma>$z
zfN6sU%Mvh#V$DY#>Tv^WNE&A%*}~{}LAYH{?McDNOi}iHU-z5i7vffLK(=?t$Z}3y
z>rLk-{`2+uVh*I&C(k4V&>l9Nl-7uI5F93;8`l^l#Y&CepGbhiPchZ$Q|;+O8H6b<
z3Tz|W>j<L6+R{jN5FYLvm1t{+{L)BtpbmR!Yv1tp$fb7=P%y0`rY6JyI~eJT5~h$?
zMMUH%#LD0$|BVq{4TG3y76W}MX9=NAhq03GDyzE^jx3d~sj9C^8@*#KGPgY|1!6?G
zKt%$RlChw<|Et)}j)~fFo8>A&HkDMBdA`MJZ88IGm;SEMzi_U3QTM4QV^*~=PGTd)
z4Ao3G!i)@^C3}kNu1xJ0&to$ZIzcBLeTHa6aiyZBK<Pwxkrt}YGK)=%DY<L2id4E)
z3=-p|73QRzj=tnleVbE!ftv(~=Y=;n$#up<YFfA9F&Nwuv<6LWV^y|;2MOnDTHBQ@
zy~o#-*^JDj<HUouW{ahDiDE*YBISKXymYxKac3V5<fKCrrTo<BP}i}Fcym>ui9vO6
zEps4de}Vsx=pRn&G=E#|S_E&P(M{7*a0DoVGZUbE=*4jXOYw^L>24<GQB(BC8Bnbb
zLc-AW-~a<Rp(Q!$_kr3VF?fnOwpuxMhj94zwLfT}+8hW+<do(Zu$s#EiN9(H%+S4!
zzw1^61<9j&N6eJP=wT;xXc~1v!SIcgVK~w9FG6>;Ob>hr^`*W_^$B~+`fs(Bbhnip
zptMp@rv%xfdPm-zqFs9GQT}XEGvQ7~Wyocj@T4<Ja}z0jF=!0y?jxdW2{UJQI@^>I
zVdim?D`c{`FtsCO;#0$prGCZZzn%3(W%%azipel%uj>f=Z1M03))SCtQQLuxY>Xz=
zsgf+wB2gycoK*q4L3+eU%igA2t6E)k%n3GwFV#)=QEg5W93VV~hn!h}ZF&tVqke6M
zk1St|^=dSY{CR)<1#hQIh0rs2X_DE_fa(+8DVIIn+{b`!n=M5PWIfxZ>DUrItraPE
zX^LX{ClbIi#d^@=5xaeR=E-hH%+gjKZ&XcE;hypm>OWV)xd2g>i0E08HA8O7vdm;d
z0@7P`551)kl1;h2AVZv8V5KY^H}uPmvPV+jp+r<jR$$|>5q=hT#x}Zk-u#WhC-*HE
z0VLO>39nc?!0ngY9}%>EV=fnisAYfQ%~<0msv4kSq~dHmCNhZ#YJPIg@aNA#6*Sxl
z`MrrSKY_{D66#xZL<#<1DuQ(p(^z-Vhjki#IdzyyRIA(v2p___BwN{cPx<7!f;Tb*
zIEZ1$<F90A+wR0P-@)JFIydZaP=HIYnL_RmIjzvq4`2`{#KgxV{%}K`-%x5ueYPMI
zVFQJ|r(znBIk{wvM+D=>*p5QTzj396vut9C!Vey`#Yn8lPyeV2P1)uQT9dd|q`;=W
zaNTVaL`Wnpm<0C_G$*Nz8T&s^$TOy;!(CMx`GM~hmzz8HDDV3NPR*la;KRrP5LB2j
zxMjP$#9;m3`uGw3^nbn|P(zvW4e1f&8I(j1XR`a@60~#tp@1{UBu37>BM2PJoDbOo
z@UjRQd|i-UWD8vLQdxHTH9=P8lljHT<3n2$6DH({Ub#7LUM2sX4N5*rA36*L1Qh$X
zEJ5*~OA`NNgNg!7ja~oy%d=$la4(d<1^jAS&HDz-I7S0wWMGIO660%!;6=8Qwx@h8
zw#Aa@#+2n}WKC){>fe_0K}}P0olTa)p1Do38)@h?*zEb_O=mtkEBy1d%=Q?Tr1VL?
z-=Eu=><_-qUFjZ`E8h?Il|XL0JHR~Hzl{aEbj9HD5O$%le6vys_awJH#DQ+$_H}`I
zNDnM|hzs#%#x(*SfV;GZnX+oh$6ju4_3-{u#&>20Ak#kj2>1pcz_;HRYWa`{oq7C{
zLSw=2cxEutzd&mF@CL~N-y{gRF#8KUej%YV5V!3Fd@~T<zlM4#j4^r!$@KP@QazrM
z33|qldq+X^VRtWhdPgtKL0?0nx&h&9&P;R%nQ-s4Sn3X{!#oj!I*GI1MeLkBiyN#=
zo7@}>d`ye%Ihfcok8tp@QczFXN;74+SghPj@l7(k+^!1!^LE6Ut&3HzI#Z}D(6nek
zy4hoR7(%4XbDZ9jLpsWRGI$p_JMHE-0H-4T{`30nL4Xs$p{x{pZm2vU(YYjkK}LGz
z9$9Uz1cQcmA)ewY@eSUzywEe`(!P$=wJ^{!p-dWUP0~lIf0=I}>pYEV$wlmf!@7c#
zYsIlYr!!clPla}CbUuGra)5-lv?<9|gx!*5QWLt9IC<Ay=#sOv7{(>)xA&G<295S|
zsd@9S{>dP-AC)LJ)@3si<>?0%<;+($4LdP<5tM6tKx7p-)!aqqt`~Jdw5n<zp;i};
z(8##fPNae}?MW%lJkOd7T;Ls7*E(9s%*|O=R^pF5r1K)b1jS@@`|n59v<1}~xx_*|
z-$3rg`ec%8OD5x`Ar3)b*^Uaz%PoN|qtdXr;usfQ`ja69d8NZE%b7{}N6)rxY7Evk
zAVC4?AiTwzb_1hS>*Z}m(DkE#5)pu9U*+VoqOx>!#PlS(b=1<M$ZIDUXd2|Fo+>Zn
zt+X;I?M6#8ln>1dLw_&{wGxsxZA<0{C8OZIwo(GgE1z1~)Ef`Oy>$ikpXh+9_8pHJ
z9kh6^RdO_Qa_2FP^Tj&5M<y+kEeRc~#jg9QOBm-U2r6^y<|W7}b4E$t=GGHtQslxf
zoUc51Bv5lxlZ)Q3leRWgAhs~}1i}C5G#LeVkCqBk8QU=F6t<&wX9bs}iL<ILFxz$q
zV5;51=oNqKxB<%Injf*MRSc2$V`TT30Dy!jX#2IK9b~zmB4+T^RoR8}YhtX*!`NB7
zA*jDy!FPsUH1=M~uQpAeC;*__WxEu5wY!*}Xgq_*F-9_d2)DxXiEhbOsTnJ%pHS?m
zhXUVQCbDSA&`TL=x5g>2(9D^elZQ=G_Hqpjg}baj3-fkMX-aqsP7+*@GOG8?C%-(v
z2Oz$|nSIBi#A5j*1uxlP(wm@A*-LLVW79H*qr%SEVis#rqZ(^_&31QoTVZ@hDt7`C
z>@_<Ie9TsN7hudB-_?3Jx)Zh~-QU}|@G4&e1Nislfj>3-^f~b7F=2OWVZK9pA#V}D
z{|xq$xctC0jKA1x>|n+9)yQnV;muu8dM~Oe9`IaV$kfIXqO4!GRd!;tE<e%9x1?b`
z6kNF$n^`F@*e}0X5(8ABw5MVmYKTIt7mx_v>_u65v;w&=G$}84X0mv&GAQ-Z=zrN&
zg{kmq(ky8_bvOtq`iSwUvL1H_RT6SMp--%LT347zQ_59++G;XoV=p+jaB<#{*~GwK
zJJ=9;p44#h*kYT%p@@p)=NKfETSou<Q1Zn)H72lL>#lx;SNMjqrV1y&@|K<h?hxxW
z4SUp6{4yP~C&a+?z`FB38&U-@KrtsXt}di(^u`~0L<G^^eGw&`+3|y;dmJx8bZ@IP
zP}@W2Zt(OHRBVoTzTfH#@jIN)MGXM_%T|z71FuBfJ5HBG+}lr^Mcg}2y~6nR3)m62
z4hq-_2fNdk3GHT#N<w5Gl;*cWeG_m9Dt@{)fn;D1MAPM&v0zuw_O}B4u|RSa1v>`Y
zB#3U=H6yW5xfBK@`u`<OLEj33fzjh-i{FA*X$pK<NIZ83kQO%29kNo0(sWOc7wB<e
zD@YqBF&J5hc1o*nI)Z-Et#=d&lbjT0w_6~=2en4srsxkvSbS0m&8@1k43CCIwjoC9
z4~(Cp?W4}I#Ht!$X-zHgEThix#G-rIS9h;aJuk0$y{vk@C>iuWXxQ7^)v>d~^s#x_
zCw8}LUfQ+?r2y}Jscn2<dhO_mJiePY@JF58@({)B=xWFvxZRr(f4y(~N?w(m+Y(js
zI;DC+KH=-Q_5m<I8$&=k;6a{!8VYd)MYiG7&oz^a9D0k?_Cv))N=)y8W&hG}{3NO0
zA1uq~_pG)&)Rtao$IjTG5UA&i(E21R1uGsvW0@|@c56}8nk+P?Q|qaY3-e|Fa^eN~
zMqL%)T8&U;ODWul^>ReEC)~0p9T$HH9K@$TlZ)UD`yC>*aZ-Okc4%SYg~TmSW3W=D
zaZP6=@0#(LI1kK{Fz%F5<(`zHI`(P0U*?%LT|ah#Ugw^q(_PDto;$+#zT*dd4>WV-
z!p)jA2X8^tM|NLaUepq71q7xhKW9t8N*G~)GF5#Dn~8{SR!wbs&V^)oUg45UMFw@0
zqDlE)`m$M`p3TyDC&=yhLuF-Cm<}>9CJ>oLhU<ho>%o^#-v==6x~k8`6KqLNhQ+i#
zlZw^ajL)-c9m~3)ir=Awb`wgOf>o6VW-_?-T&@%loOh5ki%c{YCGiV!%<Qa6#_T65
zsy-!9*6X9{A&0}LWUm1W*<0Coh0kdFJe9^gW)LM89`O-wQDKmZHSth)9L<U-t=N9D
zXeIV9O$P>g#3PI$L1?Mux&!~(HFr?gsh;*%_}2sH3%UY6>_YGC#PN4FM0AH3@7&@9
z-yowq3XfaNWd-z>edvAuvj}7Dv6PksTH6@fF0Q~vq8QqsSO2hO8%j@Tt3aA1s*b5I
z-_nh!_cnli^JWDH&sBtlwWNDxp*E41=C|!1@PDN;wuT#A6#V^R0~O|9`OjGBA72pv
z6A}H_PV%2b4Gl<dlohN${Bb__Z#;4EVnKvZyWnb=l3}tExEua`pj}~v(42<@=<zOM
zT#Ok@@h&8`>+|VNvhE8m2~Ejc9MESnnb$5i-Sgcquf3g(G}57Wwfwth+b=y|J~tmd
zBZ+@JUKxQh2hq{E9a<x%0O2}%RH><y9EAlE0g<;(;I+30$-Z4u*Lv0atZgH)USELf
zfR*yHI1MyFH&2)R(9c^jaC;@iEB~D;Bl2w`j~-Pz`^1S2)y-IU3V=W#_ZJ`)tXq2s
zrc1ofOSNkFLxpBU6C9yJgSve)HWamMCl;ZsYzR`-gn_V^?C74bo#%2S2|u>%_CT@S
zPo|F(E%so5iZ39x;uVvxW*-G0)JKlyEj7f(Q@+3O8ik*m%#!<X@Bq_8z~4)Oko&(F
zd&lU?+HGAs6<Za}*s9o0#kN_oZ6_7mwr#s&+qNrCD#n@bUTdH8?zPtUwf$qXHh+vZ
z+L&!T=>2}~e)af}AMugdxBKJqvubZo<^DAiT9?V=%kQm1A3pstw&hP4-Bml>K3;05
zzH)<)H(+gV@`EwghUomga_Dc;gCIV1@(mR=O<fiH*LuEU+q;`xn|L9fj|ff=576N4
z(WeymcG7Z@!LL<DER1W!@=GS<ipklv!T0KG$k6DqEw1p5E-ucErq9Z4l&?_S+>rG%
zhYh(9!h`DtVWmw%dipx=v3@m^xOt7?)n<Js62mcAqhH>|Ct@YjQFz%3DGD5}K)sjL
zS;%U;$EBl##S&h`C!lkr&-V94nL5X}@a<eSJy-+^yzD<<Y09{j&FX1&<f7w$Bn{X3
zojGh3P(X~~MV11#08s!QS^~Lrp2mDpNkQ<$LUYXvg*}Xz-=m4WF|2JKq6V{e8GxAI
zVJPP3d^jPIlEfx^-~b7KsXLe#xe^+ZZu)Q3Ap+|x0C&oxR&?Vx9^o|yQHPUI-Lx@7
zDNN3XqAD{Q9<US_u1?6Za~oz^?g+!9lTzge;u=b))sVspJ0iT2NbxnMuwP4XpFLJI
zrw`FeD28j9)ZRv<+fbktXC`8X53-P|&I26SH4{QL(=ms{Y8l#qBxeXS|4vnoo<RK|
zs8_C6ISQJ0WmWyXCqrqi=PVfjrb_!9I<pa}5}W9s#>mbJw>|;8OE47)Y%1ogNUSQV
zJuDAxJ$u!bsR6e&haS?!=)!`!I6e{s;o&Np^hrLo@kwV)*#ywLnsm%rZO*)hbrX(9
zV~O4%>v&LB?TFtjk$b8LEjuO%!*<LSvq5z6!9RA)+o`v+BC$VJxC(LR2R1l{3TLjR
z-Xwc#Sl=LjkxkkE%-=sP709uE=C95T-rjx0{_x|ceo6@D-=~)@PlIdHl8bWwy^sA7
z{>%J{`y-Dih?_NYh?!NrRjQYt^$qS5L;YyCTUH~*kWrT-rr+hxh}h(er1Hzus070F
z;Kf|TXWB)xdAN5w>r%QTz+QEsaNw05vmK-fe?+aJxQNEa$m@l6lT8)6&aW&v1D|C%
z&nlfNBK|^9<cURrG@Lb$A-_*<Q5eR?6wsEuD_f0DIZ1|6PMPF{JwE7V(MdeUqCiKD
zrcf3pLYx~)Eu$PU7_OclhFzB^o3Y<Lx6S-Kmm;e^+ZxB4XaSC1C;b&u!rNQSyqG*W
z0v(il?OwRAQIG_36UCG`keHD-3A@BpNNmz*M1_4|3WY13Wj_x(V*`cPIM8Cb$Rfj}
z$owkKP;_8!K(bC!65iaP2@Ml|o!#AVu5GNrt5H;YV&);02#4$-Kd`t0Tt%Ehl(J~8
zqR`TyO1&iPPrm97)2*GQ45dD1hP=f_sBnyERGd7EJ^qJGc<H<_Z?&QO10{W=c19Zc
zrWKOR>p;>nX_U3RZ~-}6XjEskzg2&FD|pK{gM?0kmN}SXTJm_01}mhxRCfmkdqe-_
zT-SE<%BqSSxqVtT9dG(aT%;qtS#BM%V@jzmy1O|>-o<oWnc=8FXQIV=uS01&7Or&J
zTZ5`^lpR4sBgtw;a(H)5Lyj~fL=6%6TC=74hc1If^LQ0@^70#;qC02qEaA9xm65c6
z+&wvki>g#L{(w3^x3aiQ28qE?k9W8c{%YV}w6N?IXQ){PT2$TNt7d+02_5Hqtp@7w
zQyA71Gw3|=%9$>@Y55tfsLtFA=|1mL^__BOo9cS^COg(0n<ZcQLn0+Vd%LhJk&zGQ
zP#^6CnfCO-*E_1o-EMI*(vMymH?UOV>mY_`&SAxzI#5a!yVX|N=<45NuUj08N#1=k
z$+fPx=U|)Tim38K&)sy|qO~lx)e5hZ60Mrw^}-F;;bafqhk71!2&U(ofo+}2jNhKS
z%c@I`Q&My3o|GMtb-b`h%ZAzDm5K+_Brx>GG~CRq8z6_`k0hS^8oCn33+G|9e2pe*
zxABK=8u1H$VI0SE(>4};5Tdvp?sM(C1&J{ry3e>lIMhK^d54^X*AHdd{XvI6{G;o1
z3|R1<nrUvFy3>~YmPOT7@_fL{f3-TM=6-ERO3bLl782a%=;T6p+o2_ZZfdu(S<IbP
zvW}H-kzM{H)U_G2I){KfN7pI!H3w6-;JjMnYK3mTlaY6dV*#&{pwGf;2oZ!2oG}m#
zH@Ifk=8I%2!PIKS2EoK?ioGwT=?__0A_4~O8VXW)PIWL5gs;d*Ym^~v80$Srtv@S{
z2)_@bd?XY4qZq`gXXdpk_TlFY_*V}}(3~Ib{Z12{y#^1@@D}(1IrcNR=0xEs1QSy7
zCB*wn6Mw)Qd?Uav4Ln8a`X`lgY<+zjr8=oOCWJQv06aZ{LSeBI99=M?L|!Iw5I{4U
zOFoiNH2IP1yHD!x&`{ZC)K5xhp&DS(kCu!CB~@JOZ>e`kswzXs613Pa@Cm*oy|YJE
zNmk+vsLZMJL;}@bo}K({Zce+Y5`)d62Z3FOj#G;xvm#fb6CiUxiGdZE-Dlj2ux<yH
zenV_E4A2g9G;8u^zkCXD6T8^q?K9oSde`uW5q>5EyG165HB=YpMA{J@2yG%D-xHrX
zX1|V+pc_1}gC33x6x67~<s059X{_?fEE>Il|HJh&A##{XEBZV8uV)X(eq5p&h_|XD
ziV}J54dl{{@9(51TiBQjsbJ~$;+*JUKtBm$yHSbt0%{1lO+ISvujp0LvRkrq*v^H?
z3dMR$r;qH(@#?9}bLysd(E3)g@%+WXiaPWuJ+Mz}cov90fHu=lndkF%$CX8+)tjWt
z`i_|D1dpq-z9aZ%qgvJgDdtwIt9Q!Z>3z++LonL*(M;)Jv;eDLm{Md6c12eT=UBQc
zGyGu{<kyjo)l5}iTVE<^E8@G`HWrP@j6vQ55m31NEZ~`(5gEd&cQ1HT|LC#`x!`1r
zyhxHyHr(L$z2B;wpS`dMsSj)uonf1e=X%@rf2C~rb845kGP<z2xF{~;!VbyByfWXV
zk8M~purkwMP#tBOafomR`!aRWH0|Lw={X(uO5HfqJ2z_mKyQbh@GE26^Zdtf_T)Xq
z6Ho#iR|m036|YDQw@jOgy0=c%?e<r&)nB{R@4Gavm&C!L%!^Cj5?D8mvKYL(_UcnZ
zc>yJ_BQ&Any%yvarP?@M>zbC;d8s3kkMHgFl)oVT#{SBDlE9ZE{3(5qb>2ux6lE;^
znFg<J{sU)pvrmWa(VFh@mI^-B96%<m$G{(BGq$UE>44H{f%<#!U(ZWcr%>E-fkiuw
zz@i=E{~YQ5(}?`vxUDQTOIMsl^vz{#jc^_bpnR?n0?t7AZAB6uhE!JYE4QBjBa!Uh
zkc`&Q9AOM|wt^T5MIKUaXCKK7Xi=&w0kWACj%FoCAwrBxRrR9JxtI@xZ>}*xl+k$o
z9{C?lzQ--*<Lrhj&R4$s=}#{Q{2tLaZ$P`f`hY92qG8}sn1`@0G!M!U#mF#}81pAU
z2;Pv%P2S^~a;T_Dn3-rV6k2P*2)@8B-_BS*w)e5%dY~OEAST|dc+C!Ncwna$p1`6X
z>AIio4VoY0#ttne^ko*y$A8$sO?xkLFN`ufa*ygX8~LVj!k1jMaa#0R8=Qi~O*hYb
ztd`rF-EyTsbys$r4PDiUJd%pUy3HK$NYxl7Ge!LZmRw?|VSS)sNVe^e1(warKFauh
z|I<4lvr%%QzWOdViQYYUh04iTn?7gCQ*?@LUW~Uuo}uereCA;}!@(z?apJmlw!{3+
z&RmfQAG`s9A_u?tXTouys_zE1i;et=8HVu;)l0B-#3tK#-5VZk3`Gi)c50wW!I~z$
zheCvcE1vSq%O-9^H<Kafk-WLX#Qg(~p<;-e=$OOIH4Q*5DZNth3+zkoK7+qCS_C=k
zGEH6TRFrm$s40!IXMIIoH=}PogW9{iZ1{$OGqpB87SpSX#|(QL?DE$;iGFSakDt#D
z!z_-2Umi;hJ49s#qEOSWFqn=K%@gQ_mvoQG`~6`trk%Zm7U9&~I_0$v+k>grF$A}W
zC|wA~(;-GJ8T~P#o13d8eXeja7#dK`S8J18;eQ>>{+=3ybhaN^v>LsW9+rD#Rst>5
zSkZ4eFrL)A@nHSMYcPa*=~CaUWu*U@`q4V>xKqOA6O8F>)vJn!Q>!3W6RKrb5iPS)
zxzDyyU4TSCtL9CKM{n5DmlPGas#1TRd3yT9sXKcE*E#0#r&Y{Jdb|~>=F|<(_QXwT
zKr7!9=ZZ4W6E^tx_ft`+Z_p2B%_;+@c3GZxa(`Fn&Jd-)SR*KJs>4^;o_GX%NL(MG
z^C&>5h}@GSIKl5!6n^9LV|@m_wPJc%aUAl6Khg7>fC*7M)nN(_%-$bPZ|KKqZD3PE
zs(FOXq&-~QMY|<W(!<A3g2USbhki8ehE(_oGEuC`>J3IHFb+OrxaMfp-FCSClODyp
z8DIz5eaXd8BJ;G}X0}1`^}{L0GQKrLwV->#9KchLNzt__0+YS<U7s^qHcnQIvhvQI
zfzm5T>Y(2Vld@Gq`z4dqhzpWxKgSU^EYQI+zlAv-tIsw`b+;{F52s;~WUxl?n6h6N
zPHNx6tQi6B+AJnv(k7k>amd8)&X@gJx)hmg_<oEI`Jbz_yeY0qY0m(Z3_GOH&?nFA
z?eHCHzHhml#zI-*)L(&e>wSbq9UZk>CLpNI`bWZ6Q%Z>CU%0xHuwM&M>jZd@e+F+d
zxZmV;8{`GoRh<>}Ch)B;zA=T-FFANd;tUeqVd<F37M1mOs_41=fR(PkDUR6a{IUsk
zmW}J&a`@IST0<}`v`#v6`3u_Y&qP})f+k$82I&3!wr#S9T8oYY_8~l6^Z?OaX=!aV
z(kMQk(43jIZAu4%-ny2xd%udNu0vAtqju4u$jGr%=%@F}(CYf?dIW~>%2ui-KUh+`
zJ0xw{B_L1{#u`$S8YNqRBgrgF!14^9m|(UZf}2u{lOWOysz~>AJJdFx;Fe=gM(~@5
z?F~vX*@D(FGH>Dw7OgQ2cgRW}vl*PI2Vi{v8|9d~dvFZ8g^+P&`cV2G<AIX8bXc;n
zoqpqn);A{x<_~P*H7c{b3%vPM^|?=U$B&Tqadlo|K2v++MFt;qex;(MxLg&08r1eL
zqV~&%6X-l{yJnNZU=xgG_?vmnpejv4ZaCfY`4ze@OLRUVC(Bl%A?L_AXvZ&K5-nnd
z-7uD8GGDGrRDQ9X(CkBo4Sg<Ys2b;GWPp~^{w#1~!V1QISH(j%QPcTo?ZHX?Ri#PR
z$QFU-*y%%>msMRWSk4u`nAjyAFQhe+58vjP+66U|`PFDr;`T^L^?|4A^Jmr*yUXsk
z`w9+7WvFc=OZ${|yZ{T($I|_g(u9=)-QHM_ES|5$=leCeU(Yusii0^Ec`ps<Bk4!e
zIvAm4S``l!6lHeteN;FqU3PU1%=J5c^^t;+^N&?pV}7uDAYx&8b>#RwDikO%Z*(X4
zJVI$7=qjLR2P+wGczM7Ohg5(ZZOG%7t`H1}7rkR3s&q%~txJPEImU5gC;h7Vm!eb)
zLLe#P3kZlR7zhZ*f8O8zM^P%Nw5_4Om9RO`AYg9b{Qqz#Ns3xhI6y4il*#6zQ-ys~
z^O{zpd#L5_wLL8<0aS3J#vlv=FG}fnBH8v;ganz0Psv{S>pcD*0u>(S;JH#{uaz{%
zS31X)@n4v}Af1C1oD+Ig&`5GJ_Y=6&-ktXf<WJVDBQeT34BIE+ImD_Ooi(V>J{#rV
zWUg-wSxe86*|5_t2Y^tZut;C?*()hLUzF#YEj>cdNnwj2cLL?|+nB(vv-=x~*-@*z
z*qx>NW>Oj!Womu|Pnoh`Fp#KyqD!cwc{5`N`}vlUs2J8YQx8oRh>l4`fjfjUMb%{f
zMeatf<xOL>s6JXNanGM*9odS`cSo1uJi}V70E!<Cc{ZcJNi&gG*;+wFc%YH>czbY7
zz@Ae7)Cst``o^3OX-WvMh4Hg@)F*v~RcRQzWnrtl%h|o*SNd+oV+XWnelIhkSwpl%
zMS9LWKIg`5^`aNkB9Xtxk-hf_6udV9e~kQ%h(QyQrZBN!ynsYQBoOw^*u;<q<2fKI
zGTD%%z@`yj-?$R}PR46m_?R;DgXGalL91`aLr+@V&5L5C3x=-^?0hGTS8bK{>0%%Y
z^9{8f^nYr4@rIH(0O0wi6cPvs(SIHZ{}X>0q!#9jW(x2zY3N|)hUdgURi}(CMzFdh
zhK+ArAdPidXX&MZ(UG^W=U%1RoUk%Afl;>ZD*t2Cgs)Pli>?)u+-yZTv!|lWqgkb@
z^@jO|xp17Zd5)qwLH`{6_`0?4nRD!UJf7s6;|tN_@}^{L7*q?!IlDoRt!2DVX{T~v
zFFlkG3o)#c*#kz+7l;&bL}D-<K#kugX6z+BG_1n1|CKuZS^^zuU&-Kk9u{BW2H>U2
zlB0Cv?j<mYc|$hKgPngdjOL{=sCL~NSwsDl9zOZx0kSnM+~IFq>IS;4d_$Y5T&pDA
zO&ghs8m|PKt$d9Kv8{5=3$d+s4F(}M`ji(w{}dNlV$4IbKa5H!5Rq1_A7kP?%!mtv
zck?yclIFanDpS7$(7$`~6t>&RZJTOCUe=LJn`i&IaDb=ux_3iT;3_M(K`Rh0q0VcO
z7G05X38WU{AP`H!REQQ24?W1>g$*NK6qso>1nMnGmLO=Za@ee%{%ou&sUPaeuR1=l
z*W1v-jh`8CSLK*cKML&D6Nio=Sd2LZ)7X?o8qnc3EN-LKZn7S##dC48w;Y;i^(2iH
zuG!z$bX=BfHz9ozt3umkk1~}uB>u%<xdL^+T8SB(w9vrZo`rH3KXWx@nmR1=2luK8
zW3sZS1nUt&Vmx!a@UFRzsdozoJHM|Xo|;O01(g=k6#KI0Ubzy@Vh9^++z5eQT0^eL
zsz2{)Xst?^$e6=sh-THMaxp3Qk~^El!C*G-<}1wPxQ$`4<w|k3F^@ZUN8dFEE6!cC
zK2k{(>dC~Lm5+_A-*0Z7zSxPkzC@xv+p$$uO<{J6!ypC4BRb8d+v>n(2c86X_7vAN
z51}8q&isx8Zp+JVWaH8#RQ`vEKZ1W(8Na7$RN<3zjC!fMMx7o~l2t~zEEdE``i<Qy
z3<d-GrD3XTsAVOkXp@Ry*J(<`XJQYP;X*DBc%lZYI<r`W%iYD20W<XHW-Af)2rc`(
z*ujkX`pPV>hM8emuAADvvhqUU^!p{)K;jtLc^hJt&Bv#!TC11r5CCC%9|Ayc!4csf
zOqMy%5CsFEH|L0fJ2-Zb7329HrOe7UP?#>bDAm_1GTTYBkB*RX?TA2ieNxULmJ{M1
z`NQmq%%^B~*-d507~xm1t?`>|Kl+<)KY=g<K@UONYvfLN)^wYw<WLSvXYevvB~?GK
z26=Vhhy%tNrgKS`WZe&8A=a`VLpiK(5Vj*v6~VuDWe|Lae`9|Tp<ecG_*R0qtEMOQ
zSW(MjQlqXqyvQIqB^6-TUG{d@%>z!H)(WzwVjtI4SPu{?<n0_DC{JnjX%TGqsnKh|
z81%~;uq$Y6+wr-Z=}V^Ww36D(&BEagxaNYj_GV#Vv<jT54ZAEC6k4`aiLYT*w4S+Y
zo+?YDcQ09w?!A&RoefobD^`zJXUd<4J<0kOtuLvjGE!{ai$)+YFQtsFhQC#XBqJnB
z76$rR)-@|rsaj}D-LGllge}!*B+W>^bdE~rYfx#TvQ^qCD9x;$)zqdkvMUX}yJOtK
z(ygEED1PEBjex7Dh{60WXHwQ;TV6nEz*yJCLlQ=caT>Isbkyr^ZRAR8fdC!9Ta(mE
zoO?Tq{92(sb#~U3GrI&+ASwOH$ylJuD+;UkaeSN&kF1nHXIrL<pS66^Dqfk!Vj<3Z
zet|*YEZWeFzX5MLJJouSG0`|+K<o$EZ9^$%LOWdArJ)-eX)slf>4dNEnni+(|3d@o
zY?FCo<Z<7ndvhxcgiVhfk`sTgV<tq4^H-HcH<bR3_bvwwAEPe+*`F_$s}bH-!yJxn
z%hNvIkEn&0*$vmukJ%zZuG<<<RIr&hm7BdTVE$I@_KzlkwGdHe!`PyYh<L3D-!?_K
zLwD(}s@k{i=-o+Beoo_rVPSI|4OgS}VjUYSui0JW9*moHf{+o>5;-AS40@8de#!E3
zuq|3HJy!U3mc%333iWk^)=Ji~Wo3IotEU{aF<_IoOG>?KP8(_RkHf}snk9XCBGOEt
z#QCE(%WhX{zDcGbKN%E9wyq2LdjyrvWKzXkAPd$BRjxgQ+ZUNII5XK9%W>4cuW@=`
zEFnciml4NMd|O$GF=sGtFl%iXX6mb+^O;HmUCQFV3sdQN8<>tfl9EpoDfR?Y%)Ich
z1=~{U%|lqp2DZ@Ty(?y{VSA`=7d4kz+V2aV+$fn{_@H!O%Rp>+&3wh~Sm+L&o57~e
zy}S3#eo$?}sHH`1g(pL$BwTX^Y<fdDWev#$XudmZREjl9nYt~2$leBleCXW27!VT>
z;tcpo^D!~|x$2|47?8NceZ3-=>}X>enMH21!-?DO58R3dch5`s`WT0R*!D!Y`UI`?
zOsUTyVZtL~!z09!Lk2=Gzt3Y_qv#S;zf9>FP~QR*3_>dwQ*n)DVi)@s89)6v7b8u7
zRgxnF?v~ks#2k)%7;?=wrt(D<a8zNOT9d5zuuID)6dj9*=LSPyROyp_Au~Zd+MN#W
zwUek$Bc5BkoF@M1)|#Q*O|jAMLcB5VGDC3rRflkczFp7lyOYCHvdN*bl^lzF1yT0(
z<G|OS;)L1IqW(95xN-Y1MeNyTh!1r{)_cd-(Z^$DSJ${xGdEq*0-&@!TORn%a7b-Q
z!{_@%!r{f?Ka&t~cg}E?dgXYX=eGu}^g)lhBB-iugGu<SB6lc1K^s|xOGQ(+_%O07
zQ*;S1Iys~TX(c0KX0AZe(O=dCdKN$bC9c>Hn)!hbj3;n`*I&f)f3VPLUH?JOqx~;L
zxgC&uLTC4XA>P0YVOmm#j;dLPUQ&8gVo_#l^njXr^4sWyOcTW4D#aIo*ydfQKyGK?
zV?%%!@H7&{z}ei&h}OZ_(AeD0>2J?u9pOa;!kWMD@~R04vK2oA>T8|#f5MU0kr1=W
zEEZ-GV7aY7?kQmSBvX3_wm-w=LWUsf=ZDE&%M__v0+>AurP&}av`4I1GX_qnt(b94
z9I#P^C#Fj02rO4#DiCt|=R~@UuZpT#W(Ma0pWOtkV;|fE|1ZM&>s5ho_kX$ez#!|t
z=<)v~!y8(e{}0srU$@7O+$Zw@5k^Wtgc0Mv-!5SAmr2*qNyygP8c1f7Hn%YbVhCM;
z81(<P>n17d0Ga1#ykKw<-<m_MtF~v54hx*t`O*Z%p=Zqm%TeYAhK&Ks)_N)MLIu8k
z+xhe?vjYS>F-%(;vGU1{_xi_MoSs*0jz?RY{Jy>)kanRYU@+$=E3C-9(O>YUlO6@#
zIq}@_An-(j-3I??YZ!+f-Il;>ZeH01F9!d<NzkvE6dAX0g^^(QT0hIy>{EG#DIJ}@
z^vheg4l?BGJ9BC?chzZF!WY+Ht-pNqNM2Sja^B`X7IaWBS!td4)AX5hbwVzjq*|d(
z#<q!10zcd~l;&)crZet1(Snw*KF++-@c?Ks<|GIfk08UHt8WhVua=mzq+8^r8HswN
zW!&-Cx76*K=-q~5MC&?9OafF=1^wpy*-U9}#Gvb4=l-L;n|-Ek*skJ~E1N9DzxrIy
zoGpJ0%87uwYQHwz0;^q6x)e@yo&YxEmx~HPgW4bKABz%wJ=Vb!&dW){Fs~A+9O8TU
zh=6eRROH}=PV(RjGU1@{3E{;+=5u>F*$hF1Je0QsE&(AI$K`3impOyp35HH>j>c#A
zc)|u|AraRPa%F1VriFV;jhAnv-vv*$QHZ1_^H?Q1ur);4R9it_1!U1&&7z?6u)j5u
z4}Vb?2|wSI5>KZon5t69&VLnECFyvEi;KYw%|??XF$+?(4_w)TzPXx*{bnTK4pTYr
zLsF`Ybu3FwWt+8C+tVQ@7nrZ)<`<G!F%<{H!A5b6HO!wr#9#bGabOw9GuZImBRIP*
zWl&YG<?raCzlI{y5963(;1E0kUjO2K{A=X?Z3xQiI{=~K|E+}vMGE}YdO+mUtVt8j
z<*+@}QfOKp4P2!6>wrrstvRT~A3Hi8zYtU<?RGo9JAML_t>5o%pd-j3&_cq2CssDi
zJJwaHwIed?k~)``lN9E7>&_%s@xUBV5TN$^tY>pEk;o*ls4l6rk_J6OaB=V0JqhJ|
zsH<kfWRg=f9?@x>poC7?e$j3|N#Uos#2F`;m+1+_HfW?5B$j8+OVk^}AKEmpe_2oz
z1!3??fz$30sQU8!`?UM_|0-kd=xA<ZDrfgsHZ0&^3bf2S8UNGmkfb9wuZK4LInCBy
z_1h?yu$u`pv5U|!)X$IHpPo^crB}~i4XHAXbyH~$W1GJ7W(en<P**&k<fad4Cxj`x
zgw_#9YABiff>Un#IcvG`zvyDQf#~Rr2Py*!p$RNxixt$UsmZ1yRFlGtID@Q^gKN$R
zQo@YG4EHMuId<!_7YHdGTmcW?p*MAz+xAZo`?Xi=D+bFazZL6lFh=dAt5n!4P~iwZ
zzLQ6PPo^3RCxU;(=of4z_->OxRBxg}nImA{+O4*}bW!59UYM|3-_$=TV}qlJgh+A;
z7chtCZp0ByRL*zXtb<Uld7dpICPz)CvTxhsJZH7+E2dC?nDT~BpRTPOfm1DGGu}oU
z%+ON7^oxWZ5T9%&VCDSX$?swLJ&<gP)*g#`mT7xYw#^l39-GiOj69(uU$Dv4F+)My
z6r}&IJ9ule<bYQ6WHPcd35z^>zc1HD-SZ*ZXF4{5$z#Ao^FgSeQ1O<nMqm&I0S;@v
zHWUYYYPU0(EK*FM^7-Q-RKGk0gL&d%>wB>DqYHyHz9ENCfnl&?t57-nwT@DXzDYeV
zedJk_K}|7S3en~y!2HE;kVws3T{eIef{2rd3qX9qXHMinetQm*=e0}G_gWY{f@_3N
zKJAL7ca>L<#35l?(9J0u2QC+{F1l<U2{BUyQhosEEZoiN2793BYqdv-5be**@!Q@^
z3Uo>+Tn<2(_W9Ee4=kvREAh&@RSuu-0*B3R6oi5-sStS-lL6n)77}KNEY%^hS%{zg
z5X<)aeiZI}D_SlF5ASz{=;@CZxunZ;ID_+wka;g5f)r30ePX{2qVd}8TCm#pW+Pp8
zm6eU!aoznQCx`@H5shhPF;*~uuo(xL8Orn5Z~EZ3n5umubIkX`)DKAibD!$0lwtad
zdm8}UczFLeGvFUXUkNA)*_Z<7hn+qUg!|u(H?owcfgD`450iFdee1m20=*`G%{+M{
zDnfC|(84g7I+U;QVOzx)#qb&~qnF7~H9eylP@XrSVdO&%zKJ)JE>(h-7937n8IRrW
zSL?Q0_rufl+aPE+6FtaB2v`=gb-9MKe!*l-sa(k_=~fEE;n6C=KWR@#^fHK&bNKaU
z#%wkXu*$@TJr;SYHMejSny8pG?JfKGkh7IvDN7+j=1j$}vcTt@AHd|eqUt@ph<Q+2
z@r4YQ?P+SP;I><!TQq>>4y)I~o6QsHv@(78a3$60T^QN6?rmF1lJFk18w&GnUWekD
zu=5zQ{Z=GWn{m%NT>HU`;o;txxe2;NC~rc`aL~hB?^~7HmW^t>^%eqU-1*oykK<~d
z!kkG&Max*o$-iHp2jklVH$FiC!4Jm$C<01h^?&HgC%>;95s<aC2dxw<4t1~JTP(qq
z*|2Ud+DPC@68<y-m8+{Z4A^!55pBGy)e&vW*$sbCw#bV=?~Po(UjR-XYa*_5JXves
zZ{Dt0NsH0%M&E>m|L_YY9c$eIyI21y*bLj`C99W-S1>?y4}(_&K^sP@Lw_yJ$XpZo
zM=SWJG~zIH6&Ur1l6YK>8JHc;zPzKzt#AlGk*K|1iQUiChcE39D4JHDH&>hO$-DuK
zd08Y=TC0wS*+kV%-GZLubSU)59=VI=UO68^Jz|U#!?B0^sfS-j?j+Ej(Nx{ZNgJ1J
zuu&AZNQ(vIxm$(sDI6+BcIalui9<XO%**hIv!g<P6-q~1IpkgAy%4|CF|3?D|6#V)
zE76Fjlnt4TPs~tdU}aU<m8s{6PxzC}yb0+9J5;6@eapy$c+-#yXN_-Y#EeED_@&^0
zmoQ?1a8vJ#T<r7ToNRyXY$qfLw_-s3QwliV|3i@Vx78lFvO8M?yUGB24jBK}QvZ)7
zJ}GWe5{wZoNbZHXps88Y`rBFGWupqza*}_jKSOJ6(W?`7aa@`(6Z4s68+GgT7cWXi
z2`O}1e~pcU?2XsWueTpJFOWO%lc=yOO#160n<4={oX7qpy#6nFzH$U*m<lK!@5=Tl
zE-}I2K~kJ1;3_$AE*XO)#gI;D=0!*2exgF<t)s^VL|NB?I|C`y_ktqBD0lv$o+(Vx
zWmq^PL9h*}VfSa8dPr0$`BFPWG!kZJWxuqM8&lj~i{Z&7`O==3>=<)3@+JNhp@SE7
zPbl|Px81D2jIWe^NmK|l6b#C}i%~;4_nG`PE<9$~+$s#`{tjny_<aH#Pbce-Q}%qv
z{H3&j?)iIoG+70k^C6<@pEAaZxtH`J4oX8EX7~yw)6ElrdsoNB)D2o&PA%_dqpdzv
zLp{VqR{um<ID)19yvs7*-&E<pz6w94+2=46FsKLCTKun8ASoMQ)1!YZL;r|C{<aBk
zs$06D9isdEGD^@O2MZ1Y`Kelx9&6-?^d(}Zktn|~_&bhtWaFB?t287#^LpAU`1zou
z*2Sjo44bNF9rT*VPf1k4&IR4t{69<ia-R?GFFf8a+c{OdrY0^88Jo3X{IACuK%U}8
zx8v*7<=|(w@0ah~TS;{guGP6@L<L_BQKbPy>X8z+x9+-Dy12U9#c~o@NQQ!aD1hai
zQg{eg#`_?KZuOt^yW`SMEz*0x`qn*3y;O!gym%u$jjj5<nSjKS+tC&yASzM6?<)9)
zcWC3s&#Qf?&NunKn5QQW0)E1MEd0c4Lx6K_-xG{4g}XatWX|oQJ|JetRQmM}_6_t=
z>WQqvUAeCYC{fE-0-?i4ewH{#p@9j3t0_Tw)-~p5E^>m7xSJ?u7Y*leODI|q6!%N&
zeP$PRLqjagTc)WmK9ep^9po9lA>Z3-1a{7Vb>Te1Iw%=p7<xC#0}WVVMHBX{YAJT%
zt=?ZDv500AH<oBT*qpVc3ZIgbyhEDot5^@Q!+>=a_NP{ZevAedHe=+ytZ>n;FRy_n
z(T$Lgmj?EirMnA_Iv+>f5Yk=q3<xb!JA&T!x5lD*t;Z4E9_~|CSZL6H)a`GV(52^c
zu(=D@p&Er?`h;I9Q<Je4tO6dtFb!;>s=Fqb%cORz0EJ@R4Zpt11Fco2j*Ga3RGW6t
zj<dV|#o7&J7)yYAoR>Xl#mZy)#lvqgZAID{)n8V46{1eAF-H?xx|-W|6|R6iX>z9r
z$+VPuP%_b|p0&!(b7yBQN7|`M*m1nY3vU4cwFG_RskLtXp$OjyGE5BI_nqxeq*IN|
z_D!kXcoOT*#=E)RaSUB9_ti0PJs1N@Juua==u>vA%%k78W||ykun)Ovy$G#wc@*GF
z6Cw5M%}oUxrcWo!ur7IGy{cAfc6ct7D`7EICxR{h0`M>_bT&#{2`&U-rvgtc;KP$J
zTx##CRZELp&K4VUc#DnNi;I^FDwE3dfNjBdd%pcgJg&;&k^1c&3AQUL2)TX0&#cYj
z@))ws0sxz{pyNWJbrg<0Z}pb`s)ZHGA}y-yH;#a9>Q)H$Z*CYuuu}%&eThBI`E=Ws
z9EiqAIh;<1xxUKi0}Ye&q)po|gu&FQy__%&uv3Pzy^e08eRr_BJrTeHhTfC449Ql=
zMGMjP0@;)1Zlh=V-AB}q+?|;70RCOU=&Sczg=?mc_h~ngUXf1fS|6gp>cqIv-)w(Y
zzzW*ScUa$oQkEgu3Ks#<*vkpc_#`<4izdV#U^U`yO1)Y%Z`N-recRv*21(^Rs9Pwl
z4`2@#KcmT-qj8HDA?zl{&jdha#?1-ui!tfFf41*+F`2O}teMl6SYgeV&fC&oi{hPY
zsXO0Wp}TpM!*<!y@Z@EXT$Ywpr0Aw>0D@;UdAj|$tAcg2pm{|%!vb03++$AalHpC+
zF`tdU_WvsB=_TVJ`Ml9B2m98jF729`{xHR6vC1p8lmq~Qb#vG)y4A(Qh8s0MExB(7
zji&!-JdA>f;O$ZFj<&}<-RNY2WQsOm!-{N-dkKEab1@_@J>^S6->5~2M7}pWWH61w
zi1VT`9xOe&-VlP!*fO>D7V=TFAKANk-YpKdYU48#FnW(Q$<Wm~Vlp*I2zykGetaN<
zC;N%jZ?P%Iv_X_{H5|~AEPX~^<m1@eYZqtIZusRrADvT<z@^HmK|`qr%|Scf6$XE9
z1i-$gO3i6xH&{J&^XWIWrIi*yh@nN$FvMI})0HVUSH=#V<P+~QC%5Gw>{duf*{2lr
zSk&A1I%l=(ZGM^ieC6RURohV?AA%m!5NL|Y^-Ow!FHEKHS8TSACYf&lSv1QT7;Gxf
z7IbSik5*`Qht@ZHHiM=rTmkbf=Z17k_;*sQ*#OTM4W4l78!Wc)gjUH+!74Z0s6Ci_
z6d8&!b-o7!f*k=X*D$EM!y^2F<`ACHDteON5Bo|09I}{hey*tSkXm!ZF*_sU6ZcAN
zx~S|R7CS_>iQL=4A@fRE0<qf|7&_a`!E{vkI3O~Mxn*SpA6ZTSRW9LANu5TfK#Chi
z*IuP-fOGf51j5UWIee@&D3qO}-afL1+&-Iygp?b$N<yiLcY`_wLs*idI{(DfrX82s
zAL{OIz4ANxLC0*aK}@t#AmRa1l8dJ(*X&6$dt!vjw9}0$f<JTj7nyaTn;))(EQay<
zh{S@i#))TDd+xI8^#?B7izfS@XDfpIS!Zm52fyhc*+N?%V=hoN^ynU%&99yrCO0Um
zS|UA*{w6h+FE|+`3XW&*zRw00^tl1K@s2AzAzYHfFXH_y`83wpQE}u1CW8LO0-dxU
z-Od=+8nA4I=#7teGNIM`3$LG~^4Umz&S;RKaOxzw#g$#+b-w5=5z7ojy2JK2kmQ3I
zZt9&u347Mss43UkZcv{nSBf+rmz<pu8@`ziE~)kTXpeedZ3YG6-|-=KnRSCd1E>dw
z<L&}_oMy3}G&Ud=V9Ld4q3dMoNf8Yi>&n`=ly%s^>`eqx32quMZ%&ys%65<!Tds4}
z<@I6r1cIn$0$`QwLe%u(qx2SjLj{-YGVq;|X>d00VpRu4#>_u{CHlZQ$1?VYu_>Xa
z?pK%FuKD?C&K*1~c>8xi<X;g2t|dm@Brs-M2WIK)|N9)}U$c`W6>GV9c{CrJ<yi$T
zEL){(2w`{}TVp>$c$7>73`~YJq8mfNB+aSjoXbGYF4Atqj~;P@r}G%%>~%KBTFG4@
z&uQLc&gr(t&PLyApLa<4p6E!HBcuCUHKZdlni1qWN<)}&R9#8+xVXJnG+hbx{cC3!
z5f~g)U1le1tmIv5CQ^rIZ^$|$f-`t;^!_>5j3}_p=SsZPLO|&X>*U5VZorjL(TO*!
zcJRbjo#~3|s12@V^wBC}fMPSvCRJMc@3TPl@)cQ~D(<zsvI^FDd6@N?N+JBCgrnAW
zX7_}G5yHhcJcyUrjv&Honjw-~<Gn`jwjKtQs~La#IUO9xN9<BubBc5e3ss#ek7)hH
zh@Vk}N^NZWTfK3*ci~ysKCnR2qjUMp5G@3ZGUAg{oyIpb_eJt6P@|J-Y-g#vbe@8w
zPrRm6K=DfrJkE{A8mUE_1$$O{x8Zg3h)ZD3@d7N<iP|-!7HTs<^=buGAbCCG8;<qP
zn-c04HRUdz^Wmf*qt#$Ajd`_hGmzGdFwHT`Z5T61h!(lS+wZ2m#9@<|XLr@s>Qa~M
z057CaRDcm<3rDS^^XN~=Qu^NJrG=yHycOTFL8hmVWfNnY?o{kYClDZDKCO~}K8v6>
zAr>{*Gz)uNt&~7-__N!#i-pJg-WiSPI=NsI<U(1~ygD|MFXTD^{7b<7<({NV5K(**
zh@U<Wc+Pifg_F0ek@&{yiA*B<FE?=9Vz(6SbVL_ZE~QI@aD`9Zo;Jcf0bXn2OA+9h
zjFdB3;Jq>JxC|i*ZTHYI?+KMVFcKSgoY@AEUL_|6`=nuM)?Awn*G>eZf}P@W)7tr_
z$=S@5C2?xFNPbm%=F-TVcSREMf$&dQK?9bJu=-Q#PE++?az#=}`*2skj=VmZPdxpm
z!Jpw0aF<r1s!v?SY$Q$~j*{fBS9lR9Qy)C}8v*~X8FFB-NU;l?AvVA``mZLbfAuQ;
zo7()h%;uk(or;a+|4$U%r82Gv%;R}^M@jXWzC$D51cg$LB17-y5r+~N6{(<U2G#2=
zlPc|>7zL+GC;qtpp)HOcLyhU<_qj8)+!uwz-d@|un+A&_NM^r#v~{`unAz=pIeGAY
z)p7-LV6P<rzYojBFe^}z$&k=@FxZ>uZ$2Sx&l+wC@36X`jX#Jh^oHU(-rhkD3V#N+
zzO-o^kuvU)rf)E4AC<X#n_qMco1CWQB1vY0sV1#evnP7Ca|cg!i48xRWcmg%t+B!8
zV3}>X28lNa7or}#TQI>VR~MZ_7zZ)W)+GYT>z!H0Dd0J1x&-JOmyHYmjX_nBG*^7d
zca)J#r+a|b+BBu3bRM9$;%N~t4kmYg+<Z6Z(|VW|{hpFZn`nocn!Rm&vgNI->kuU=
z(ZZ|9p0%1=Yp4V~gFai|ijVbV$}(?}3pXT~+cM9!S&wAY-6wGv+p2eBG+@W-xjy4(
zsdabRvaN6ArIOZ7rP413h-!YBA79E0*P6LX%YQF3<ovo9MeQ+5G0_=rL#ljFSSBct
z60Q#~T9>;=j#1D$$nZEl-^;Lwwhpo|Pnc{iX7sYlh8eEUvT4B_oR08Ch=LyD%EpuK
z$FXYA!+X?F)0f4%Z;ZkOeTXmW!Leuvc`AyHBaaJYw<zNI-Yj+Rjo)VJq`Q9@Ld7=L
z@dh@Y<M*vS;UC~}#l{k6_)9Z?pfJ6H2YHLKzxwk%pqHFTSD@;Fn1c9{(HVV6YEwOb
zQ;-hLH?^m0<&x4hlGt5t@+2ni>wfOE_`|Ye%n{QIk_H!B-yAcNL9%n@tk(wF{e4Wi
z*YThzp@-kgt~_1dGcGdXBO(>+%FiUuVE`S*I%Q!^#Ed|};g+a?SbarqV6~<_9#uv4
zOq`w$N*kw;@H8ToEg6p=WSvuS5sH9cX|hZOy+7&uF_tJ;mZA77SA@#YRb(Jz4sC?&
zZ9iI=A%=zeo8i<Ri;8;~52}Hci9K)S+rMO>#2%xX@j(464dLHl{r{qP|0C=Cr{1fo
z<@gsMB@t`9P6QQxU>Bdz&+zL8254fTJao%<alb+dp<IzV6*1*FZH=S3*RFTC&iksv
zBBVy8zQPHomjNNu7m635H6Jlmqt$w;;)JlN?8WR&Ti0K_w*<bQFF1ZFH`ch^3}l8}
z(QMMrdfZzlJ@6($_r-1#WOiV8FdGB3H*Qix>o6O^)P@40e9=>9W&W`&L|r6>`EE2r
zxx;p1l-p6g$mL}AOK3<^q7p-%s74hBC&?PgGps&hT@^>v(KZLgET-y$!-={qDkTP%
zs1HlO@XBlu7HN)(akbbZ`YGH66)p^nC782Lp~&#pkZZA77aY>aGq9aW0QO7@Gh^;r
zuD#;o!JA4NGm_28YC)rw78whYp}$SK>%V8Mh_getn`tG@RbJ9aa%@1a)kn1DS7E@@
zrm){{lr}XMrU%(?E|71I*r3j$Y%XLapemk%L^6ssEJ6t3;HSnR1DasdDFJe_%E=fk
zo|>Isd#XAuCQ6&>9<rG%+|8R#-+jJl%U3H6*8^DhXwJ_2vM~)SYw}{G1m(Q#ntQ-z
zXksw%CaPCe7l?EhGDlTFt;LZ7DI04PmWizl6lilEfGq_n@rb8-G|wD(oMdAyWyD_R
zEt!-+Ino>`?)Y&?FN+twewX1iH8~9GnP>^xPAfYV<ibEY&ADbZ6r9%9u;xjlE}8e&
zUP9D0mq2mgYrU(fL5tG^G<!(9x%4#!`b^kct_P?Vew0qG$hY=erq>&_|D^Gk6Py3+
zPmvm+sxUZix@*t%lp8sVy)NG&w3=(g*v;3}H9~{n2G*`<{0!)VeFzm3HKT^T+{=!9
zg~ivC?tOjwF6e3~XXI77L*g}oxTGEP+qju~F@GKQLI0P(+;y2hnBWV1PQ(S~J>w5c
z!EHSP`X(*dIV`>1V@p>&=N|^jy=qUIz3jv;+Y!_%Azlu<(aEmbiW8N4E<YyJxjYHd
zvO7GYd0~G*pc=Hhn%B)ZcOhw;jMgUSVBdNQc1)L|%<G(m6v2jtEH5kgVJ-US8gf~E
zgT_;lBAYDi)tfgr=e1D~Vvg|dt?W$=yf~fxtdHhYRUsqBfW;+3bd0SkNY+PA$Ss5$
zUrMg*z;?O2>j>C>p^W!8)+=bWEa;X&p4@)C%gMAm1lt;`c9emodvVe586rb<kG&<b
z@DbxC)}}Yk798UdTHjD=<QE{lV_xDFXe^Fv_!cVB>R<<fhl+226Vy6z7Zx@_9|~Xn
z-Ms(2!1v=NY-=rU-x0~c>$30@t$ii}|ENAgJvi);r-)IrQ#b;iHaKqQD(#&o?I=Ud
zF7+uCR*V6>bxszS?A9<5y;^0`p1($oDl0d|LY4C}aFXlGMV)1=V+3X5>qf2$#qUlK
z6$+AtuHc011WRoQXwC%mB)9Wpbk{{No=kh4KgyF{mG#SM*s6J_k9FA&{hd=K(2kMV
z`txzCp#v7V&EIo{c(UR2F0Vl)I5rnXUrb~XJD$=xIRg}?M{{)h)|j2@Pj&Vybsrrm
zHR|XL`)QUB919!9SDx_pRxi7at<opS*&|&0C{JNW@u%7TAa_MIcU6xvH7|f<6O#3+
z4y_E(U3#pB=+MmgxERC&@b$B6P>wV{bcQ&!Dcq0j;(iIzLyXn9!wlL*xEyPPW)4Hp
zH!1b%x`dQ7_v*?vpA@B1@17GsYdX91eRE-VjC7Fg4#9N~6n~9D5YB*I=vc3LEIRU8
zX(7;jO0zyYcDOr;&pS9u+nB@{#k-D|dX>h${XUvD^0iQK%4R+dyNBe}ZO9uRqJ(~x
z!&@`q6s(#BPp9pscFVzuV#CvD&N1H|T>^%pv$grw0@c6-Vx4lSx>UBh2bG>6VX+QW
zMe=z?acfWu$24#BW#21lj#aJw<8Lix|B8t+t+c00fNF2?zq?)kWmW%YO!WUDDJCiE
z{N;A#ZO~|Nk&$Uk-*b(m5~Z?1`$0-<_8rY1Hjd|sO(OVW#6;DEg6y;4SD{=G-xJtN
zLAWd17Zf;i7yPNLj^pfcUe}Me_jmXm<R4x}wWs}q#Ub$_*1_jx%5#~FM&+K?kS!>W
z;6mM0Nv(i;Zo%z4S>d!nlZ``#3`_H?{X)y`(Lnv(htU!BP5Uh9O{R^RnvEt!L3ZM7
zQh&<fN%atcQg?b(0rq%c=d;JQvsJ!=_A%}_u70md%7r6Q_{laz-bBFB)_s}EBe~Qs
z^go6ongQMN!MpiuUI*Lm$oA-vv;{@5zm>jCh4g9P9H=Bsc!}dE94e7UUf1@61aF=h
zUG%qa1~OMNDu0B?L}}i9cO5Khl%ne1$6bMOOchuX3feV$QDH#S)oH)r38zDNcE(P@
z8cPt<r<5UXBlGB^J5LERG$mH!ZHEXnVl;X1?R}Q`8L*mY<o)>*3GG-E{OJk0wULdc
zur*YUicX(%Fn<!0#?hF@NAM(aaP`+<1WBJbPn2q1a&lG48-fMWnDL2~{?wm13L0b|
za$)_4f06pN+-y=4fx+-F%75I_|Lcnz{Vgp1r@pVY>Wia>{vo<PGACT8G90~0t}@S&
zY|I%<I^$Lru}?08yG~^<VW$cE)sk2))--W;Buq<EDsLvJs0boG*_%1yXCVs=Ie#+y
z)6Eo)Z6^@B)XmL|Ew$9jNY4y3SUhqcdzrS)@qfGy^MgGxY{}(*4Tfj_i5!V>ppa}&
z^|Q32cA$W`Up9Aevy8kha9l#Wx84nCIMo2;Nado7g0A0aqvil@9McpxpxwyB5lr2w
zJ9YGAGtntVUYtK|u<X4=I)6m(qu=<bn01oN`ml!8?AELM=zw?$4gI$7jQft%oi>o+
zCUxQ^#nVlTZ#()F9e81~x+GKJVC25k>{Kw4RTgm;&!yh<XKtra6F+W-sR9#Wv05`d
zFd^!P*ru@rYj^-%&q$&<I#fimCZ&169hvvF{bIRU5R9X}0xPUidtR0UO>`s*r%H2U
zxXH?;YSHXdrHRsE?@$&<0Ag$rZMu|ZFO;OYnw1n@OZcM5o?}51qN!vJ^hp;^Gh1(T
z)LF1ijKs;r5>;j`s}%2#InkFX@lfeh2pPBOYm@SbW7gj=H!^}AW0`7Frpi*7mbMLp
zhneJof(bG(MBX)l4_sHchRx<T8Hz4XPGCu~o79_;{r6Mnt8V1t+y?X~Ng$i#UT0$_
zQ4bG<!K6+sbG6#l3ice|eeW+X!x|&OjSZztMTYj8HNHJPSpASkO_WlZUmA+)D=dS{
z4@e+zVp6?{HC8KyzN~O*vyeKm;Ib<$Pk~Jruc}mwK2;6Uoa2mJ&AkTw=HxWq{_~@m
zrZh>D_hN+2@_sgB31YFLZQiCNju0P*J=v0?quv>UTR&NHt+T&{qpQmZqok3n>fq5-
zthPQ-dnZH&lmNOJfcw&hAPn5wJ)oM<Szk|r+v2NL<lc=|mmAw8K-L!odj)t3lFQe~
z?;ErWq%I#Z&X%ElxxPPM9)9`;R<sH=nbee+FM;RIFAr2|G#xb=wwql?lRv%pnL~u!
zu)*k1oVIFe>;&cOfxKq$*<F9@v_+!i2n0jD)cEAG(KxFoRPPnLRsg7>cLul`d#Uw4
zUVB6E_aKoOT^_MBH?yh&Q91m{H(%KXL@$lslzXSI9burl>^U+|%MO^MFylIw-L%5G
zAbXUK>FZ<BCw3D3(ck>lrpc88Tt)Z_c2b_uLqu!*sem0HL7v}PRgK?7dnp)8c3PhB
z#N0O{^-9nd6(=hS)Q(tVLb9sm(zdcCZHE{xqy;*9PT*cehUi9Gi+8wG(K|y*(BAMX
zCJ)#cDTp%Bo#Sk>6*BwVU7PBZvD1q$$E4V=9Mm0NCStXqva0YHGe!0pT*F9({j+{g
zXE#F%T~0?@Bj6xds**)<%)i<-13KL)W&&0q<~5bW7|~{$<$M@MUMBOC$I}(m3A~~L
ztnMnv_-wJ8%Og%)!3PMTt&q|S;X5f$Rxq6?DJPWoSN7dyX?ET67<8!>?4$^guGK6k
ze1*kgG4POJ0<?p!iK<smK3)iyL)a?+`awkc%oj;C*6+vS$6$2X8Q%dx<%*NnrUkwI
zJ<uT0;2iS6nNhYb$Y2jL{@qfZRQh<iR;EuSvoJRPTFok_ElTyQ5kU;nhPW%(lN4U8
zBR^YLR6N??)sE(ok65R!dIZ}g(B9>6>X+(er)$<!AY<S07fLS|<^#O9s%?R?1pY}^
zrUOsLuvdl%o!UAa`aPe{KzLnpi2@$`%rC3ryZVtt!6ma1V%Llx!>MF@9MQ<O@lRjf
z5?%27hO=sj1inP?VeN>=posLrjKOYSP8G`SNl0emdc_NR`Kt!X`nHoiP&iEmIYvr#
z2W2%lq7aeeF;Wk-B7gc-TOvk6&+)G9b6lpMJ#IjU*&ms}eC~1soBgbxkheU_iVbOh
zgpm02hO7z+-lj%fdO(GFy>w@+IJ4z!U39kRJ6Bw<jAi{gw%z-%<lB7B8aolf<s>~3
zNk&gGt->>!=_mEhbau%^lXWmnXC>#s05`3Jict!$pA*GpBI#4gnV2tBj|Ci$&Pxl1
zo($iBo5L-m&@@gxf#(zr2%MvM`EwHsShsy-jAWvpGrd3ws{b*U=78<X62l$l+5qeR
zYCZ9YwM&}$3bNwHa89Z(w*~Pa!E<<cCesZ8<_*5Cv`n<wglL{KTE~pv8E$6e4EzZF
z6+W<B;`yZ|Hi~s2q~}F7UH9s#Qz(rYh%f>9#>_sO56_qPyGoUhFYV~uIS=OV@MO9!
zx^L+DfkDw`LR=l}!pE8=cfS2o>nCYaR}mbG8}zUb7#^STKWf$*|4(CA0hQIZb&>Aw
z2I-J)>28ru>F)0CF6l-<x;v%2yHgrO8WjG||9YQ_zWeSO;~NLZaL>8x>{xs4xlnX`
zr1Rz4_{cGE$(degrwhK|rK~G4ZbjTVPr6RRwod}d$q{F*6Dlkt&B4#Y5%!Ud5LuzX
zzpQ!>i6|0daH+8t-N7h%|5_6mZH*sHxR0M6Xho2@1@y#n-9RK>b2Zu6gPEb?#A*;q
zO)8D5U@|t7miWfek!woK_8nB;E~*-yME642O^MMx+}PDCFAK-J%ec~Ff+og_K#kxf
zO1XNCi=b}Mue+{$mJHloM7K06E|K*e=V|wJHz&uN6dv=G`Jis?N>YMtLxPdH#Db&{
zc4uC{x~qiovzWUB7IiRyMIGnwhOSq(R;C7e_JEf)z&Fyw!0x9h{)xk6daR^uCm(9S
z7#OIKJMXKmoTCm<Y!rvB=W^lHIV70Zf?Np<7D2EeP>&MIWG}uvd!X1tEn=7#+M+qx
zPvcm-aLl(lr7H)zs#NDg$8j<LSov0zGUyoB5pn?q3ED$M3~)2pUrN3ytzsFOs2v|%
zv&>R;j%`#;l5@CSPeSN?et0hf6ERZlwM$(=(xKhbS-^_YXCJObu}o^(n=DE{?*Pjh
zGx@;hdbSQyDwj7##_m&d0)hS!rlpr1BEwgzdkc7_LVL-3qfvXLb5b|Ur12=T;E~8@
zkpYpoR6%b--tV;XUd{${QV<8d^jY-R^^%y0xPrpKD=VE3wf}5*s6{1t-7td(y;hqK
zr=qy}30tWZFFbeIgdU&4tKST+^Me<Bgf+Wgx)X$2<r=#Jz0nCTHrA^Po&3?%WQ+Ll
z(PM7EjA21&F!^c}J3N?t^nz!(VJPlULkt>G8y9K^HsG`#f>UqyB!E*ggoi@*Oo3C9
zg{h(5-#U>OUOsU_Vl-E-lK>bmK>;Qhk>A_&rzZTqP#4s(GXPw~Hn6lau{Uuv__Hrk
zp8Q`9u}tnX>$)*@H>y3M33SbQce;cT61oB;rUFyf&%o0R7c3kTd)qg?)_W3DZnWL6
zM6ph3aHL?sQ3R9Rc1Ig`N4cG@cFV2So-u!V2?8R^D7H`P!`&JWr(oY;nq|3O=;INn
zFUdj0t{eQ8njH45jw>D(M{}p&X-fQ!YhR9)Jjt2^L?;hY#^gN(CISyt<_5p|P1V-T
z<e6gDr~%!lcqYr{IHrw|j!Vqp$StvQ3z)UU_)krTu6kxiA=$L0KBY9BGX6}{ioB3x
ziCQLb25}!S{kfWYwHn>1Mgt6BjLb)3Ms~#V1UXJrvos2_?^S_mA`uF!v#}#ERd%88
z?;i?rK}U9i4R<r)U!aH@-M!Q4(B%`Wue%kIAIrI*;|sKxjle^aszoks*L1+9Sh{=u
z#;o!FdCuU)av@u^RXo0>PT_K!3}eg(78D5MBz92B<Yoy2T@-cj42G63YYcC6GugT;
zYKxu+u3VZjn2SVxoIei7n~Q7W>ADJqcn6W9m4y|0xF?S6$HO+5gFp{o=8%&v&J{)j
zM-XzL{E2ScTHi$afKYam^Y$aIH{5o1CX_fPX%r+Ld20C#9U|A_ZFu*n)cx6lFJ(E>
z%K#GD=Uq(njaXGmyU9q!S9Nlb)H^nDFJ+wQZD8t=hFWt{oN`jEka7v4OJ_X^<q96b
zVyoX`(2e?pA*(L;v{neAb8VmDiiPM3eetD<iq|fFOELTmrV|v2=iND`qu`h4@dEdl
zY@Iyp16qQSC!U!!wuNiIjz9r<H5f+7KtR0!EiAHs(ObV83sqs96=rI+sL$Es;y_4Z
zfc#z(BMj)p0ttA3ViZz{2c?G$400BeiS-$fN=gQjd!I8+btzYzqwS$wSgIr}9xPW<
zda7$t?6JaQetLYls=nlA<+kK%roP{Pm7F{*1y6RhwRObpR^B?hczAYN>$LjirV&Mm
zIZXEBB>bJ%?H6Glf`Q#~?60(m4>AOY+u8D*$J&#HA*x%r>Gmd?oLEP*3td{tv&>f}
zX{mjjyZZ_qfikx*1-4>1(azq#9NqPO`C^-Cn@MepI34~ICPCDU$;+sz`SK|e{L?L_
zoomorDb!GLPR*`34-J~<MgvBn;Zm1p%*F##9`1F$O!m<9VcW<Nk`6_>S2oEtJD;KY
zL!oaKp#7*exa4`Ng=A|j9q}`}?6&2z&NR}|?P`0^?bQa)S+ufjB4mb~vt?>q#DdYy
zT7(MDd!Qv9nqC>ApEqL99oSdWYxLT=Ymh5($QmZx8yARiyy3yvb0;c~UKPfElO}rT
zoELS-Vi|oxh19s%XC`zi>Ap<SK4<D)D5DIy<)A^>dbt_ueF2R9=HnLG!W?+InoI5l
z>#cLO%C2pC{U<ce)RvjPksPQm6FJpAr975#1C9}XQr-F`kU^!!n*HHDC74r5is@(C
zB+Hml;9V9DF_AJ%roGSQBI+5W%b4_LL#>CQ`+U#VWvEkwDc7{p+bp@J8YH`xx?(hS
z+-z&HB2*`O8?fq`;rTav3X%`CsjM;Knb2k+^caHcjLdQ^OrhNhEh5zA+?exi{7q`G
zIe0N6dT^TS1j^x=mVv>CN@m5T2eIcGm<+rZH4Uc+qr+bI4`FtAM%bG%q*t0=E}|7<
z*D+7e(ydiBIUX<WBr?<ADqAu+r6_8iX}_m3tyOI<R!X%oM$_tNrqZQuF5w!`Q^0m;
zU4Tki?$uVG4|fu-?Al4L4m-*uVp>)*U{YydM7Ah44NIXVDlXzcEs;2~FrYVI7<{1t
zoB?J?fx4hbuxwFFGThURQvt$~u|YSCTBnjOSG=Im=8Z~$fU{WT7emET!-L&Tuae0i
zEkIe6kbx1NtS*R7bE1g~3$Z1cq(Pc@n6&H=gD%MmQ;XfiS*JEpD*!1+{d~mGI2{Xa
z@U%ONYZc!gTb@V9s?JErU0kBvUxJv9*DZQric&J^<6CoF^PWj_xlk|36h7;IGyEH<
z5Afzd=|fIz>I2^0_#YGB$(4GORdsEIFvWL5c`=M&O=3@h8z3||ms-Oxf}d#ljE9nJ
zDbt*0wR!s+qKtGdiV4&Wp~7=~FzK(T30Ao0pQV$6GqOannM-bEfT-uR&{Bp$ana(q
zm}O$)CSxjU;);ve*@g>x7aOn2VZNy2V)vO39M}gr2DKOtVSB44mOnfVSW7uviKtaQ
z2xnNveA$p0+NnuU2~(Qij@8`V_Kq}*6paQL+fSvNaiVl0RPO^v^7F93pf|1s+M{_4
z)o?Nw1#bCu)hI}oMrg=u!TN+3dtx;`p=5FW_-M62R;7bz12JEiYn8zDath6wXW-`N
zO#+(;r}YB1<ZfG+EyEaNTvD(T6l2O7K(lfK`}xuY@ebJg^=&+DF`1t;#RuAEAeQ*d
z&gh&NrleT#_kBuFsLh^=rnO%ToMPB&a6K9Ci`(M7t`kE<s(Vjj;h{-_T9xv)FI`~q
zS;<RwvhIO>u{zU3R(hmm`MAn>>MDZ{GzMzLe&>3}+PYBLUO40$sgd9YB}xLuvFm4n
zVT1a5lIcz)ab3&P1*3ZkR0oE3)o5YTsa$qsQx~z>{8^}Ae4{7HAk@1<gLZ+{wy!2)
z^(*;Qwn;sQUl-9}@^ta{1Xv;M9SaCph1(0K%5_0SMqzd5yvD?|$5^o#=Wm+Iq8qmW
zU*UIRjFA1THG_6~6xx-au%Ht*&Tcu5&@hzM)q+Cc`ikco2oZwSIUCEYkIZJ1YmWlP
z$)sgz-Lh>mD`=k~e=|GMkN+s97yFIDC;U}vSl;KE#mPlMFRyS9)l@wqdhcP|63VBX
z+dpLP9Kt=|t^uVDMbi3NZG!~+g+lxBj<GQ)!csD~9-ynTZDGEDKkt0IIkE%3)(HXI
z_O@O7lf@TdKdW6XAY)QVy*#MUp0@_zYXcAgdoTP>KMDd_u+U90N(ObCxP(-Oj=VJx
z8)9acR!SYpoe-N|@5;HD|DcKkTPr5Obmf5HHL&h>%j0*7A^5Vx3G)jful}bl_x^Rd
zDQ<Ay&L~s&?)7rWdUFW)K~_J4t#UFDVw84L&$jf9^;)?hU%zBSxN2{l2AL3tcCySq
zI8Wd9jAbL>>8_>H1O@9+9J2Ex$+Qo$pXIUC3nN5EEIAmNJ+Xa|C|LIrFR1;ZLZ4-B
z7{T%M%9<?ejmtL9t#7Fg$rl8F@IbaX*{|H+2=Az7SX|$|0r$JVb%9JSYq<ahrc~0P
zfq~^AGGXt<ieT}S+iUkBCM^{KS*%MYLT%Q>V=s{pU^k_6JM3Y~?=wV&(CaaTgdCsL
zT=pd<G_O?%MW+i%Za4W<Pl985Fl^0^OvkFO7W&-8Ou7V)Tr|ZZMP)g>H_Qoa>$r!B
z%1{B@9%iNJYzVx)v)uGcihlQ{6i(1UB|9>_0|uLDrwtQkU{3n6A?8vDcxqVc(nh7B
zzY6RbWtBp;fyfRyc*(JQ#2dC7I5~ZRf&4r-RtGIb9N@K99QoEz+SDNlIL|nw7Wu$%
zQVsY~yjbJ@T|Y3vD)tr0PV3E;+jJk3tAch>IEYZ$a}fq7XKT*A0o{h%w6E45P;ZzM
z^ETE!KIV$v?(gHhru*8mAK6nH$&UbaWz%AvRWio;UQw0Tb)44Auj!*vHu@lUITp%M
zEVS{~dQ*kHbuuq8NK*$N+Lv|avUeBudAX0w0mXaFv$wrb$;Vw3{()^0@E#Z$dGFBR
zXMryj=xq!jY7EWkj;Y?TJEJx%TlQj?tk_&;`87@8De;OV#&e>r-QpQuD>b%?ZUKat
z<w68ioB3DC9qp5|RnYk-H3?N1`b{5Oq?ywuMvga^msRFwRfu!KB$U__HlLI1P1RL=
z(1CdzK3+OYH`EtM!c=XY8^-Om<D0DxLWiwaY2MN7h@dS+Bq+CDO(`RkAf=vSB%gCv
zTW|?sqIRrYPHD|=x&YS1b;-<Ei}U5h7hhSC#8o6%Fzk`LgneJWgeKpQ%zPeLVy)hy
z8353C!hm8E>J*3gNIkgCnh@q$##%T$>KMvh&>;f?qd3`Uo$)+rF(;;M^pZbDJqaG}
z^EQzUo8I2AtdKE!70H+c%Wgo$;;TKBb%^~OJ;A~tKi_cNdID_`L*gup@$(WDJLV+!
z<HLCJ@LPCRto*kvOQn_u88IMnm-#Av&!0iH-%Oi@=A7|=;k=LN2`j_nxuPEEfZ=zA
zgnf3nPe+N8#^^>k|FSf@46_FNSYI0VU03)@_kD-2Y@V6nE3Ta98fC=?jD|r<YG;{e
zP64Q8!T_IBZ#g`wUXk@;G|M_hbA7t<dJJ0ob&bqzHmZo!FC&mile#^=a>b+$2q>U?
zo&K}o){6D#vSO}5?V;nUHGV0<{gPXG&LVW8mZ#kp!ZYo7k2W#NU;T<`<K1}V9@rbH
zH?IMT42zMciJ#0E8YjApRe4=fB4g_lYqUOdmtro5l}9ERQ%1bA+vmA}O-(x~fCxq{
zhCnG{jT4=ap*hUcsF+H1r98!K9A`-xTxn(A#5@Dq5)dO(3p@p`D9(kl&p@W{HH<|h
zY;E2n3Z555m`Y?YGE2{WZ#y&?HPw%geW?&ys=QxM6`^Pus`!FiAWHWE@~-N*eEqTO
z0<+P-@R0Cg3<SrCcZcm#o?m{Udix+(AYY3!H&JBnT3$|G)!WTPO3;NMqGzV>*y(zL
zJzvoMwX0{o)%XpzY{1%-pb`Ei`In4NC~oF6#GUJ@cVw!ZjT?|_VH=zHoQH@JfB-ch
zo0QzlwY`VeSL4ixN6$Xk3%}aG-ljXrt}bq6H9(>;ge?6y_vL1%O`w$aLk>*Edj(of
z$%!UzsMi&jZY`8e1EPgT^k_a!xYI$D<(a^r6ner`fOD|R&6iG(a|dyShA}sGq{S2#
zCz_#FSyFPQk>l^F?h2v94bevrvKItiHV2KyIGRR`ogQX$1ic?Wm9)et8h?hBv9w+|
zN;`-ar^qXGUP=8W)??)T1e59kRDx^h&T=5Y4{CdQNYt3pen4EAjls)5A0aOhaevU@
z96QqeWpz%_M+lM(4XTXD*Fb9#%#o}U3f<1Mnlcy@=xUP6(IH+-Ce#k{Oq$ZP_9&`i
zl}bXYINXxQ7sz1y%{398;6>LILIkfN(sSsevLK`KWHQ9K8j^A}By2K7HJ8P>T%I3q
zT1=0m+moK=72g0IZ-|=E@kXxo858iz&Ycz4WUl4o+<-L2c*(Mz6YMKJP_Oh7OdWH?
zJ|N$7i&a?acPa0i-K>ho?c2Blw~9uaGv@O%b!7y+U`+=%k>5MKAlb(i9OVr_YaBN%
zPPyc_w9HYKD4&|jn#%HPoefI=`fSz}x!vrR!xfwx;q5tBMK^=^C9V@A!h{>>-NtN3
zyRapmXoAen8#w}Qh}3Ix1`#>#%$QQv?pE&yC|3p_PCEu-tn#;wMET}Gkml=6I1;!L
zATMaaG$7Jdw_$Z{=v0<>J9G(RzmlecHD@;lR!aNgwAN&`wPbG!)h;O>Q+`HmBoL55
zcQKrE1{qi`8u;Ld@p1g_D}MJW9k54DaA9^QI109UOh;^wFTD@Gn(g-Vy#WXV2iPnb
zVKPEpGHCO#kUAV)i4VbS*BH(^+k_L!7ZxZRZ8u?25-)%@LC0t0J9Oh^1-_|`O!A5@
zmMrIFtq=3Md}TModF&*Wb||ey6;na|UT~{p;x2>uE`nHR(sy+hNOM%5KvF)df32x0
zY)KpibDsrPN@RHkcIdj_5*Uiwb~Ry}l#@9cwEyD0jWUJVG*B1v6+30CKYt5rDonr#
zbcLK)aCke#z_u>EYRK@c`HRMfWza;2NlCt%7lf~mJ-zd9JY+DZL@%`+{mBrdWHDcQ
z9LTkoS8TAC`l7zCP@8X)a0$KEnS`Fx?l>O1JoK;+k=!#PCfv?4j^_?@)Pe%fTOrve
zt(gja=_@<aXJSzcu|XvH0<YyAQ>}iwN_Nz2@s7kzvQOvGGTkfrIAG)HrU>pDBpfwF
zu@fVdy4RrNOB&9Nt(3ChE^%BRCbR%C-TgNb3gn5LNr5H#$S|OeM4=M}nis^@XCPrv
zOmIX}P6SdU5>^mOWe6`Gz@A;%`A^(KCaw|r^9YQ)OOdM<)B}aAZMeIp?v6X%YTV(^
zO<XrdtZrytyjYXq-B#Y~`@;FvU)EO=c@;iKmz`2ucn&CuRNs#1p1~ESg+;7Ay-m>S
z`OCEe6QE{thI=mmtLy2|nej`C&J{@(eZhE$DmXAtY}wZ)Hn8LK;0=#Ftznfc>+gF>
z-p85vtO5d%LEdV3CVL9;iXh+Is@_2{TThs`K`gF{SRNgL-4#kOiKlQFTX1_NOrGxo
zDXP!X(HovSKkwP%ewX)xZYbn#H_<p7LUUSHxg*)I)lK}?Y@1f2x~e3qE+2!8nOiPt
z+L;VLe;H`>%g4)S97k&Jc7dzDKxWi}cjUdERJ!mXBeo-Xhdy5Z4F3^6%Y}gNJd*<K
z5$5fZl`)4$R!b%5BIqm2uhd_0u0D$LKD%S5@``YH=X%;z2aGYa$J_B7VmV+eeIFnQ
z>g6{Zc!vN~CAwb^6>Sk@pg%`GcnCtC&``7@d=i2%QN|bJ<`^MLR7@@xc5`1?TUbFG
z1C-IbHN7gyufQI=y%c-CRJ|MZT8w6DLU5xCDn*QS#FGu^zSmQ2nIzAM&S4e;_2%8y
z^}A37s^+&^Cw$1yR$*Xq>1LRL*LWw4@0bX`3Z}?<`B?De4DDG_5I@Mc(L2$G+rlsb
z)KMAcg~ztuiwoQv$771lFr@myA{vkJdzJe-VjQ{W`8u+}`y)}6t+2xt<Yj#of?kv*
z$@+?Zqijn|z7`~Pd)mFP5&(!Yitfmpp=hLBkRFDAN1zkj^C;Qwq;fR)Vlo}$@q?W0
z=qHj#g0B-g3<!dZN0$ZDrSH{75F>c~94}s>s+{l$Sk5siC}DERoEcGE)D#hchx(gt
z_rJV&C?W9(E<q2+71nGh57EWQS&86MXIlh#;t9H;Epi)Q`}P@)Yn6U!@VjbsXhJ`B
zz|8b_<Xs%gX~jPmHs%ew0<U3fvfBe%9P@i1t6}rA#2dfBvpV5@a=ZBr0?%YFz_3aQ
zI0$F@7p5u_enWtsz+Y|<c7NHeO5gs!&vf5oJ<j1CI1WYd7>q9;Oni1uFoT>s<bV*0
zeMk#~lNsJj8H<zf+4CDsccKu9oDhNz1cR6L#ko~6z6{c?V;tAZYaF|)c1xM<ZC`<2
z^@f6@O<`9h?URcuGZYg=xWJL2E5s|(Fm4}sRu6C&Z#uJfIrm_|RTDMrEE=vj43lfr
zn43AQ83hp84V|T}vvzIUSKUj!C2BoT2c;A1x^t{H3@d2)7;Dh5IoGJZ(;4HcF9o44
z6Gr5<YoHz0X9e7M{jTYwOPz{?OR+(mDSkL^7#0~3+2$eTp>AAz`2x-}4F08ldPYr`
zo;BO49j&fqNdGMsB|}!M*BZ?FwwiIUAZ-|e?;ASlrxTXsOc=AUS>2-Dx+PxZgwbBF
zMSUK-U2Qu3T1a-S4DRGMlYmQyFW#dFPG5qzkrX$uQ-Kzr4t7h$B!z1L<yW_171s2%
zBc_yLafgX6Z1{Oli@WAfE<s8tY2c2~9n)#;Zu_}w+UmTHJY%l|8rx@;Ug^L_y-UKb
zBb&NRowJ)2el~U&Wvu)rnTv{ZD$-j9_r00J$84R=(wp*qfO0d=Fzw-k459Pe=A|nl
z0v{@gi=JVDy2pwm%GkTCexBz;Kqd&{^2Wpa<_Mvd?);{S3SfR0_(Gvdv*UdS<4FO)
z3nEJ=6q}%k639b)93e4~O+vXBuU`{zmB4P3E{8J2!wV7(6-F}zRwHd8m1gZxxQpI3
zW_yW97|vhs165!FOIpmqS0FyivyUVR*gkK-%sv%iF^e^I7ZzD7FtrVY(pRNUD4HcQ
zv#^yz=fOWaiHQo&oQUAASOLLm3pPmFw`OcWwM>mCqsKC|=g{B~CI{QIm!X1%jhQpS
z9(%WgFx~-%Ey<jdl;@S@!(rV1#FtZa!tf{-(C5<thYA0x&;Qlk|2jkX?gb)$Ec4C#
zc?zK}zE*QEks`%cago-5a+5r`7aQgIGZa|xN4R5^1aqg<m7cxa8_<WhLWC3D5TCNc
zo${##mOyXpc2~LVPPlhRhfjHVJ)gbbTp%pViYL>{kKtDhw4+p*ObW`=A%cT5Fe#d(
z$+uR{(44e>(*+X9ew_;2Sj+toqYm$sI%~MMWNDYI(_t1=w;Nln+w9mdNUwgxJ(o&p
z!9ZfFB}lJ7XRcgwTJPxpm~hH2;Q0Aqd114Sc8ekz(&^Znf9(|<mjQ+QPE%(&$4f}i
zV>PpkwVD(jEB4MJt~$kYHQEza{V=v=1phbe5#-O3^C92N^Dk{=&bfr$g`-P;_0Jb5
z-!gOV2MV0Sm~`REEJ_hRn(}2<G(pFL#`wShd*-SM%Aeg-!}m$;EcW0YTH4C>-cz%s
zW@o(5jcQmjI8q0b(-t%4V@xCstgcp}v2%$Y7Bwu&N?zval8oRDXNI<7ADk3JMQG$<
z(&VT3Y+K3$*j|9wE0<diKI3p2FO%z#Fo$JsD&9W4z)8>tF0N$*%tO1zyz7fWmuA{!
z@QGumEOIoH{KAi8TY)dXHo$(J#gvZk71xrHNuGT-7%`rTlV_Zo!(OU-j%icv9_-KI
z1nHQSr3ammb<N=qI>pfco?=Kl?ei@>EJ_17g>0S9U|fXm_LPN?1<!j-6^8cbF_QQ?
z>oEDA0!ut15`lj4Mm4xZU(w<oSp!GS-MKcH3C${XdIV3WBb@1PQFAiTOKs^)@cB={
zqcVZXxwHjCM?}}*VnsW%lXn{Ry5XDFQ+!j?pOZ6<)8mcsb%m$+Tv%p%H^g*WEbr@x
zY&IpE7$r#;PcjTssdv9?ip5+x;nonwW-|$hxr6!j1j3nYQ$ZUL))5;92#D+VVf}Bd
zn16E!3J~LS!d66mfQOZ0O#bMb%|ccx4vPj1S6XL6%PcW9tvw)I7-B;0=na*OYG`d3
zEcEDiTDIf%<`Bk0LsB{OE8YXVL#7X*enp;Y=cdNhg3+m!*L|AD%~tsvF9>TeUNQEd
zCE^6qv>v?G60wFbS<({Xk%G*#32rE?5^<HjUPRWjTf{cL1h#94PkEpSb>J1;{x<GC
z<XkN-gquWbk7C_(#I~>x@AA#Akp0+j7jzL5B60@lV<+q#T9pQhKYEb9ArmLmLyiBO
zplj;BiVS^~VaT8{hG|Ht#rRfNH3DN$?d98gb9u`7)O<NbX?6KhgWT707sPDM=6et%
z3L~IhD&pKqoXhVQQ?i-DgPtdQ?C^yoqP3!qE#~JZiaB)Vxr)}Jm6o7m<-3-sg2|hy
z;?iK=l_?b^gL0tqK-GaP=Ig5YhoNkgbLs^y%pJznP1s&i9g{ImqQgi-V_G(kvy+A4
zH6u$in${^rmQ&6MZFi?JDzi{P(MXHC=HOdW?xZxmE>9^k;D`opoxd=)>$VRnWF{4=
zgu@S?hwVK;ion71Q?M{fCP<6h8+9Z|>pD2wXq+ugvG1~%OlW9->&kCIjCuxVz*hX$
zzQ?iZehcS(p<t<>@<Z7bT>nC2%$hQcBk?A>+~7f?i(MX9?(xp1mu9DyGM!72HSSfl
z$Oz4QCzgy(V=oL3pQYF{Rx(Tx*~PbKFY*nBwbi=yuucV$ViM)}<a%k|$W>D3bSqy8
z88cp;2??o+fHgr1ilD6x(tjxLpv7V}g^jlHKGmPL=}$ey8ny4Ce(vkS=~F<Zj(UYd
ze>{6KE|Hw41~6<~g%~DzYSw1k;&|?j%Dl@2+$P=Xn^9hsFVRyG+Sh2H>*}g0F5Z3-
z_(&dHcGwwx)K_QrW~r;^fw{0^ym(VVev=6Cqyz|SWK-F)LA{ecs}>LxqO}YTZ-!+(
z;q?IN!|V*e1+fcZPiH1w{91m#?I0%~W9F{+g<u5+n#lvnwDEmJg_~1mkKuUHnV|HQ
zGsV9B7&!;#2`Pr*-eV8Przpr?EAHCUaT*!!73rIgnSNgdKoH0ZFS$Ai^E*yUbG^?S
zfFObC;AD8G4vbu6IZt)U3~D46wGQY+Jla20Z>3vxq^=;nN2!9lnbn26nbT!P!@-<?
zm@@+cu8jk=4{h5;B96lSU_YgX;==?z5f!rvshCB7Y}n!)jeh+=?s6@k8D`rK2g^!`
zrxUF6brMNGFtb9yj|rA;qmfby(q{u)1l@ywZ45JP!u|qMPs^OQhh(IM{|$%_6ww|E
zKHDcHv;9+yN~7%$hgofW@xJqrNGLGfok87#p`VTst3>_7L@R`X(Gl~k!p8%w(Grbc
zXv1DpfF-8i*dE{5URa%j1YP2)HcOmon(g{XqKn(6_X3Msu0IcIPtB$L{5A_|SNkoE
zZR(^u^A++I9BAg{utl6|;jyYf)sAW>t-#8D-_+*|1|FNcY2IH4uDJ9Tv=+eJObD2p
zX?`ELesjwF`L;!by!!u3i`3QA9uwzjpz>2-WYZ3YVzj&}24x^J>3#?9XC=s`8u)Ee
zrbY6C9wTeJ$qJE(7V-cb>5m<~$U_x(Pfq8!Pd{~E<6vrkbboxNjYLhU|LT>T6p^n0
z!X15P&Q4%xsyNNNXzz?(S{gDNb<flH4b<(|+g0y2+d?6rk==&PZIt=*tA?(URzLd}
zD*GSOQtuT)cj;;kZ9p3~c_#W+56}pfyGB-o?=a?(NOU4=sq!<wnO8tmuRV-kRz^bi
znlLrD+eKSqrHn0|XEC&76z#Xe40qx3jo+rO)7uN|Iv|@f%O8Kk*tc`3*gT=Fr1{!{
znOjF);f0B{l|1$<`XsuvL?L_`M4>cpAN!OvZj6==wUn7d>c|OG>mhmic;2Yk$hZ=?
zfd@%h+n~m5UDF91u)?AhThlL%(Ri569S6Spll1;NU?2si%D6$tk^|UxF*DY9)zD-z
z#bv2vY)Pt@Nquvxvkhay!QRZu^^K|3=5+O4SI&{D_Z*LmH2nhdRQRUOps_EpJH=hf
zCK$OVm|eW>q0~C{nqIERu*9DUb;(m2Up@A^1RChMCC<GMN*s+0JPD>=1#49=cpFG9
zTDi(`NBGuW)I?j;5BhPSt+-RujJefAYBF_T+%Lyx;Kihqw+s?2v5cE3M`<GEYms<I
zzI<oMJm>KKS)!abNcTs%<>ORqL=?|OIG)!`0lzHMo!%wrs*NtjvZY09C-U@O)g!5^
zIv|SW4SR#gC4hkCK@ccUzOjciiS)(ys!-D=iP_h*P$4(-rms){9|dnFadD=P6926D
z&_4EYGxjo`W&@&tD|SoAc03xlhl~MD%~=G=L^+P+Ty!sD-NA|aV>B7Z^R`z6IG+br
zm<`>r?2QC_UsF)yT&&0Xg1oOp(Ep;B*n0~fu~7GcgW&Dslj*yzqrxr;@D&sRZnOR?
zy^Fs-1AZqRTZ6wGV1ClOC{+ZkRpk)5>j7@pj+JQHp6d|0NKL5FEd2%0$P6TKDbvg!
zyy}nDFzTB>p3Fvxo<V)tLXZ}UAmQ;wFi2BRP@7B<-pm{w9Zt5(clvnp@a6I=gttox
zd2}}%9B0*M6M@{!RBSSaJR%6eo*Hm8!08DK34MXCmT(M_s$Ht|$+TpG9%Fc-#smd3
zX!(+1wxN1JpN6xc$2o%GTcVG=^({vl1ojwZniM3iBepb;FS@!4t(_a(%Q~~nn;cA8
zNkO<u4QEhgooDj<Uk#MnG<OD&ekFY0?})`1rFEBZXx{RX_!ag2azRVmF?;@eP2+B|
zzdHOe<5FhGgIUwSnv(Qqf3IL2%w($LGvyX-y8=0i`%YWz;>H44xfj?~8yO@K-42c#
zyTODmB@6do_d2<FR`Zn{)pHCjRX;m3a_^}YW<3w6iL6!`X9#BEwA54R$%!PTDOQ=N
z3}p!nc(oH@)J9oHvvIql#3IH7dkrI5%LU6szV-4Y0d~^ru>|~LZIAqDG|?lSQQ;;&
z2qsyVG8fmH)=I+;9-JeM`5YFwOY6gW1f6rh674zNkivf6fm}iIx!TA@%TXt;=5h#%
zhH&FMx`&~+-1`gW*YDFa%wFOagiqkSE^sme?XvChu~&P+Eu8bpI4aP%YPX*niCBWw
zLh95H>xi0I#FJn`mY?>0!e<(Uh!MgbLk59L*q!%*N5WZONmz)xU7&KGokQOuqcP>T
z^WBbbgz=XtR)&$!ZiH+wmc7c@py~zA;D)V{6W(IV5n|y>@DM!0V}y9+lt<1q?ec~D
zHH6p^c-d8DZlO4MT`;@)!6dDteVC6W=-d*^Rs-KG;SPz%n^9^c&LP|~%Fonsf*FWV
zRbZQ~!sz=qR=*DX<e*}(SOBj*qi@ED-v|DmJiMMb=|#v%OLp-gdH{T|r^}1T$B3Ds
zMarcq#pF<dp`ljm_nXYc*{W9JA6O9{fV|=xq_aWe1TYfPU8+w3(X@B34{<uUNAc|O
z(vZ_g<YCI-ve#e=%s+gIr`%}AEL&jT;fHd=lXcMrE{8_qj2iOy!cH!1^keeH5zkH<
zU?E?gfkKc_(XUY;#ss&)b-qH*aMQ^Tpkq#bw=Da5zny`5H%^W<m4O8+Z?UoZ5bqsp
zTUmN<5UTK!GMaA4Yva8RH}VT`n|9NeCF!r@cQ`j>8Efw_NE;_yp)}UYRQ!jIM^nrF
zPrP6{M;tf(&~L-3s}~ef`HZz4QfLKGXj6|DN(|0eadB8G-Y6`mNc1VeTdQ=NZA13;
zxP6BBwSEOB&_5mkJR;ozJA!{DV<%u>Xk}|4Vq$A&FYloHz5f5&{q`tX$fGC&Zpl|!
z+f*Bi!M&}U7xUxOg5)peLxe$!Mh>xvXPvK?R+*a7pIb05^2+ATe(W5r@k=PYQa8HG
zd(7p{nX+@zgCwi?V3YsmWT+8vX})nR!|m$f^3;kB=$*}*Ue)3B978P;OgmgGEM#;8
znsqfG$%fIhkR%$r63BTtEJh`cS@4Qc8~I*vp0^Ca(vfN5h;{6raqF?}j!!RL?E`ga
zjMUyL^t^T|Rx8q&kyou&l8;zPvox+(EG|>U5}*TIBA{a^k#+5QBg+19g;m4QG?jla
zr5U>mOK0A6S|Y_klvZ&7c`(_awy9LDDTys2Hfsn`YvLp|p)OzDp?REw#e<OoCoo%e
zp-8RV3^ete1nc-9SO%MdfUh}t$^|`;e~Mzh$Y7UXp~=MBeUyGXaz&-aIIcW>U>W2R
zf<;j=LZV1py-9AsUM;_+(CLN@-gBl1a-Z|dL_HJU%aCpOWw4Zw2-5Pc;FcWtrg2nj
z;WiqqjY+VgKF?qg)+DH0s%5zLKe{nKPpL6B#L8(s(u;;M?4puS3C6`e>5zhHL`&-m
z_SI<_vI!z`A;#+Y*bH5F2G*Ad9XhWQ>@5C%9luRC={nqg&e=FAD&oa}^T~TsFbsM!
z6^|iAUe1mxMU!dfE-jDOvniPm0#gR>lF<jKHi#`pg~@skQKn!&_<b2p#5Xob-QohH
zk|5Si-YD9QVU1!Rx4s73NId9z%T^50if9XPFIJ*Grq9krH<b1Ku&?D(a9A0#<%`Mc
zMkUayMWsrcSnJBo$tIY1_!{BbWiVo<;?ndW;Z6*7Oc0z(A8o|2VP0lxBwpEVNg4w7
zBbeWr7Uq$4bcT=M!Na`t+xl0oi)QxaDd2C61klo6SLesloNGF-a%mMR)xtY1P;Y)c
z2RE4Cnp^*haMRu`oz_iFe31n`#T5?bm(w!UkC6HP>f+ip%8<?Eq(CdA$18viUH0h1
zBh!e7bLQfdZiJ>Ffx3XVW*>w;PCiSgUc7r3mRv0<PM2uI{KXv`__%0m9YP_dYz6m)
zMUSV?Db^jz*awdr5D=Kj;0yA}vfF7{$Ya45y(ZYfNLnsUQ6F^oYA(1&QNIp!GJ#&x
zU)U04=gi08#%K|(xh&?m;iv5xh8)0!S1E>9vXIPkGMf9XhH(Tv7$mBMwFN>+AzLt{
z<isF6J0c7O#q)^Y7T3jojYy)}<kIl6RBYN#l-4mzsolB@J)NEbV-mWHLGpmf$bMi#
zGW^As-maU5jk`uq&~$mUqtQNxdj^f%K_BUvh8AC%RuAO?60W!N3nL=@E|>=42KviP
zaUOT+uWYej2!0(y;()l4zj;=F0gTZczmL)KE_U_?7XQYkkRCfE(Zz=vI5uBwQCl}_
zIwQQyB7h>)9e@#yj`5oA)xKv6{!|PJ3fYvvs)VvH3_(W_GPwz2A%C}O8q@jM<49U#
zi&snAvyNxxiG&Cd#OA2ks{SLu=4e^MgkFO$$;P1c7w@9^>W2EnvKEc-SEW{vLftrR
z<6ocJg>ec}sW8iQm!wsAcgSVJEY*PFaT%+@GePJOPPC#dixOdhYo0Vs<A{biHnPbR
zhoS(p;27vaTX_sLh-OX9-bdMsNC&yraYXyN)K%4as<=^5+F46!vl+ao0F_jtfxA&q
zaURGCy=;#+6arJo0uly(Cz^%Z{i;tH)o1IOghiRLXH{u00W$~xv8i)u?L-A!>6BfU
zF+g_4XgWE^5|RB&A4}nqX4VT4AJpmCcDo7)j>~nqA>feFoXsliWGa-mcK39AfD;EO
z3965JmGA~=)OLP@)C_IVGoU9V*7<E0HQuc4*~xVFv|uANIb4OtfcJ|WHRvK9vm>=f
z&|jOB7R}ff0??ez0Ams3?@jvCwENw$`nTofTlqDs$ycZkGL)z=b{)$K%qVQQ^sEQ&
zOqkLnDM`^5P=*L@&3s)=@#=O<w0FF>n_*-;HxM^~9hb#|z8|Q`WCp=?+Nt|)+R~br
z=L4`cP@f3)5-a2UXpZR?mLttHEi+`Ya>hl@oWDY=jQ~B@hjG#pNA7)mt?>J@JBm9V
zH;EN(!Y?S<FD+!#4DCM#_%Bz!$}V<|37$`WB+M)3Y=aa`L{MMhi%5$>7F=@xZ`-x^
zJyYq=E{on)ESOyK?^JQ$Z#FO7+mqi0i>=T)%?Oj+xDkj<(|Y%k!<0=1N|mk!S{#aH
zlE!EglG-Otpt?emg6s}%wZJZPn6kMc9n1V<G|aXRVR?UB`rO#09rU(BKNm;MIEnYG
zV!A+1<3kIa%uJM`M-=G_w+{i>4X50#HxbE636>NHFsi<aUMQ?r>e4W7E=Re>*~0Vc
z`P?TbYu=G}yC;OiEh?U${Y!gBRwxq8{oF9ajIHzOtPPNSRX5tHLB6WcUqCuTInCRu
zd=`mb{rYSRhZ@}c!LTN7u)i`x7FeYWn2d>^0i3E*if=K^z<AG)@)GakoH~6f!>|Z)
zY)AJZ_K6RsH6DWQdJu)+n@G{Qqm;^#Qwu{b`C$ql8sq*E@lDBu-gl+R+n-T0FIX~}
zGqR8ixFfdetrHEfD0vEXdTKaw1Mg`Fs)dN|F@Eh<B6X10+<?`_Ak-i2kH2@T|36mx
zFN=-C*Hf<$A7s=a-#wE6>*mrm$fB(QL#lA5RDAK8LPdDuO?Edn1ymgP8JauL8i<ko
zt7MxmyWvrrg6t>a(5RBBo%CCo)oza0?nX}4%^d9y?)UJ7fx<{5!OWA$XcNA{VpaTf
zf!2~872Zo4OjH6LN#0z*y~55mvi`yM!1$12^wX(U(*lHp<LQ$T8YD*j#V(|=BgHZA
z+A4|6iYXQ4(e-n)Fm0;vm04z5`sim4%^%7GNVRAy!vLDo&arnzo#UNg=ju4rp=SzO
z199D%lhwAK;;ag7bkN+(nt^rQX7UVVin-c`bxNVpu#@5Wlp>6D7|_tF5$t!E?C?RG
z7lsJ5QR31rB(Ty=2@D2ZQdTKNWl&;_HH$4CXq3{Ot_!JZachGyEhRg|SW~ZRHCi+#
zcaL1KSZ~)8B5-9ju<$)NR;tJgBm^We3})I|El@B%ML&Z*H2S=e-W8_Wv*C)dBN<NT
z2kWCY$`Fj@G1N~LM^&B_$(Z^q10TvWEpA<~*jp5tjDb{JtrHfX$)3Z&PiJ@{#%QrA
z-^#2np3jK%t-oZ$FkWizqC<;z9k9D7sjycBi@_YMgZzF%Gs{>abJwTB#iE3yBOH{a
zs%+ed!dTr;+a3ZtCmO<vVI8bFoN?8vd9NVDMG7T?OpU{NnwjdQSO}8i*lwrUiL>BG
zDaiz7_oKziODI+C9?c8II)EdJo@cl6TDGL|b0v%>tED>C<;y8kFP_T7W*netjkK^|
zJ}4h_lJg5=eBDvs<L+?h;TaFM>+0FX898KKl%86ZR)7xV=|Y1IaN2kfbHi9PvG~YY
z7tDDDs+GVGF~BJ%dc__U=G`-)PmI-t)-)pW)f?P7n9MhG{SH|6hWbF`#^>(#A@kEI
zzY2UzK2g8pL_;-%P4d$5hh|*pII)8@W!7WdhRt2?BM!9%n3`$>(0S^i^em4FA1){j
zQMSepjX2$n6nhlF4N&z_xfke~Qu4-M-f8y?!|Rpp1}z9cHCO|^$ckD|>H#Z#&w(K@
zKWN$>z~BudL{0%Ra<O?pGN70<_mbE(xO0w=To?11muU|od28aH<|k1#SQLB=!;t)!
zn{R&oDiI#Llu-eLJm6{q5CP!#U3wpI)%~Ak_ji64+kXa(3IYiA4G9T!0=PjBK>3e`
zJ>Xma{vZM!^MCtOT3CUfR$N8|aP9urWOe2IQQt&}6ac?(Ir{r~=ksmv_n&0a{4(Mq
z!tx3)q(y#4Sbstcn7h6|h(KTYQviQ|6F2&&6o5_8Pbu2Ir}!?1^iK%^0;E4B-2XM<
z_ZSAhF&q2p8|DK3>kQ!c{Co0muNog*z-sCzA*R0p{tm44w{H5=9QCXQ%%TEjZEHZu
zg?<72))@Z;_;ig1Sgkp`@H^NW1C(q{^nS=RKV{rKQn4!nFf9Ro#J?~)0`l+&M)AMP
z@Yj~{DIRE{>xu>-uX2FYw7=kK11!IPz!SCA(Kk0x1c=FtSy>oJSy`DmSpONi99HIv
z9$+}D1vK)v<K4fX8XpKiIIBNE0~CDC9qa(N#6(QY4fyr+4D9Trbu4v^{*IgQH1ET3
zS|Z={ux|k*zvev{5Eb+f1j>KKwg4C|3{8w20AknxVfa7iUEg(hEf!EE+<<S1{_l(f
z-Zeh@0F{D2KtF9yF+k`C^Z%CdJQw;VB|yf309E|$`~Ul?@exA*Bf6B8(SNN4-5V3?
zJwOd$1IkSHHxl4o<1+_{yYYvt{t`Ft&&6k7ty{qXd}2p{QGoClOc207|A6^D*6N?p
zPF>X!PXU!V1E|bj+erh^FaCfgU}a_hEr^D-w2p}-z=HZCbjH&zK;BOm)C=fMQGm>T
z3xM$VQ{$5Wh?@5Y=<i)X*x5kO;XhjFPf_bbv=4ItV=EP)0s&XY{`1uM<N$`#KcN2g
zQGCb#mgzrN#M7X)e*@R}giHMq_elubr}=yuB=85Gx%?mTerfvu7BcWD%hLdKKUf?U
z|H$&sBhJ&fGe6))HUBdeejkAUI350+zi;9(Pb1Cz0HoFW?{R0IqI^sB?UVfWd<z2e
z*Yj;2n+Kr$)aKs=X`Uv28WQI3<ba{>&2NeSKJ@=-@%_Y<`V{_Yn2#Uuu{yuO{{;Je
ztH|(sZ~RtoPXlWFK=su97pVUbUgK&0p9U`Y!Q^f5FPMII`vH{B`sXkPPpO{j#{Zx)
zH~uH8|Dq!Q6#l6I`VV+u(|>~h-V*;LhyIl6sgmjsDiYg&LG@Rq{jchJDn|K(L<A7L
z=}E8uy=VQiH09G0J=N~}LFVuLPh>xzEkDJ4svPwLQ_b_AFuym*U(kR3<ENv#rz}q;
zihi&td;iAr|7gDp7Cps$Dv$63lP>so%zrPI@RaB2mHi()AfdnU{NBX>>H_~$&Zifz
ze{fcY|8LGe4_8k;WPf04Wd3i=KlsZ&&Gb`u#2*B&a{dLu&!g0zOYqbg><0l;-fskd
z&l3N}jQg}CPn|b@5FHi%M)X^E{io0E>4EqU<j*C)A^+Z){(}DV@%Yn1JUxi~LA6u<
zPgMV7E`56b_5)V9@}FS84;cS&8uzpSPp$Mnm_llQV|u!O_^IyxM}eMNj(^Z-)c;2F
z6YTc_{q_2XvG1t~@dti&<G;ZF?*_%E_4U*$@`Fgc^*;;4|7Ih3B?$)D1AU7X!vKT`
M*rKHXk^lkyA6feZlmGw#

literal 0
HcmV?d00001

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..02f9ef5
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Oct 25 14:19:59 CEST 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..9aa616c
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,169 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..f955316
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/languages/mbeddr.arduino.core/languageModels/intentions.mps b/languages/mbeddr.arduino.core/languageModels/intentions.mps
index 56ee760..15a49ff 100755
--- a/languages/mbeddr.arduino.core/languageModels/intentions.mps
+++ b/languages/mbeddr.arduino.core/languageModels/intentions.mps
@@ -5,7 +5,6 @@
     <use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="-1" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="-1" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
-    <use id="3c4c8461-a533-4459-916a-dc0176793b4c" name="mbeddr.arduino.core" version="-1" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="-1" />
     <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
diff --git a/languages/mbeddr.arduino.core/languageModels/typesystem.mps b/languages/mbeddr.arduino.core/languageModels/typesystem.mps
index 211b5e6..471ee71 100755
--- a/languages/mbeddr.arduino.core/languageModels/typesystem.mps
+++ b/languages/mbeddr.arduino.core/languageModels/typesystem.mps
@@ -3,7 +3,6 @@
   <persistence version="9" />
   <languages>
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
-    <use id="3c4c8461-a533-4459-916a-dc0176793b4c" name="mbeddr.arduino.core" version="-1" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
     <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
diff --git a/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl b/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl
index f9f147e..5da5ab5 100755
--- a/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl
+++ b/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl
@@ -187,6 +187,20 @@
             </external-mapping>
           </lesser-priority-mapping>
         </mapping-priority-rule>
+        <mapping-priority-rule kind="after_or_together">
+          <greater-priority-mapping>
+            <generator generatorUID="151f32f8-2c45-4b6c-ad8c-3b4e2f69cfdb(mbeddr.arduino.core#2350648883898979172)" />
+            <external-mapping>
+              <mapping-node modelUID="r:8770c24e-2b22-4d05-be0a-320d33d9ae04(mbeddr.arduino.core.generator.template.main@generator)" nodeID="2350648883898979203" />
+            </external-mapping>
+          </greater-priority-mapping>
+          <lesser-priority-mapping>
+            <generator generatorUID="3bba6cee-44fc-4378-bb35-082abd0dafc4(mbeddr.arduino.interrupts#5152824560131035305)" />
+            <external-mapping>
+              <mapping-node modelUID="r:76179f52-9153-4ef6-8a48-d3184b69d054(mbeddr.arduino.interrupts.generator.template.main@generator)" nodeID="5152824560131035306" />
+            </external-mapping>
+          </lesser-priority-mapping>
+        </mapping-priority-rule>
       </mapping-priorities>
     </generator>
   </generators>
@@ -269,7 +283,6 @@
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
-    <language slang="l:3c4c8461-a533-4459-916a-dc0176793b4c:mbeddr.arduino.core" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl b/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl
index eb8ee70..b1331ca 100755
--- a/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl
+++ b/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl
@@ -22,9 +22,7 @@
         <facet type="java" />
         <facet type="java" />
       </facets>
-      <external-templates>
-        <generator generatorUID="151f32f8-2c45-4b6c-ad8c-3b4e2f69cfdb(mbeddr.arduino.core#2350648883898979172)" />
-      </external-templates>
+      <external-templates />
       <dependencies>
         <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
         <dependency reexport="false">2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)</dependency>
@@ -78,10 +76,8 @@
         <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
         <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
         <module reference="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" version="0" />
-        <module reference="3201b692-7d0a-49d1-ac65-5d4aaeb141fb(com.mbeddr.core.buildconfig#7717755763392579406)" version="0" />
         <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
         <module reference="783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)" version="0" />
-        <module reference="7f02a174-6bab-4ef7-8a81-22b54a82846a(com.mbeddr.core.embedded#6847490852669402965)" version="0" />
         <module reference="61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)" version="0" />
         <module reference="984f0332-8a86-4f5c-9184-03eae96b5d16(com.mbeddr.core.expressions.runtime)" version="0" />
         <module reference="f93d1dbe-bfd1-42dd-932a-f375fa6f5373(com.mbeddr.core.make)" version="0" />
@@ -112,26 +108,10 @@
         <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
-        <module reference="151f32f8-2c45-4b6c-ad8c-3b4e2f69cfdb(mbeddr.arduino.core#2350648883898979172)" version="0" />
         <module reference="e562f51e-6403-4857-b773-44632077c67d(mbeddr.arduino.interrupts)" version="0" />
         <module reference="3bba6cee-44fc-4378-bb35-082abd0dafc4(mbeddr.arduino.interrupts#5152824560131035305)" version="0" />
       </dependencyVersions>
-      <mapping-priorities>
-        <mapping-priority-rule kind="before_or_together">
-          <greater-priority-mapping>
-            <generator generatorUID="3bba6cee-44fc-4378-bb35-082abd0dafc4(mbeddr.arduino.interrupts#5152824560131035305)" />
-            <external-mapping>
-              <mapping-node modelUID="r:76179f52-9153-4ef6-8a48-d3184b69d054(mbeddr.arduino.interrupts.generator.template.main@generator)" nodeID="5152824560131035306" />
-            </external-mapping>
-          </greater-priority-mapping>
-          <lesser-priority-mapping>
-            <generator generatorUID="151f32f8-2c45-4b6c-ad8c-3b4e2f69cfdb(mbeddr.arduino.core#2350648883898979172)" />
-            <external-mapping>
-              <mapping-node modelUID="r:8770c24e-2b22-4d05-be0a-320d33d9ae04(mbeddr.arduino.core.generator.template.main@generator)" nodeID="2350648883898979203" />
-            </external-mapping>
-          </lesser-priority-mapping>
-        </mapping-priority-rule>
-      </mapping-priorities>
+      <mapping-priorities />
     </generator>
   </generators>
   <sourcePath />
diff --git a/projectlibraries.properties b/projectlibraries.properties
new file mode 100644
index 0000000..38b0239
--- /dev/null
+++ b/projectlibraries.properties
@@ -0,0 +1,2 @@
+# To override values defined in this file create projectlibraries.overrides.properties and put overridden values there.
+mbeddr=${martian.home}/gradle/build/project-libraries/com.mbeddr.platform.distribution
diff --git a/solutions/mbeddr.arduino.all-scripts/mbeddr.arduino.all-scripts.msd b/solutions/mbeddr.arduino.all-scripts/mbeddr.arduino.all-scripts.msd
new file mode 100644
index 0000000..9794860
--- /dev/null
+++ b/solutions/mbeddr.arduino.all-scripts/mbeddr.arduino.all-scripts.msd
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solution name="mbeddr.arduino.all-scripts" uuid="4a0a7834-8ed5-431c-a4ac-1279fcbbd16a" moduleVersion="0" compileInMPS="true">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <sourcePath />
+  <dependencies>
+    <dependency reexport="false">752496a0-da43-4b5e-bd15-ea1a5aa211f6(com.mbeddr.allScripts)</dependency>
+    <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
+  </dependencies>
+  <languageVersions>
+    <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
+    <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="2" />
+    <language slang="l:698a8d22-a104-47a0-ba8d-10e3ec237f13:jetbrains.mps.build.workflow" version="0" />
+    <language slang="l:58f98fef-90ad-4b72-a390-fad66ec7005a:jetbrains.mps.core.properties" version="0" />
+    <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="752496a0-da43-4b5e-bd15-ea1a5aa211f6(com.mbeddr.allScripts)" version="0" />
+    <module reference="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" version="0" />
+    <module reference="4a0a7834-8ed5-431c-a4ac-1279fcbbd16a(mbeddr.arduino.all-scripts)" version="0" />
+  </dependencyVersions>
+</solution>
+
diff --git a/solutions/mbeddr.arduino.all-scripts/models/mbeddr/arduino/allScripts/build.mps b/solutions/mbeddr.arduino.all-scripts/models/mbeddr/arduino/allScripts/build.mps
new file mode 100644
index 0000000..73d48eb
--- /dev/null
+++ b/solutions/mbeddr.arduino.all-scripts/models/mbeddr/arduino/allScripts/build.mps
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:413c9ff0-7bbf-40fa-8922-c71bcdf08f3e(mbeddr.arduino.allScripts.build)">
+  <persistence version="9" />
+  <languages>
+    <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="2" />
+    <use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="0" />
+  </languages>
+  <imports>
+    <import index="3fk" ref="r:caa661d5-e529-469c-bb25-dfa7a83b768e(com.mbeddr.allScripts.build)" />
+    <import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" />
+  </imports>
+  <registry>
+    <language id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build">
+      <concept id="5481553824944787378" name="jetbrains.mps.build.structure.BuildSourceProjectRelativePath" flags="ng" index="55IIr" />
+      <concept id="7321017245476976379" name="jetbrains.mps.build.structure.BuildRelativePath" flags="ng" index="iG8Mu">
+        <child id="7321017245477039051" name="compositePart" index="iGT6I" />
+      </concept>
+      <concept id="4993211115183325728" name="jetbrains.mps.build.structure.BuildProjectDependency" flags="ng" index="2sgV4H">
+        <reference id="5617550519002745380" name="script" index="1l3spb" />
+        <child id="4129895186893471026" name="artifacts" index="2JcizS" />
+      </concept>
+      <concept id="927724900262033858" name="jetbrains.mps.build.structure.BuildSource_JavaOptions" flags="ng" index="2_Ic$z">
+        <property id="927724900262033861" name="generateDebugInfo" index="2_Ic$$" />
+        <property id="927724900262033862" name="copyResources" index="2_Ic$B" />
+        <property id="6998860900671147996" name="javaLevel" index="TZNOO" />
+        <child id="927724900262033863" name="resourceSelectors" index="2_Ic$A" />
+      </concept>
+      <concept id="8618885170173601777" name="jetbrains.mps.build.structure.BuildCompositePath" flags="nn" index="2Ry0Ak">
+        <property id="8618885170173601779" name="head" index="2Ry0Am" />
+        <child id="8618885170173601778" name="tail" index="2Ry0An" />
+      </concept>
+      <concept id="6647099934206700647" name="jetbrains.mps.build.structure.BuildJavaPlugin" flags="ng" index="10PD9b" />
+      <concept id="7389400916848136194" name="jetbrains.mps.build.structure.BuildFolderMacro" flags="ng" index="398rNT">
+        <child id="7389400916848144618" name="defaultPath" index="398pKh" />
+      </concept>
+      <concept id="7389400916848153117" name="jetbrains.mps.build.structure.BuildSourceMacroRelativePath" flags="ng" index="398BVA">
+        <reference id="7389400916848153130" name="macro" index="398BVh" />
+      </concept>
+      <concept id="5617550519002745364" name="jetbrains.mps.build.structure.BuildLayout" flags="ng" index="1l3spV" />
+      <concept id="5617550519002745363" name="jetbrains.mps.build.structure.BuildProject" flags="ng" index="1l3spW">
+        <property id="4915877860348071612" name="fileName" index="turDy" />
+        <property id="5204048710541015587" name="internalBaseDirectory" index="2DA0ip" />
+        <child id="6647099934206700656" name="plugins" index="10PD9s" />
+        <child id="7389400916848080626" name="parts" index="3989C9" />
+        <child id="5617550519002745381" name="dependencies" index="1l3spa" />
+        <child id="5617550519002745378" name="macros" index="1l3spd" />
+        <child id="5617550519002745372" name="layout" index="1l3spN" />
+      </concept>
+      <concept id="5248329904288051100" name="jetbrains.mps.build.structure.BuildFileIncludeSelector" flags="ng" index="3LWZYx">
+        <property id="5248329904288051101" name="pattern" index="3LWZYw" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps">
+      <concept id="1500819558095907805" name="jetbrains.mps.build.mps.structure.BuildMps_Group" flags="ng" index="2G$12M">
+        <child id="1500819558095907806" name="modules" index="2G$12L" />
+      </concept>
+      <concept id="868032131020265945" name="jetbrains.mps.build.mps.structure.BuildMPSPlugin" flags="ng" index="3b7kt6" />
+      <concept id="5253498789149381388" name="jetbrains.mps.build.mps.structure.BuildMps_Module" flags="ng" index="3bQrTs">
+        <property id="1500819558096356884" name="doNotCompile" index="2GAjPV" />
+        <child id="5253498789149547704" name="dependencies" index="3bR37C" />
+      </concept>
+      <concept id="5253498789149585690" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyOnModule" flags="ng" index="3bR9La">
+        <property id="5253498789149547713" name="reexport" index="3bR36h" />
+        <reference id="5253498789149547705" name="module" index="3bR37D" />
+      </concept>
+      <concept id="4297162197620964123" name="jetbrains.mps.build.mps.structure.BuildMps_GeneratorOptions" flags="ng" index="1wNqPr">
+        <property id="4297162197620978188" name="strict" index="1wNuhc" />
+        <property id="4297162197620978190" name="parallel" index="1wNuhe" />
+        <property id="4297162197620978193" name="parallelThreads" index="1wNuhh" />
+        <property id="4297162197621031140" name="inplace" index="1wOHq$" />
+        <property id="6535001758416941941" name="createStaticRefs" index="3Ej$Sc" />
+      </concept>
+      <concept id="3189788309731840247" name="jetbrains.mps.build.mps.structure.BuildMps_Solution" flags="ng" index="1E1JtA" />
+      <concept id="322010710375871467" name="jetbrains.mps.build.mps.structure.BuildMps_AbstractModule" flags="ng" index="3LEN3z">
+        <property id="8369506495128725901" name="compact" index="BnDLt" />
+        <property id="322010710375892619" name="uuid" index="3LESm3" />
+        <child id="322010710375956261" name="path" index="3LF7KH" />
+      </concept>
+      <concept id="7259033139236285166" name="jetbrains.mps.build.mps.structure.BuildMps_ExtractedModuleDependency" flags="nn" index="1SiIV0">
+        <child id="7259033139236285167" name="dependency" index="1SiIV1" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="1l3spW" id="7uZw0yZ43Jk">
+    <property role="TrG5h" value="mbeddr-arduino-allScripts" />
+    <property role="2DA0ip" value="../../build" />
+    <property role="turDy" value="allScripts.xml" />
+    <property role="3GE5qa" value="mbeddr-extensions" />
+    <node concept="398rNT" id="29MdNZ_L2TB" role="1l3spd">
+      <property role="TrG5h" value="mbeddr.arduino" />
+      <node concept="55IIr" id="29MdNZ_L2UB" role="398pKh">
+        <node concept="2Ry0Ak" id="29MdNZ_L2UM" role="iGT6I">
+          <property role="2Ry0Am" value=".." />
+        </node>
+      </node>
+    </node>
+    <node concept="398rNT" id="5ueaxoTn60W" role="1l3spd">
+      <property role="TrG5h" value="artifacts.root" />
+    </node>
+    <node concept="2_Ic$z" id="2tMMEJ5g6CU" role="3989C9">
+      <property role="2_Ic$B" value="true" />
+      <property role="TZNOO" value="1.8" />
+      <property role="2_Ic$$" value="true" />
+      <node concept="3LWZYx" id="2tMMEJ5g9j1" role="2_Ic$A">
+        <property role="3LWZYw" value="**/*.info" />
+      </node>
+    </node>
+    <node concept="1wNqPr" id="2B1T7v1mQPD" role="3989C9">
+      <property role="1wNuhc" value="true" />
+      <property role="1wNuhe" value="true" />
+      <property role="1wNuhh" value="4" />
+      <property role="1wOHq$" value="true" />
+      <property role="3Ej$Sc" value="true" />
+    </node>
+    <node concept="2G$12M" id="3$3J06Wfv3S" role="3989C9">
+      <property role="TrG5h" value="allScripts" />
+      <node concept="1E1JtA" id="29MdNZ_LmqX" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="mbeddr.arduino.build" />
+        <property role="3LESm3" value="2ce61d63-b3b4-440d-9d3c-f64799660d3f" />
+        <property role="2GAjPV" value="false" />
+        <node concept="398BVA" id="29MdNZ_Lmr3" role="3LF7KH">
+          <ref role="398BVh" node="29MdNZ_L2TB" resolve="mbeddr.arduino" />
+          <node concept="2Ry0Ak" id="29MdNZ_Lmrb" role="iGT6I">
+            <property role="2Ry0Am" value="solutions" />
+            <node concept="2Ry0Ak" id="29MdNZ_Lmri" role="2Ry0An">
+              <property role="2Ry0Am" value="mbeddr.arduino.build" />
+              <node concept="2Ry0Ak" id="29MdNZ_Lmrp" role="2Ry0An">
+                <property role="2Ry0Am" value="mbeddr.arduino.build.msd" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_Lmrs" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_Lmrt" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="3fk:2e9IswdwtSv" resolve="de.slisson.mps.all.build" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_Lmru" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_Lmrv" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="3fk:3AVJcIMl$vr" resolve="com.mbeddr.build" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_Lmrw" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_Lmrx" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:78GwwOvB3tw" resolve="jetbrains.mps.ide.build" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_Lmry" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_Lmrz" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="3fk:6ucYLjoxZBc" resolve="com.mbeddr.platform" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="3FxUZ7Mck1" role="3bR37C">
+          <node concept="3bR9La" id="3FxUZ7Mck2" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="3fk:2UI1wmC3vC5" resolve="com.mbeddr.allInOne" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="10PD9b" id="7uZw0yZ43Jl" role="10PD9s" />
+    <node concept="3b7kt6" id="7uZw0yZ43Jm" role="10PD9s" />
+    <node concept="398rNT" id="3$3J06Wfu3s" role="1l3spd">
+      <property role="TrG5h" value="mps.home" />
+      <node concept="55IIr" id="3$3J06Wfu3t" role="398pKh">
+        <node concept="2Ry0Ak" id="23LEVbRX3hR" role="iGT6I">
+          <property role="2Ry0Am" value=".." />
+          <node concept="2Ry0Ak" id="23LEVbRX3hS" role="2Ry0An">
+            <property role="2Ry0Am" value=".." />
+            <node concept="2Ry0Ak" id="23LEVbRX3hT" role="2Ry0An">
+              <property role="2Ry0Am" value=".." />
+              <node concept="2Ry0Ak" id="23LEVbRX3hU" role="2Ry0An">
+                <property role="2Ry0Am" value=".." />
+                <node concept="2Ry0Ak" id="23LEVbRX3hV" role="2Ry0An">
+                  <property role="2Ry0Am" value=".." />
+                  <node concept="2Ry0Ak" id="23LEVbRX3hW" role="2Ry0An">
+                    <property role="2Ry0Am" value=".." />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="398rNT" id="1YLj_r8S5c7" role="1l3spd">
+      <property role="TrG5h" value="mbeddr-allScripts.artifacts" />
+      <node concept="398BVA" id="1YLj_r8S5c8" role="398pKh">
+        <ref role="398BVh" node="5ueaxoTn60W" resolve="artifacts.root" />
+        <node concept="2Ry0Ak" id="1YLj_r8S5c9" role="iGT6I">
+          <property role="2Ry0Am" value="com.mbeddr.allScripts.build" />
+        </node>
+      </node>
+    </node>
+    <node concept="2sgV4H" id="7uZw0yZ43Js" role="1l3spa">
+      <ref role="1l3spb" to="ffeo:3IKDaVZmzS6" resolve="mps" />
+      <node concept="398BVA" id="7uZw0yZ43Jt" role="2JcizS">
+        <ref role="398BVh" node="3$3J06Wfu3s" resolve="mps.home" />
+      </node>
+    </node>
+    <node concept="2sgV4H" id="1YLj_r8S5bC" role="1l3spa">
+      <ref role="1l3spb" to="3fk:7uZw0yZ43Jk" resolve="com.mbeddr.allScripts.build" />
+      <node concept="398BVA" id="1YLj_r8S5bD" role="2JcizS">
+        <ref role="398BVh" node="1YLj_r8S5c7" resolve="mbeddr-allScripts.artifacts" />
+      </node>
+    </node>
+    <node concept="1l3spV" id="7uZw0yZ43Ju" role="1l3spN" />
+  </node>
+</model>
+
diff --git a/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd b/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd
index 6798de1..784dd88 100755
--- a/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd
+++ b/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd
@@ -9,11 +9,23 @@
   <dependencies>
     <dependency reexport="false">f1fb7b1c-ce0d-423c-9369-4a661d600029(de.slisson.mps.all.build)</dependency>
     <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
+    <dependency reexport="false">7ac0dfb8-7d5f-4573-ab80-81af2106ce03(com.mbeddr.build)</dependency>
+    <dependency reexport="false">3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)</dependency>
+    <dependency reexport="false">cbbb9e79-84e5-4c2e-b1a2-11a381c7baf9(com.mbeddr.allInOne)</dependency>
   </dependencies>
   <languageVersions>
+    <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
+    <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="2" />
+    <language slang="l:698a8d22-a104-47a0-ba8d-10e3ec237f13:jetbrains.mps.build.workflow" version="0" />
+    <language slang="l:58f98fef-90ad-4b72-a390-fad66ec7005a:jetbrains.mps.core.properties" version="0" />
+    <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
+    <module reference="cbbb9e79-84e5-4c2e-b1a2-11a381c7baf9(com.mbeddr.allInOne)" version="0" />
+    <module reference="7ac0dfb8-7d5f-4573-ab80-81af2106ce03(com.mbeddr.build)" version="0" />
+    <module reference="3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)" version="0" />
     <module reference="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.slisson.mps.all.build)" version="0" />
     <module reference="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" version="0" />
     <module reference="2ce61d63-b3b4-440d-9d3c-f64799660d3f(mbeddr.arduino.build)" version="0" />
diff --git a/solutions/mbeddr.arduino.build/models/mbeddr/arduino/build/build.mps b/solutions/mbeddr.arduino.build/models/mbeddr/arduino/build/build.mps
index 074345c..6f76a5e 100644
--- a/solutions/mbeddr.arduino.build/models/mbeddr/arduino/build/build.mps
+++ b/solutions/mbeddr.arduino.build/models/mbeddr/arduino/build/build.mps
@@ -8,7 +8,876 @@
   <imports>
     <import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" />
     <import index="90a9" ref="r:fb24ac52-5985-4947-bba9-25be6fd32c1a(de.slisson.mps.all.build)" />
+    <import index="p6ld" ref="r:0764bd79-eef9-46f0-a6fe-739a07a30bb2(com.mbeddr.build.build)" />
+    <import index="al5i" ref="r:742f344d-4dc4-4862-992c-4bc94b094870(com.mbeddr.mpsutil.dev.build)" />
+    <import index="xsd6" ref="r:ca2b582e-fdcb-4767-9d74-cf61b47911f2(com.mbeddr.allInOne)" />
   </imports>
-  <registry />
+  <registry>
+    <language id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build">
+      <concept id="5481553824944787378" name="jetbrains.mps.build.structure.BuildSourceProjectRelativePath" flags="ng" index="55IIr" />
+      <concept id="7321017245476976379" name="jetbrains.mps.build.structure.BuildRelativePath" flags="ng" index="iG8Mu">
+        <child id="7321017245477039051" name="compositePart" index="iGT6I" />
+      </concept>
+      <concept id="4993211115183325728" name="jetbrains.mps.build.structure.BuildProjectDependency" flags="ng" index="2sgV4H">
+        <reference id="5617550519002745380" name="script" index="1l3spb" />
+        <child id="4129895186893471026" name="artifacts" index="2JcizS" />
+      </concept>
+      <concept id="927724900262033858" name="jetbrains.mps.build.structure.BuildSource_JavaOptions" flags="ng" index="2_Ic$z">
+        <property id="927724900262398947" name="heapSize" index="2_GNG2" />
+        <property id="927724900262033861" name="generateDebugInfo" index="2_Ic$$" />
+        <property id="6998860900671147996" name="javaLevel" index="TZNOO" />
+      </concept>
+      <concept id="4380385936562003279" name="jetbrains.mps.build.structure.BuildString" flags="ng" index="NbPM2">
+        <child id="4903714810883783243" name="parts" index="3MwsjC" />
+      </concept>
+      <concept id="8618885170173601777" name="jetbrains.mps.build.structure.BuildCompositePath" flags="nn" index="2Ry0Ak">
+        <property id="8618885170173601779" name="head" index="2Ry0Am" />
+        <child id="8618885170173601778" name="tail" index="2Ry0An" />
+      </concept>
+      <concept id="6647099934206700647" name="jetbrains.mps.build.structure.BuildJavaPlugin" flags="ng" index="10PD9b" />
+      <concept id="7389400916848050071" name="jetbrains.mps.build.structure.BuildLayout_Zip" flags="ng" index="3981dG" />
+      <concept id="7389400916848050060" name="jetbrains.mps.build.structure.BuildLayout_NamedContainer" flags="ng" index="3981dR">
+        <child id="4380385936562148502" name="containerName" index="Nbhlr" />
+      </concept>
+      <concept id="7389400916848136194" name="jetbrains.mps.build.structure.BuildFolderMacro" flags="ng" index="398rNT">
+        <child id="7389400916848144618" name="defaultPath" index="398pKh" />
+      </concept>
+      <concept id="7389400916848153117" name="jetbrains.mps.build.structure.BuildSourceMacroRelativePath" flags="ng" index="398BVA">
+        <reference id="7389400916848153130" name="macro" index="398BVh" />
+      </concept>
+      <concept id="5617550519002745364" name="jetbrains.mps.build.structure.BuildLayout" flags="ng" index="1l3spV" />
+      <concept id="5617550519002745363" name="jetbrains.mps.build.structure.BuildProject" flags="ng" index="1l3spW">
+        <property id="4915877860348071612" name="fileName" index="turDy" />
+        <property id="5204048710541015587" name="internalBaseDirectory" index="2DA0ip" />
+        <child id="4796668409958418110" name="scriptsDir" index="auvoZ" />
+        <child id="6647099934206700656" name="plugins" index="10PD9s" />
+        <child id="7389400916848080626" name="parts" index="3989C9" />
+        <child id="3542413272732620719" name="aspects" index="1hWBAP" />
+        <child id="5617550519002745381" name="dependencies" index="1l3spa" />
+        <child id="5617550519002745378" name="macros" index="1l3spd" />
+        <child id="5617550519002745372" name="layout" index="1l3spN" />
+      </concept>
+      <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ng" index="1y1bJS">
+        <child id="7389400916848037006" name="children" index="39821P" />
+      </concept>
+      <concept id="841011766566059607" name="jetbrains.mps.build.structure.BuildStringNotEmpty" flags="ng" index="3_J27D" />
+      <concept id="4903714810883702019" name="jetbrains.mps.build.structure.BuildTextStringPart" flags="ng" index="3Mxwew">
+        <property id="4903714810883755350" name="text" index="3MwjfP" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps">
+      <concept id="6503355885715333289" name="jetbrains.mps.build.mps.structure.BuildMpsAspect" flags="ng" index="2igEWh">
+        <property id="7981469545489178349" name="generationMaxHeapSizeInMb" index="3UIfUI" />
+        <property id="353547257300482730" name="generationMaxPermSizeInMb" index="1YnnvL" />
+      </concept>
+      <concept id="6592112598314586625" name="jetbrains.mps.build.mps.structure.BuildMps_IdeaPluginGroup" flags="ng" index="m$f5U">
+        <reference id="6592112598314586626" name="group" index="m$f5T" />
+      </concept>
+      <concept id="6592112598314498932" name="jetbrains.mps.build.mps.structure.BuildMps_IdeaPlugin" flags="ng" index="m$_wf">
+        <property id="6592112598314498927" name="id" index="m$_wk" />
+        <child id="6592112598314498931" name="version" index="m$_w8" />
+        <child id="6592112598314499050" name="content" index="m$_yh" />
+        <child id="6592112598314499028" name="dependencies" index="m$_yJ" />
+        <child id="6592112598314499021" name="name" index="m$_yQ" />
+        <child id="6592112598314855574" name="containerName" index="m_cZH" />
+      </concept>
+      <concept id="6592112598314498926" name="jetbrains.mps.build.mps.structure.BuildMpsLayout_Plugin" flags="ng" index="m$_wl">
+        <reference id="6592112598314801433" name="plugin" index="m_rDy" />
+      </concept>
+      <concept id="6592112598314499027" name="jetbrains.mps.build.mps.structure.BuildMps_IdeaPluginDependency" flags="ng" index="m$_yC">
+        <reference id="6592112598314499066" name="target" index="m$_y1" />
+      </concept>
+      <concept id="1500819558095907805" name="jetbrains.mps.build.mps.structure.BuildMps_Group" flags="ng" index="2G$12M">
+        <child id="1500819558095907806" name="modules" index="2G$12L" />
+      </concept>
+      <concept id="868032131020265945" name="jetbrains.mps.build.mps.structure.BuildMPSPlugin" flags="ng" index="3b7kt6" />
+      <concept id="5253498789149381388" name="jetbrains.mps.build.mps.structure.BuildMps_Module" flags="ng" index="3bQrTs">
+        <property id="1500819558096356884" name="doNotCompile" index="2GAjPV" />
+        <child id="5253498789149547704" name="dependencies" index="3bR37C" />
+      </concept>
+      <concept id="5253498789149585690" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyOnModule" flags="ng" index="3bR9La">
+        <property id="5253498789149547713" name="reexport" index="3bR36h" />
+        <reference id="5253498789149547705" name="module" index="3bR37D" />
+      </concept>
+      <concept id="4297162197620964123" name="jetbrains.mps.build.mps.structure.BuildMps_GeneratorOptions" flags="ng" index="1wNqPr">
+        <property id="4297162197620978188" name="strict" index="1wNuhc" />
+        <property id="4297162197620978190" name="parallel" index="1wNuhe" />
+        <property id="4297162197620978193" name="parallelThreads" index="1wNuhh" />
+        <property id="4297162197621031140" name="inplace" index="1wOHq$" />
+        <property id="6535001758416941941" name="createStaticRefs" index="3Ej$Sc" />
+      </concept>
+      <concept id="5507251971038816436" name="jetbrains.mps.build.mps.structure.BuildMps_Generator" flags="ng" index="1yeLz9" />
+      <concept id="4278635856200794926" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyExtendLanguage" flags="ng" index="1Busua">
+        <reference id="4278635856200794928" name="language" index="1Busuk" />
+      </concept>
+      <concept id="3189788309731840247" name="jetbrains.mps.build.mps.structure.BuildMps_Solution" flags="ng" index="1E1JtA" />
+      <concept id="3189788309731840248" name="jetbrains.mps.build.mps.structure.BuildMps_Language" flags="ng" index="1E1JtD">
+        <child id="9200313594498201639" name="generator" index="1TViLv" />
+      </concept>
+      <concept id="322010710375794190" name="jetbrains.mps.build.mps.structure.BuildMps_DevKit" flags="ng" index="3LEwk6">
+        <child id="322010710375805250" name="extends" index="3LEz9a" />
+        <child id="322010710375832962" name="exports" index="3LEDUa" />
+      </concept>
+      <concept id="322010710375805242" name="jetbrains.mps.build.mps.structure.BuildMps_DevKitRef" flags="ng" index="3LEz8M">
+        <reference id="322010710375805243" name="devkit" index="3LEz8N" />
+      </concept>
+      <concept id="322010710375832938" name="jetbrains.mps.build.mps.structure.BuildMps_DevKitExportLanguage" flags="ng" index="3LEDTy">
+        <reference id="322010710375832947" name="language" index="3LEDTV" />
+      </concept>
+      <concept id="322010710375832954" name="jetbrains.mps.build.mps.structure.BuildMps_DevKitExportSolution" flags="ng" index="3LEDTM">
+        <reference id="322010710375832955" name="solution" index="3LEDTN" />
+      </concept>
+      <concept id="322010710375871467" name="jetbrains.mps.build.mps.structure.BuildMps_AbstractModule" flags="ng" index="3LEN3z">
+        <property id="8369506495128725901" name="compact" index="BnDLt" />
+        <property id="322010710375892619" name="uuid" index="3LESm3" />
+        <child id="322010710375956261" name="path" index="3LF7KH" />
+      </concept>
+      <concept id="7259033139236285166" name="jetbrains.mps.build.mps.structure.BuildMps_ExtractedModuleDependency" flags="nn" index="1SiIV0">
+        <child id="7259033139236285167" name="dependency" index="1SiIV1" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="1l3spW" id="5dVoMRiwBOf">
+    <property role="2DA0ip" value="../../build" />
+    <property role="TrG5h" value="mbeddr-arduino" />
+    <property role="turDy" value="build.xml" />
+    <property role="3GE5qa" value="mbeddr-extensions" />
+    <node concept="2igEWh" id="1$BAYQjr6By" role="1hWBAP">
+      <property role="3UIfUI" value="2048" />
+      <property role="1YnnvL" value="512" />
+    </node>
+    <node concept="2_Ic$z" id="4RmjYKtSlyz" role="3989C9">
+      <property role="2_GNG2" value="2048" />
+      <property role="TZNOO" value="1.8" />
+      <property role="2_Ic$$" value="true" />
+    </node>
+    <node concept="1wNqPr" id="2B1T7v1qmcz" role="3989C9">
+      <property role="1wNuhc" value="true" />
+      <property role="1wNuhe" value="true" />
+      <property role="1wNuhh" value="4" />
+      <property role="1wOHq$" value="true" />
+      <property role="3Ej$Sc" value="true" />
+    </node>
+    <node concept="m$_wf" id="1YLj_r8S5eZ" role="3989C9">
+      <property role="m$_wk" value="mbeddr.arduino" />
+      <node concept="m$_yC" id="1YLj_r8S5f0" role="m$_yJ">
+        <ref role="m$_y1" to="al5i:7uZw0yZ2_Jq" resolve="com.mbeddr.mpsutil" />
+      </node>
+      <node concept="m$_yC" id="29MdNZ_L4Er" role="m$_yJ">
+        <ref role="m$_y1" to="p6ld:7uZw0yZ43Jz" resolve="com.mbeddr.core" />
+      </node>
+      <node concept="m$_yC" id="29MdNZ_L4Gc" role="m$_yJ">
+        <ref role="m$_y1" to="p6ld:7eF9rfAu$ou" resolve="com.mbeddr.ext.statemachine" />
+      </node>
+      <node concept="m$_yC" id="29MdNZ_L4IN" role="m$_yJ">
+        <ref role="m$_y1" to="90a9:29so9Vb$6Tj" resolve="de.slisson.mps.tables" />
+      </node>
+      <node concept="m$_yC" id="29MdNZ_L4KG" role="m$_yJ">
+        <ref role="m$_y1" to="p6ld:7eF9rfAuANa" resolve="com.mbeddr.ext.components" />
+      </node>
+      <node concept="m$_yC" id="29MdNZ_L4MD" role="m$_yJ">
+        <ref role="m$_y1" to="p6ld:7eF9rfAuyUr" resolve="com.mbeddr.ext.statemachineInComponents" />
+      </node>
+      <node concept="m$_yC" id="29MdNZ_L4OE" role="m$_yJ">
+        <ref role="m$_y1" to="ffeo:6EN03E8oSte" resolve="jetbrains.mps.ide.make" />
+      </node>
+      <node concept="m$f5U" id="1YLj_r8S5f1" role="m$_yh">
+        <ref role="m$f5T" node="1YLj_r8S5f8" resolve="mbeddr.arduino" />
+      </node>
+      <node concept="3_J27D" id="1YLj_r8S5f2" role="m_cZH">
+        <node concept="3Mxwew" id="1YLj_r8S5f3" role="3MwsjC">
+          <property role="3MwjfP" value="mbeddr-arduino" />
+        </node>
+      </node>
+      <node concept="3_J27D" id="1YLj_r8S5f4" role="m$_w8">
+        <node concept="3Mxwew" id="1YLj_r8S5f5" role="3MwsjC">
+          <property role="3MwjfP" value="0.1" />
+        </node>
+      </node>
+      <node concept="3_J27D" id="1YLj_r8S5f6" role="m$_yQ">
+        <node concept="3Mxwew" id="1YLj_r8S5f7" role="3MwsjC">
+          <property role="3MwjfP" value="mbeddr arduino" />
+        </node>
+      </node>
+    </node>
+    <node concept="2G$12M" id="1YLj_r8S5f8" role="3989C9">
+      <property role="TrG5h" value="mbeddr.arduino" />
+      <node concept="1E1JtD" id="29MdNZ_L2Sy" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="mbeddr.arduino.core" />
+        <property role="3LESm3" value="3c4c8461-a533-4459-916a-dc0176793b4c" />
+        <property role="2GAjPV" value="false" />
+        <node concept="398BVA" id="29MdNZ_L2UP" role="3LF7KH">
+          <ref role="398BVh" node="29MdNZ_L2TB" resolve="mbeddr.arduino" />
+          <node concept="2Ry0Ak" id="29MdNZ_L2UX" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="29MdNZ_L2V4" role="2Ry0An">
+              <property role="2Ry0Am" value="mbeddr.arduino.core" />
+              <node concept="2Ry0Ak" id="29MdNZ_L2Vb" role="2Ry0An">
+                <property role="2Ry0Am" value="mbeddr.arduino.core.mpl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L2Ve" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L2Vf" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="90a9:4p3FRivDLPL" resolve="de.slisson.mps.editor.multiline.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L2Vg" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L2Vh" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:7pdFgzxlDoA" resolve="jetbrains.mps.build" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L2Vi" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L2Vj" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="p6ld:7uZw0yZ43Mi" resolve="com.mbeddr.core.udt" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L2Vk" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L2Vl" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="p6ld:7uZw0yZ43JW" resolve="com.mbeddr.core.util" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L3mS" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L3mT" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="29MdNZ_L2We" resolve="mbeddr.arduino.interrupts" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L3mU" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L3mV" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="p6ld:7uZw0yZ43L9" resolve="com.mbeddr.core.modules" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L3mW" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L3mX" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="al5i:2VC4eVYcuJ9" resolve="com.mbeddr.mpsutil.blutil" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L3mY" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L3mZ" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L3Yh" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L3Yi" role="1SiIV1">
+            <property role="3bR36h" value="true" />
+            <ref role="3bR37D" node="29MdNZ_L3NC" resolve="mbeddr.arduino.header" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L3Yj" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L3Yk" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L3Yl" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L3Ym" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:1d41uYMTVPB" resolve="jetbrains.mps.lang.scopes.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L3Yn" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L3Yo" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="90a9:29so9Vb$6Th" resolve="de.slisson.mps.tables" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L3Yp" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L3Yq" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="p6ld:WadEn6CWbr" resolve="com.mbeddr.core.buildconfig" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L3Yr" role="3bR37C">
+          <node concept="1Busua" id="29MdNZ_L3Ys" role="1SiIV1">
+            <ref role="1Busuk" to="p6ld:7uZw0yZ43JW" resolve="com.mbeddr.core.util" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L3Yt" role="3bR37C">
+          <node concept="1Busua" id="29MdNZ_L3Yu" role="1SiIV1">
+            <ref role="1Busuk" to="p6ld:7uZw0yZ43LZ" resolve="com.mbeddr.core.embedded" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L3Yv" role="3bR37C">
+          <node concept="1Busua" id="29MdNZ_L3Yw" role="1SiIV1">
+            <ref role="1Busuk" to="p6ld:7uZw0yZ43LU" resolve="com.mbeddr.core.expressions" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L3Yx" role="3bR37C">
+          <node concept="1Busua" id="29MdNZ_L3Yy" role="1SiIV1">
+            <ref role="1Busuk" to="p6ld:7uZw0yZ43JM" resolve="com.mbeddr.core.statements" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L3Yz" role="3bR37C">
+          <node concept="1Busua" id="29MdNZ_L3Y$" role="1SiIV1">
+            <ref role="1Busuk" to="al5i:$bJ0jguQfr" resolve="com.mbeddr.core.base" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L3Y_" role="3bR37C">
+          <node concept="1Busua" id="29MdNZ_L3YA" role="1SiIV1">
+            <ref role="1Busuk" to="p6ld:WadEn6CWbr" resolve="com.mbeddr.core.buildconfig" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L3YB" role="3bR37C">
+          <node concept="1Busua" id="29MdNZ_L3YC" role="1SiIV1">
+            <ref role="1Busuk" to="p6ld:7uZw0yZ43L9" resolve="com.mbeddr.core.modules" />
+          </node>
+        </node>
+        <node concept="1yeLz9" id="29MdNZ_L3YD" role="1TViLv">
+          <property role="TrG5h" value="mbeddr.arduino.core#2350648883898979172" />
+          <property role="3LESm3" value="151f32f8-2c45-4b6c-ad8c-3b4e2f69cfdb" />
+          <property role="2GAjPV" value="false" />
+          <node concept="1SiIV0" id="29MdNZ_L3YE" role="3bR37C">
+            <node concept="3bR9La" id="29MdNZ_L3YF" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" to="al5i:$bJ0jguQfr" resolve="com.mbeddr.core.base" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="29MdNZ_L3YG" role="3bR37C">
+            <node concept="3bR9La" id="29MdNZ_L3YH" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="29MdNZ_L3YI" role="3bR37C">
+            <node concept="3bR9La" id="29MdNZ_L3YJ" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" to="p6ld:7uZw0yZ43LU" resolve="com.mbeddr.core.expressions" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="29MdNZ_L3YK" role="3bR37C">
+            <node concept="3bR9La" id="29MdNZ_L3YL" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" to="p6ld:7uZw0yZ43JW" resolve="com.mbeddr.core.util" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="29MdNZ_L3YM" role="3bR37C">
+            <node concept="3bR9La" id="29MdNZ_L3YN" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="29MdNZ_L2We" resolve="mbeddr.arduino.interrupts" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="29MdNZ_L3YO" role="3bR37C">
+            <node concept="3bR9La" id="29MdNZ_L3YP" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" to="p6ld:7uZw0yZ43L9" resolve="com.mbeddr.core.modules" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="29MdNZ_L3YQ" role="3bR37C">
+            <node concept="3bR9La" id="29MdNZ_L3YR" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" to="p6ld:WadEn6CWbr" resolve="com.mbeddr.core.buildconfig" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="29MdNZ_L3YS" role="3bR37C">
+            <node concept="3bR9La" id="29MdNZ_L3YT" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="29MdNZ_L3NC" resolve="mbeddr.arduino.header" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="29MdNZ_L3YU" role="3bR37C">
+            <node concept="3bR9La" id="29MdNZ_L3YV" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="29MdNZ_L2Yh" resolve="mbeddr.arduino.interrupts#5152824560131035305" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtD" id="29MdNZ_L2We" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="mbeddr.arduino.interrupts" />
+        <property role="3LESm3" value="e562f51e-6403-4857-b773-44632077c67d" />
+        <property role="2GAjPV" value="false" />
+        <node concept="398BVA" id="29MdNZ_L2WO" role="3LF7KH">
+          <ref role="398BVh" node="29MdNZ_L2TB" resolve="mbeddr.arduino" />
+          <node concept="2Ry0Ak" id="29MdNZ_L2Xw" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="29MdNZ_L2XJ" role="2Ry0An">
+              <property role="2Ry0Am" value="mbeddr.arduino.interrupts" />
+              <node concept="2Ry0Ak" id="29MdNZ_L2XY" role="2Ry0An">
+                <property role="2Ry0Am" value="mbeddr.arduino.interrupts.mpl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L2Y5" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L2Y6" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="al5i:$bJ0jguQfr" resolve="com.mbeddr.core.base" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L2Y7" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L2Y8" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="p6ld:7uZw0yZ43JM" resolve="com.mbeddr.core.statements" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L2Y9" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L2Ya" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="p6ld:7uZw0yZ43LZ" resolve="com.mbeddr.core.embedded" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L2Yb" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L2Yc" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="p6ld:7uZw0yZ43L9" resolve="com.mbeddr.core.modules" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L2Yd" role="3bR37C">
+          <node concept="1Busua" id="29MdNZ_L2Ye" role="1SiIV1">
+            <ref role="1Busuk" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L2Yf" role="3bR37C">
+          <node concept="1Busua" id="29MdNZ_L2Yg" role="1SiIV1">
+            <ref role="1Busuk" to="p6ld:7uZw0yZ43LZ" resolve="com.mbeddr.core.embedded" />
+          </node>
+        </node>
+        <node concept="1yeLz9" id="29MdNZ_L2Yh" role="1TViLv">
+          <property role="TrG5h" value="mbeddr.arduino.interrupts#5152824560131035305" />
+          <property role="3LESm3" value="3bba6cee-44fc-4378-bb35-082abd0dafc4" />
+          <property role="2GAjPV" value="false" />
+          <node concept="1SiIV0" id="29MdNZ_L2Yi" role="3bR37C">
+            <node concept="3bR9La" id="29MdNZ_L2Yj" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" to="al5i:$bJ0jguQfr" resolve="com.mbeddr.core.base" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="29MdNZ_L2Yk" role="3bR37C">
+            <node concept="3bR9La" id="29MdNZ_L2Yl" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" to="p6ld:7uZw0yZ43LZ" resolve="com.mbeddr.core.embedded" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="29MdNZ_L2Ym" role="3bR37C">
+            <node concept="3bR9La" id="29MdNZ_L2Yn" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" to="p6ld:WadEn6CWbr" resolve="com.mbeddr.core.buildconfig" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtD" id="29MdNZ_L30X" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="mbeddr.arduino.registers" />
+        <property role="3LESm3" value="3828799d-97c8-48d0-af8b-39b903457e1e" />
+        <property role="2GAjPV" value="false" />
+        <node concept="398BVA" id="29MdNZ_L32s" role="3LF7KH">
+          <ref role="398BVh" node="29MdNZ_L2TB" resolve="mbeddr.arduino" />
+          <node concept="2Ry0Ak" id="29MdNZ_L32Y" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="29MdNZ_L33v" role="2Ry0An">
+              <property role="2Ry0Am" value="mbeddr.arduino.registers" />
+              <node concept="2Ry0Ak" id="29MdNZ_L340" role="2Ry0An">
+                <property role="2Ry0Am" value="mbeddr.arduino.registers.mpl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L34g" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L34h" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="p6ld:7uZw0yZ43LZ" resolve="com.mbeddr.core.embedded" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L34i" role="3bR37C">
+          <node concept="1Busua" id="29MdNZ_L34j" role="1SiIV1">
+            <ref role="1Busuk" to="p6ld:7uZw0yZ43LZ" resolve="com.mbeddr.core.embedded" />
+          </node>
+        </node>
+        <node concept="1yeLz9" id="29MdNZ_L34k" role="1TViLv">
+          <property role="TrG5h" value="mbeddr.arduino.registers#5152824560130938155" />
+          <property role="3LESm3" value="5fedd8d1-a723-4001-ab7b-30cda79fe730" />
+          <property role="2GAjPV" value="false" />
+          <node concept="1SiIV0" id="29MdNZ_L34l" role="3bR37C">
+            <node concept="3bR9La" id="29MdNZ_L34m" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" to="al5i:$bJ0jguQfr" resolve="com.mbeddr.core.base" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="29MdNZ_L34n" role="3bR37C">
+            <node concept="3bR9La" id="29MdNZ_L34o" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" to="p6ld:WadEn6CWbr" resolve="com.mbeddr.core.buildconfig" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtD" id="29MdNZ_L37k" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="mbeddr.arduino.statemachine" />
+        <property role="3LESm3" value="028007ba-e266-4d05-ab46-25264b977671" />
+        <property role="2GAjPV" value="false" />
+        <node concept="398BVA" id="29MdNZ_L39o" role="3LF7KH">
+          <ref role="398BVh" node="29MdNZ_L2TB" resolve="mbeddr.arduino" />
+          <node concept="2Ry0Ak" id="29MdNZ_L3ac" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="29MdNZ_L3aZ" role="2Ry0An">
+              <property role="2Ry0Am" value="mbeddr.arduino.statemachine" />
+              <node concept="2Ry0Ak" id="29MdNZ_L3bM" role="2Ry0An">
+                <property role="2Ry0Am" value="mbeddr.arduino.statemachine.mpl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L3cb" role="3bR37C">
+          <node concept="1Busua" id="29MdNZ_L3cc" role="1SiIV1">
+            <ref role="1Busuk" node="29MdNZ_L2Sy" resolve="mbeddr.arduino.core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L3cd" role="3bR37C">
+          <node concept="1Busua" id="29MdNZ_L3ce" role="1SiIV1">
+            <ref role="1Busuk" to="p6ld:7eF9rfAuyUH" resolve="com.mbeddr.ext.components.statemachine" />
+          </node>
+        </node>
+        <node concept="1yeLz9" id="29MdNZ_L3cf" role="1TViLv">
+          <property role="TrG5h" value="mbeddr.arduino.statemachine#7156732329349908700" />
+          <property role="3LESm3" value="0b00f608-4690-4be9-8deb-54ff9a0f2356" />
+          <property role="2GAjPV" value="false" />
+          <node concept="1SiIV0" id="29MdNZ_L3Xr" role="3bR37C">
+            <node concept="3bR9La" id="29MdNZ_L3Xs" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="29MdNZ_L3tH" resolve="mbeddr.arduino.platform" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtA" id="29MdNZ_L3tH" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="mbeddr.arduino.platform" />
+        <property role="3LESm3" value="3779e7cd-02e4-4dc4-89a1-6e8e31efc854" />
+        <property role="2GAjPV" value="false" />
+        <node concept="398BVA" id="29MdNZ_L3wy" role="3LF7KH">
+          <ref role="398BVh" node="29MdNZ_L2TB" resolve="mbeddr.arduino" />
+          <node concept="2Ry0Ak" id="29MdNZ_L3xC" role="iGT6I">
+            <property role="2Ry0Am" value="solutions" />
+            <node concept="2Ry0Ak" id="29MdNZ_L3zc" role="2Ry0An">
+              <property role="2Ry0Am" value="mbeddr.arduino.platform" />
+              <node concept="2Ry0Ak" id="29MdNZ_L3$h" role="2Ry0An">
+                <property role="2Ry0Am" value="mbeddr.arduino.platform.msd" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L3WE" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L3WF" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="29MdNZ_L3NC" resolve="mbeddr.arduino.header" />
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtA" id="29MdNZ_L3NC" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="mbeddr.arduino.header" />
+        <property role="3LESm3" value="336a1564-6617-4b5b-84e7-3d25ed4b8c8c" />
+        <property role="2GAjPV" value="false" />
+        <node concept="398BVA" id="29MdNZ_L3RL" role="3LF7KH">
+          <ref role="398BVh" node="29MdNZ_L2TB" resolve="mbeddr.arduino" />
+          <node concept="2Ry0Ak" id="29MdNZ_L3SZ" role="iGT6I">
+            <property role="2Ry0Am" value="solutions" />
+            <node concept="2Ry0Ak" id="29MdNZ_L3Uc" role="2Ry0An">
+              <property role="2Ry0Am" value="mbeddr.arduino.header" />
+              <node concept="2Ry0Ak" id="29MdNZ_L3Vp" role="2Ry0An">
+                <property role="2Ry0Am" value="mbeddr.arduino.header.msd" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtA" id="29MdNZ_L46T" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="mbeddr.arduino.core.pluginSolution" />
+        <property role="3LESm3" value="8e15ed0b-eb5e-477c-a001-d8e231c8fba9" />
+        <property role="2GAjPV" value="false" />
+        <node concept="398BVA" id="29MdNZ_L4bD" role="3LF7KH">
+          <ref role="398BVh" node="29MdNZ_L2TB" resolve="mbeddr.arduino" />
+          <node concept="2Ry0Ak" id="29MdNZ_L4d9" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="29MdNZ_L4eC" role="2Ry0An">
+              <property role="2Ry0Am" value="mbeddr.arduino.core" />
+              <node concept="2Ry0Ak" id="29MdNZ_L4g7" role="2Ry0An">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="29MdNZ_L4hA" role="2Ry0An">
+                  <property role="2Ry0Am" value="pluginSolution" />
+                  <node concept="2Ry0Ak" id="29MdNZ_L4j5" role="2Ry0An">
+                    <property role="2Ry0Am" value="mbeddr.arduino.util.msd" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L4jO" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L4jP" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:2eDSGe9d1qo" resolve="jetbrains.mps.execution.api" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L4jQ" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L4jR" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:5xa9wY2vh9z" resolve="jetbrains.mps.execution.library" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L4jS" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L4jT" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:44LXwdzyvTi" resolve="Annotations" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L4jU" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L4jV" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L4jW" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L4jX" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="29MdNZ_L2Sy" resolve="mbeddr.arduino.core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L4jY" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L4jZ" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L4k0" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L4k1" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:2eDSGe9d1q1" resolve="MPS.Workbench" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L4k2" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L4k3" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="p6ld:5qO$P$Pro19" resolve="com.mbeddr.core.runconfiguration.pluginSolution" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L4k4" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L4k5" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="p6ld:WadEn6CWbr" resolve="com.mbeddr.core.buildconfig" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="29MdNZ_L4k6" role="3bR37C">
+          <node concept="3bR9La" id="29MdNZ_L4k7" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:4LDuh$Ud1Lx" resolve="jetbrains.mps.debugger.java.api" />
+          </node>
+        </node>
+      </node>
+      <node concept="3LEwk6" id="29MdNZ_L4ri" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="mbeddr.arduino" />
+        <property role="3LESm3" value="6845f348-7ea5-449c-ae3b-3d600bc3b73d" />
+        <node concept="398BVA" id="29MdNZ_L4wY" role="3LF7KH">
+          <ref role="398BVh" node="29MdNZ_L2TB" resolve="mbeddr.arduino" />
+          <node concept="2Ry0Ak" id="29MdNZ_L4yE" role="iGT6I">
+            <property role="2Ry0Am" value="devkits" />
+            <node concept="2Ry0Ak" id="29MdNZ_L4$l" role="2Ry0An">
+              <property role="2Ry0Am" value="mbeddr.arduino" />
+              <node concept="2Ry0Ak" id="29MdNZ_L4A0" role="2Ry0An">
+                <property role="2Ry0Am" value="mbeddr.arduino.devkit" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3LEz8M" id="29MdNZ_L4Ct" role="3LEz9a">
+          <ref role="3LEz8N" to="p6ld:7uZw0yZ43Kv" resolve="com.mbeddr.core" />
+        </node>
+        <node concept="3LEDTy" id="29MdNZ_L4Cu" role="3LEDUa">
+          <ref role="3LEDTV" node="29MdNZ_L2We" resolve="mbeddr.arduino.interrupts" />
+        </node>
+        <node concept="3LEDTy" id="29MdNZ_L4Cv" role="3LEDUa">
+          <ref role="3LEDTV" node="29MdNZ_L30X" resolve="mbeddr.arduino.registers" />
+        </node>
+        <node concept="3LEDTy" id="29MdNZ_L4Cw" role="3LEDUa">
+          <ref role="3LEDTV" node="29MdNZ_L2Sy" resolve="mbeddr.arduino.core" />
+        </node>
+        <node concept="3LEDTM" id="29MdNZ_L4Cx" role="3LEDUa">
+          <ref role="3LEDTN" node="29MdNZ_L3NC" resolve="mbeddr.arduino.header" />
+        </node>
+        <node concept="3LEDTM" id="29MdNZ_L4Cy" role="3LEDUa">
+          <ref role="3LEDTN" node="29MdNZ_L46T" resolve="mbeddr.arduino.core.pluginSolution" />
+        </node>
+        <node concept="3LEDTM" id="29MdNZ_L4Cz" role="3LEDUa">
+          <ref role="3LEDTN" node="29MdNZ_L3tH" resolve="mbeddr.arduino.platform" />
+        </node>
+      </node>
+    </node>
+    <node concept="2sgV4H" id="6XXe7bCzKWF" role="1l3spa">
+      <ref role="1l3spb" to="ffeo:3IKDaVZmzS6" resolve="mps" />
+      <node concept="398BVA" id="6XXe7bCzKWG" role="2JcizS">
+        <ref role="398BVh" node="3$3J06WftG_" resolve="mps.home" />
+      </node>
+    </node>
+    <node concept="2sgV4H" id="25y4WSoTr_U" role="1l3spa">
+      <ref role="1l3spb" to="ffeo:25y4WSoTpRT" resolve="jetpad" />
+      <node concept="398BVA" id="6RNQOYRFoYN" role="2JcizS">
+        <ref role="398BVh" node="3$3J06WftG_" resolve="mps.home" />
+      </node>
+    </node>
+    <node concept="2sgV4H" id="7kchpCrNsdu" role="1l3spa">
+      <ref role="1l3spb" to="ffeo:3J16QdQGiiA" resolve="mpsDiagramEditor" />
+      <node concept="398BVA" id="7kchpCrNsET" role="2JcizS">
+        <ref role="398BVh" node="3$3J06WftG_" resolve="mps.home" />
+      </node>
+    </node>
+    <node concept="2sgV4H" id="3FxUZ7LXIC" role="1l3spa">
+      <ref role="1l3spb" to="xsd6:5qO$P$PtiTw" resolve="com.mbeddr.allInOne" />
+      <node concept="398BVA" id="3FxUZ7LXKu" role="2JcizS">
+        <ref role="398BVh" node="6RmoJr9fU4_" resolve="mbeddr.artifacts" />
+      </node>
+    </node>
+    <node concept="2sgV4H" id="6RmoJr9F0uu" role="1l3spa">
+      <ref role="1l3spb" to="al5i:3AVJcIMlF8l" resolve="com.mbeddr.platform" />
+      <node concept="398BVA" id="6RmoJr9F21A" role="2JcizS">
+        <ref role="398BVh" node="6RmoJr9ESRx" resolve="platform.artifacts" />
+      </node>
+    </node>
+    <node concept="2sgV4H" id="7gJCdy_uI1V" role="1l3spa">
+      <ref role="1l3spb" to="90a9:2Xjt3l56m0V" resolve="mps-sl-all" />
+      <node concept="398BVA" id="7gJCdy_uKyG" role="2JcizS">
+        <ref role="398BVh" node="dYB2BxirvB" resolve="sl-all.artifacts" />
+      </node>
+    </node>
+    <node concept="398rNT" id="29MdNZ_L2TB" role="1l3spd">
+      <property role="TrG5h" value="mbeddr.arduino" />
+      <node concept="55IIr" id="29MdNZ_L2UB" role="398pKh">
+        <node concept="2Ry0Ak" id="29MdNZ_L2UM" role="iGT6I">
+          <property role="2Ry0Am" value=".." />
+        </node>
+      </node>
+    </node>
+    <node concept="398rNT" id="3$3J06WftG_" role="1l3spd">
+      <property role="TrG5h" value="mps.home" />
+      <node concept="55IIr" id="3$3J06WftGA" role="398pKh">
+        <node concept="2Ry0Ak" id="3$3J06WftGB" role="iGT6I">
+          <property role="2Ry0Am" value=".." />
+          <node concept="2Ry0Ak" id="3$3J06WftGC" role="2Ry0An">
+            <property role="2Ry0Am" value=".." />
+            <node concept="2Ry0Ak" id="3$3J06WftGD" role="2Ry0An">
+              <property role="2Ry0Am" value=".." />
+              <node concept="2Ry0Ak" id="3$3J06WftGE" role="2Ry0An">
+                <property role="2Ry0Am" value=".." />
+                <node concept="2Ry0Ak" id="3$3J06WftGF" role="2Ry0An">
+                  <property role="2Ry0Am" value=".." />
+                  <node concept="2Ry0Ak" id="3$3J06WftGG" role="2Ry0An">
+                    <property role="2Ry0Am" value=".." />
+                    <node concept="2Ry0Ak" id="3$3J06WftGH" role="2Ry0An">
+                      <property role="2Ry0Am" value="Applications" />
+                      <node concept="2Ry0Ak" id="3$3J06WftGI" role="2Ry0An">
+                        <property role="2Ry0Am" value="MPS_3.3.app" />
+                        <node concept="2Ry0Ak" id="3$3J06WftGJ" role="2Ry0An">
+                          <property role="2Ry0Am" value="Contents" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="398rNT" id="3$3J06WftAg" role="1l3spd">
+      <property role="TrG5h" value="mbeddr.github.core.home" />
+      <node concept="55IIr" id="3$3J06WftAh" role="398pKh">
+        <node concept="2Ry0Ak" id="3$3J06WftAi" role="iGT6I">
+          <property role="2Ry0Am" value=".." />
+          <node concept="2Ry0Ak" id="1zgurskwH3Z" role="2Ry0An">
+            <property role="2Ry0Am" value=".." />
+            <node concept="2Ry0Ak" id="1zgurskwH43" role="2Ry0An">
+              <property role="2Ry0Am" value=".." />
+              <node concept="2Ry0Ak" id="2Q0Qr$5O8t6" role="2Ry0An">
+                <property role="2Ry0Am" value="mbeddr.core" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="398rNT" id="3$3J06WftFk" role="1l3spd">
+      <property role="TrG5h" value="artifacts.root" />
+    </node>
+    <node concept="398rNT" id="6RmoJr9fU4_" role="1l3spd">
+      <property role="TrG5h" value="mbeddr.artifacts" />
+      <node concept="398BVA" id="6RmoJr9fVf4" role="398pKh">
+        <ref role="398BVh" node="3$3J06WftFk" resolve="artifacts.root" />
+        <node concept="2Ry0Ak" id="6RmoJr9fVf6" role="iGT6I">
+          <property role="2Ry0Am" value="com.mbeddr.allInOne" />
+        </node>
+      </node>
+    </node>
+    <node concept="398rNT" id="dYB2BxirvB" role="1l3spd">
+      <property role="TrG5h" value="sl-all.artifacts" />
+      <node concept="398BVA" id="3$3J06WftAk" role="398pKh">
+        <ref role="398BVh" node="3$3J06WftFk" resolve="artifacts.root" />
+        <node concept="2Ry0Ak" id="3$3J06WftAl" role="iGT6I">
+          <property role="2Ry0Am" value="mps-sl-all" />
+        </node>
+      </node>
+    </node>
+    <node concept="398rNT" id="6RmoJr9ESRx" role="1l3spd">
+      <property role="TrG5h" value="platform.artifacts" />
+      <node concept="398BVA" id="6RmoJr9EWYB" role="398pKh">
+        <ref role="398BVh" node="3$3J06WftFk" resolve="artifacts.root" />
+        <node concept="2Ry0Ak" id="6RmoJr9EZ13" role="iGT6I">
+          <property role="2Ry0Am" value="com.mbeddr.platform" />
+        </node>
+      </node>
+    </node>
+    <node concept="10PD9b" id="5dVoMRiwNak" role="10PD9s" />
+    <node concept="3b7kt6" id="5dVoMRiwNat" role="10PD9s" />
+    <node concept="55IIr" id="5dVoMRiwBOg" role="auvoZ" />
+    <node concept="1l3spV" id="5dVoMRiwBOh" role="1l3spN">
+      <node concept="3981dG" id="1YLj_r8S5fx" role="39821P">
+        <node concept="3_J27D" id="1YLj_r8S5fy" role="Nbhlr">
+          <node concept="3Mxwew" id="1YLj_r8S5fz" role="3MwsjC">
+            <property role="3MwjfP" value="mbeddr-arduino.zip" />
+          </node>
+        </node>
+        <node concept="m$_wl" id="1YLj_r8S5f$" role="39821P">
+          <ref role="m_rDy" node="1YLj_r8S5eZ" resolve="mbeddr.arduino" />
+        </node>
+      </node>
+    </node>
+    <node concept="398rNT" id="6BHziVHZYZ3" role="1l3spd">
+      <property role="TrG5h" value="spawner.artifacts" />
+      <node concept="398BVA" id="6BHziVHZYZ2" role="398pKh">
+        <ref role="398BVh" node="3$3J06WftFk" resolve="artifacts.root" />
+        <node concept="2Ry0Ak" id="6BHziVHZYZ1" role="iGT6I">
+          <property role="2Ry0Am" value="spawner" />
+        </node>
+      </node>
+    </node>
+    <node concept="2sgV4H" id="6BHziVHZYZ5" role="1l3spa">
+      <ref role="1l3spb" to="p6ld:6YaWssNZ9op" resolve="spawner" />
+      <node concept="398BVA" id="6BHziVHZYZ4" role="2JcizS">
+        <ref role="398BVh" node="6BHziVHZYZ3" resolve="spawner.artifacts" />
+      </node>
+    </node>
+  </node>
 </model>
 

From b38f3b9908fb4d1b516898073fa9d174abd8a030 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Mon, 14 Nov 2016 15:07:01 +0100
Subject: [PATCH 09/48] restructure tasts

---
 build.gradle | 3 ++-
 build.xml    | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b7b54f2..7d22220 100644
--- a/build.gradle
+++ b/build.gradle
@@ -243,4 +243,5 @@ ant.taskdef(name: 'junit', classname: 'org.apache.tools.ant.taskdefs.optional.ju
 ant.taskdef(name: 'junitreport', classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',
         classpath: configurations.junitAnt.asPath)
 
-check.dependsOn 'ant-build-arduino'
+assemble.dependsOn 'ant-build-arduino'
+check.dependsOn 'ant-run-tests'
diff --git a/build.xml b/build.xml
index 522037d..a5110e0 100644
--- a/build.xml
+++ b/build.xml
@@ -29,5 +29,7 @@
       <ant antfile="${mbeddr.arduino.build-file.name}" dir="${mbeddr.arduino.build-file.location}" target="${clean-plugins.task}" />
 	    <ant antfile="${mbeddr.arduino.build-file.name}" dir="${mbeddr.arduino.build-file.location}" target="${clean-generated-code.task}" />
     </target>
+    <target name="run-tests">
+    </target>
 
 </project>
\ No newline at end of file

From 8c58e316c7f7788eaa00d3d8a227d5050ddd80db Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Mon, 14 Nov 2016 14:08:05 +0000
Subject: [PATCH 10/48] Add .gitlab-ci.yml

---
 .gitlab-ci.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..d30cfa2
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,35 @@
+# This file is a template, and might need editing before it works on your project.
+# This template uses the java:8 docker image because there isn't any
+# official Gradle image at this moment
+#
+# This is the Gradle build system for JVM applications
+# https://gradle.org/
+# https://github.com/gradle/gradle
+image: java:8
+
+# Make the gradle wrapper executable. This essentially downloads a copy of
+# Gradle to build the project with.
+# https://docs.gradle.org/current/userguide/gradle_wrapper.html
+# It is expected that any modern gradle project has a wrapper
+before_script:
+    - chmod +x gradlew
+
+# We redirect the gradle user home using -g so that it caches the
+# wrapper and dependencies.
+# https://docs.gradle.org/current/userguide/gradle_command_line.html
+#
+# Unfortunately it also caches the build output so
+# cleaning removes reminants of any cached builds.
+# The assemble task actually builds the project.
+# If it fails here, the tests can't run.
+build:
+  stage: build
+  script:
+    - ./gradlew -g /cache/.gradle clean assemble
+  allow_failure: false
+
+# Use the generated build output to run the tests.
+test:
+  stage: test
+  script:
+    - ./gradlew -g /cache./gradle check

From 640c06ad9d97f020bf81805d2b0bcbe39fbb91b6 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Mon, 14 Nov 2016 15:15:42 +0100
Subject: [PATCH 11/48] No packageing when assemble

---
 build.gradle | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7d22220..e44c4f5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -200,8 +200,6 @@ task packageArduinoDistribution(dependsOn: 'ant-build-arduino') {
     }
 }
 
-assemble.dependsOn packageArduino, packageArduinoDistribution
-
 publishing {
     repositories {
         maven {

From 9290c091289165b7006b7df732c8e0f135f35274 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Mon, 14 Nov 2016 19:01:27 +0000
Subject: [PATCH 12/48] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d30cfa2..87313e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,11 @@ build:
   script:
     - ./gradlew -g /cache/.gradle clean assemble
   allow_failure: false
-
+  artifacts: 
+    paths:
+    - gradle/build/artifacts/mbeddr-arduino/
+    expire_in: 1 week
+    
 # Use the generated build output to run the tests.
 test:
   stage: test

From 8faa2964de5eb19d2f31db511e1843788b30d2bd Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Mon, 14 Nov 2016 20:10:39 +0100
Subject: [PATCH 13/48] initial release script

---
 .gitlab-ci.yml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 87313e4..5dac2d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,13 +27,26 @@ build:
   script:
     - ./gradlew -g /cache/.gradle clean assemble
   allow_failure: false
-  artifacts: 
+  artifacts:
     paths:
     - gradle/build/artifacts/mbeddr-arduino/
     expire_in: 1 week
-    
+
 # Use the generated build output to run the tests.
 test:
   stage: test
   script:
     - ./gradlew -g /cache./gradle check
+
+deploy:
+  stage: deploy
+  script:
+  - mkdir tmp
+  - cd tmp
+	- wget https://github.com/aktau/github-release/releases/download/v0.6.2/linux-amd64-github-release.tar.bz2
+	- tar -xjvf linux-amd64-github-release.tar.bz2
+	- mv bin/linux/amd64/github-release /usr/bin/
+  - cd ..
+	- rm -rf tmp/
+  only:
+    - release
\ No newline at end of file

From 9e920e8403fe2c75f0e811133903bb52227d12d6 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Mon, 14 Nov 2016 20:11:44 +0100
Subject: [PATCH 14/48] tabs ...

---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5dac2d9..a0b1f4b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,10 +43,10 @@ deploy:
   script:
   - mkdir tmp
   - cd tmp
-	- wget https://github.com/aktau/github-release/releases/download/v0.6.2/linux-amd64-github-release.tar.bz2
-	- tar -xjvf linux-amd64-github-release.tar.bz2
-	- mv bin/linux/amd64/github-release /usr/bin/
+  - wget https://github.com/aktau/github-release/releases/download/v0.6.2/linux-amd64-github-release.tar.bz2
+  - tar -xjvf linux-amd64-github-release.tar.bz2
+  - mv bin/linux/amd64/github-release /usr/bin/
   - cd ..
-	- rm -rf tmp/
+  - rm -rf tmp/
   only:
     - release
\ No newline at end of file

From 2c7fa3b289b380f12cfaf1a2a9ece007b0be0e94 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Mon, 14 Nov 2016 20:49:35 +0100
Subject: [PATCH 15/48] release artifacts

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a0b1f4b..0272850 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,5 +48,7 @@ deploy:
   - mv bin/linux/amd64/github-release /usr/bin/
   - cd ..
   - rm -rf tmp/
+  - github-release release -s $GITHUB_TOKEN -u coolya -r mbeddr.arduino -t release-$CI_BUILD_ID -c $CI_BUILD_REF -p
+  - github-release upload -s $GITHUB_TOKEN  -u coolya -r mbeddr.arduino -t release-$CI_BUILD_ID -f gradle/build/artifacts/mbeddr-arduino/mbeddr-arduino.zip -n mbeddr-arduino.zip
   only:
     - release
\ No newline at end of file

From 7cc139804467dbcbe9e54a7ba28e9605a60f868f Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Mon, 14 Nov 2016 23:28:49 +0100
Subject: [PATCH 16/48] more build stuff

---
 .gitlab-ci.yml | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0272850..e62ed54 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,12 +7,29 @@
 # https://github.com/gradle/gradle
 image: java:8
 
+
+variables:
+  VERSION: "0.1.6"
+
 # Make the gradle wrapper executable. This essentially downloads a copy of
 # Gradle to build the project with.
 # https://docs.gradle.org/current/userguide/gradle_wrapper.html
 # It is expected that any modern gradle project has a wrapper
 before_script:
-    - chmod +x gradlew
+  - chmod +x gradlew
+  # Install ssh-agent if not already installed, it is required by Docker.
+  # (change apt-get to yum if you use a CentOS-based image)
+  - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+  # Run ssh-agent (inside the build environment)
+  - eval $(ssh-agent -s)
+  # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
+  - ssh-add <(echo "$SSH_PRIVATE_KEY")
+  # For Docker builds disable host key checking. Be aware that by adding that
+  # you are suspectible to man-in-the-middle attacks.
+  # WARNING: Use this only with the Docker executor, if you use it with shell
+  # you will overwrite your user's SSH config.
+  - mkdir -p ~/.ssh
+  - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
 
 # We redirect the gradle user home using -g so that it caches the
 # wrapper and dependencies.
@@ -48,7 +65,11 @@ deploy:
   - mv bin/linux/amd64/github-release /usr/bin/
   - cd ..
   - rm -rf tmp/
-  - github-release release -s $GITHUB_TOKEN -u coolya -r mbeddr.arduino -t release-$CI_BUILD_ID -c $CI_BUILD_REF -p
-  - github-release upload -s $GITHUB_TOKEN  -u coolya -r mbeddr.arduino -t release-$CI_BUILD_ID -f gradle/build/artifacts/mbeddr-arduino/mbeddr-arduino.zip -n mbeddr-arduino.zip
+  - git tag $VERSION HEAD
+  - git remote add github git@github.com:coolya/mbeddr.arduino.git
+  - git push github HEAD:release
+  - git push github $VERSION
+  - github-release release -s $GITHUB_TOKEN -u coolya -r mbeddr.arduino -t $VERSION
+  - github-release upload -s $GITHUB_TOKEN  -u coolya -r mbeddr.arduino -t $VERSION -f gradle/build/artifacts/mbeddr-arduino/mbeddr-arduino.zip -n mbeddr-arduino.zip
   only:
     - release
\ No newline at end of file

From ffb41fa5ee6cb952fef393fb78e400e24970d6e1 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Mon, 14 Nov 2016 23:44:59 +0100
Subject: [PATCH 17/48] add echo

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e62ed54..a5b8745 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,7 @@ before_script:
   # Run ssh-agent (inside the build environment)
   - eval $(ssh-agent -s)
   # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
+  - echo "$SSH_PRIVATE_KEY"
   - ssh-add <(echo "$SSH_PRIVATE_KEY")
   # For Docker builds disable host key checking. Be aware that by adding that
   # you are suspectible to man-in-the-middle attacks.

From 290fdfa9f7b8a94226321c85d84b2eab2fb86ebc Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 15 Nov 2016 00:05:15 +0100
Subject: [PATCH 18/48] more stuff

---
 .gitlab-ci.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5b8745..dec29eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,16 +22,19 @@ before_script:
   - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
   # Run ssh-agent (inside the build environment)
   - eval $(ssh-agent -s)
-  # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
-  - echo "$SSH_PRIVATE_KEY"
-  - ssh-add <(echo "$SSH_PRIVATE_KEY")
   # For Docker builds disable host key checking. Be aware that by adding that
   # you are suspectible to man-in-the-middle attacks.
   # WARNING: Use this only with the Docker executor, if you use it with shell
   # you will overwrite your user's SSH config.
   - mkdir -p ~/.ssh
+  # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
+  - echo "$SSH_PRIVATE_KEY" >> ~/key
+  - ssh-add ~/key
   - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
 
+after_script:
+  - rm ~/key
+
 # We redirect the gradle user home using -g so that it caches the
 # wrapper and dependencies.
 # https://docs.gradle.org/current/userguide/gradle_command_line.html

From 628133cb0d17991def931dd577282375169a0d65 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 15 Nov 2016 00:08:50 +0100
Subject: [PATCH 19/48] key permissions

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dec29eb..24bc628 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,6 +29,7 @@ before_script:
   - mkdir -p ~/.ssh
   # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
   - echo "$SSH_PRIVATE_KEY" >> ~/key
+  -chmod 0600 ~/key
   - ssh-add ~/key
   - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
 

From 35bf864d0848f9c57e7d7657fa832be0957c9959 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 15 Nov 2016 00:09:55 +0100
Subject: [PATCH 20/48] yaml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 24bc628..4a877c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ before_script:
   - mkdir -p ~/.ssh
   # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
   - echo "$SSH_PRIVATE_KEY" >> ~/key
-  -chmod 0600 ~/key
+  - chmod 0600 ~/key
   - ssh-add ~/key
   - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
 

From b81a154c4371e596281e2a2feb106673468e2157 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 15 Nov 2016 00:23:47 +0100
Subject: [PATCH 21/48] back to old

---
 .gitlab-ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a877c5..52d5d9c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,9 +28,7 @@ before_script:
   # you will overwrite your user's SSH config.
   - mkdir -p ~/.ssh
   # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
-  - echo "$SSH_PRIVATE_KEY" >> ~/key
-  - chmod 0600 ~/key
-  - ssh-add ~/key
+  - ssh-add <(echo "$SSH_PRIVATE_KEY")
   - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
 
 after_script:

From 0682168ed7ae1c0b5e51e7475dd551a3f9a02041 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 15 Nov 2016 00:39:00 +0100
Subject: [PATCH 22/48] try sshpass

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52d5d9c..583c5c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,7 @@ before_script:
   # you will overwrite your user's SSH config.
   - mkdir -p ~/.ssh
   # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
-  - ssh-add <(echo "$SSH_PRIVATE_KEY")
+  - sshpass -p'' ssh-add <(echo "$SSH_PRIVATE_KEY")
   - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
 
 after_script:

From 2b9f17a55b1fd6b3ac9fdd3f8609ef71097aeced Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 15 Nov 2016 00:44:56 +0100
Subject: [PATCH 23/48] next try

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 583c5c3..3d7441b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,8 @@ before_script:
   # you will overwrite your user's SSH config.
   - mkdir -p ~/.ssh
   # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
-  - sshpass -p'' ssh-add <(echo "$SSH_PRIVATE_KEY")
+  - echo "$SSH_PRIVATE_KEY" >> ~/.ssh/id_ed25519
+  - ssh-add
   - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
 
 after_script:

From 5d249f498f7a86c06de7a7fabc4042653c2002bb Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 15 Nov 2016 00:45:54 +0100
Subject: [PATCH 24/48] permissions

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d7441b..9519db8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,6 +29,7 @@ before_script:
   - mkdir -p ~/.ssh
   # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
   - echo "$SSH_PRIVATE_KEY" >> ~/.ssh/id_ed25519
+  - chmod 0600 ~/.ssh/id_ed25519
   - ssh-add
   - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
 

From 4c9664c6310d3e61ae50a72c40cfefb2919d6365 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 15 Nov 2016 00:50:25 +0100
Subject: [PATCH 25/48] deployment script

---
 .gitlab-ci.yml | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9519db8..a0de914 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,24 +17,6 @@ variables:
 # It is expected that any modern gradle project has a wrapper
 before_script:
   - chmod +x gradlew
-  # Install ssh-agent if not already installed, it is required by Docker.
-  # (change apt-get to yum if you use a CentOS-based image)
-  - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
-  # Run ssh-agent (inside the build environment)
-  - eval $(ssh-agent -s)
-  # For Docker builds disable host key checking. Be aware that by adding that
-  # you are suspectible to man-in-the-middle attacks.
-  # WARNING: Use this only with the Docker executor, if you use it with shell
-  # you will overwrite your user's SSH config.
-  - mkdir -p ~/.ssh
-  # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
-  - echo "$SSH_PRIVATE_KEY" >> ~/.ssh/id_ed25519
-  - chmod 0600 ~/.ssh/id_ed25519
-  - ssh-add
-  - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
-
-after_script:
-  - rm ~/key
 
 # We redirect the gradle user home using -g so that it caches the
 # wrapper and dependencies.
@@ -62,6 +44,25 @@ test:
 
 deploy:
   stage: deploy
+  before_script:
+    # Install ssh-agent if not already installed, it is required by Docker.
+    # (change apt-get to yum if you use a CentOS-based image)
+    - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+    # Run ssh-agent (inside the build environment)
+    - eval $(ssh-agent -s)
+    # For Docker builds disable host key checking. Be aware that by adding that
+    # you are suspectible to man-in-the-middle attacks.
+    # WARNING: Use this only with the Docker executor, if you use it with shell
+    # you will overwrite your user's SSH config.
+    - mkdir -p ~/.ssh
+    # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
+    - echo "$SSH_PRIVATE_KEY" >> ~/.ssh/id_ed25519
+    - chmod 0600 ~/.ssh/id_ed25519
+    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+
+  after_script:
+    - rm ~/.ssh/id_ed25519
+
   script:
   - mkdir tmp
   - cd tmp

From 9ec3b38d2da1b1795ad9bda794a61cf3f1891290 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 15 Nov 2016 01:10:08 +0100
Subject: [PATCH 26/48] token no key

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a0de914..d9fbeec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,7 +72,7 @@ deploy:
   - cd ..
   - rm -rf tmp/
   - git tag $VERSION HEAD
-  - git remote add github git@github.com:coolya/mbeddr.arduino.git
+  - git remote add github https://$GITHUB_TOKEN@github.com/coolya/mbeddr.arduino.git
   - git push github HEAD:release
   - git push github $VERSION
   - github-release release -s $GITHUB_TOKEN -u coolya -r mbeddr.arduino -t $VERSION

From 01257898177112db3a8e78a6308097c3be76df4a Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 15 Nov 2016 10:01:57 +0100
Subject: [PATCH 27/48] remove github remote after deploy

---
 .gitlab-ci.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9fbeec..002fa7b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,13 +55,11 @@ deploy:
     # WARNING: Use this only with the Docker executor, if you use it with shell
     # you will overwrite your user's SSH config.
     - mkdir -p ~/.ssh
-    # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
-    - echo "$SSH_PRIVATE_KEY" >> ~/.ssh/id_ed25519
-    - chmod 0600 ~/.ssh/id_ed25519
     - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+    - git remote add github https://$GITHUB_TOKEN@github.com/coolya/mbeddr.arduino.git
 
   after_script:
-    - rm ~/.ssh/id_ed25519
+    - git remote remove github
 
   script:
   - mkdir tmp
@@ -72,7 +70,6 @@ deploy:
   - cd ..
   - rm -rf tmp/
   - git tag $VERSION HEAD
-  - git remote add github https://$GITHUB_TOKEN@github.com/coolya/mbeddr.arduino.git
   - git push github HEAD:release
   - git push github $VERSION
   - github-release release -s $GITHUB_TOKEN -u coolya -r mbeddr.arduino -t $VERSION

From 8762ba33c8fff644570d5a083e340a55ea6e259c Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 15 Nov 2016 10:44:30 +0100
Subject: [PATCH 28/48] deploy successful master builds to github

---
 .gitlab-ci.yml | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 002fa7b..ec635ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ test:
   script:
     - ./gradlew -g /cache./gradle check
 
-deploy:
+deploy github release:
   stage: deploy
   before_script:
     # Install ssh-agent if not already installed, it is required by Docker.
@@ -75,4 +75,27 @@ deploy:
   - github-release release -s $GITHUB_TOKEN -u coolya -r mbeddr.arduino -t $VERSION
   - github-release upload -s $GITHUB_TOKEN  -u coolya -r mbeddr.arduino -t $VERSION -f gradle/build/artifacts/mbeddr-arduino/mbeddr-arduino.zip -n mbeddr-arduino.zip
   only:
-    - release
\ No newline at end of file
+    - release
+
+deploy github:
+  stage: deploy
+  before_script:
+    # Install ssh-agent if not already installed, it is required by Docker.
+    # (change apt-get to yum if you use a CentOS-based image)
+    - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+    # Run ssh-agent (inside the build environment)
+    - eval $(ssh-agent -s)
+    # For Docker builds disable host key checking. Be aware that by adding that
+    # you are suspectible to man-in-the-middle attacks.
+    # WARNING: Use this only with the Docker executor, if you use it with shell
+    # you will overwrite your user's SSH config.
+    - mkdir -p ~/.ssh
+    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+    - git remote add github https://$GITHUB_TOKEN@github.com/coolya/mbeddr.arduino.git
+
+  after_script:
+    - git remote remove github
+  only:
+    - master
+  script:
+      - git push github HEAD:release

From 65472d0cade89a6221d22f759424b8bea5138ce2 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 15 Nov 2016 19:12:37 +0000
Subject: [PATCH 29/48] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ec635ec..095f553 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -98,4 +98,4 @@ deploy github:
   only:
     - master
   script:
-      - git push github HEAD:release
+      - git push github HEAD:master

From 75e518555fd88976dec9e6cb509760b65c8ff581 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 15 Nov 2016 20:25:48 +0100
Subject: [PATCH 30/48] push tag to gitlab

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 095f553..332f6b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,6 +72,7 @@ deploy github release:
   - git tag $VERSION HEAD
   - git push github HEAD:release
   - git push github $VERSION
+  - git push $VERSION
   - github-release release -s $GITHUB_TOKEN -u coolya -r mbeddr.arduino -t $VERSION
   - github-release upload -s $GITHUB_TOKEN  -u coolya -r mbeddr.arduino -t $VERSION -f gradle/build/artifacts/mbeddr-arduino/mbeddr-arduino.zip -n mbeddr-arduino.zip
   only:

From 120d7ee8f3b7cee643c398e881dd097d52789f71 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 22 Nov 2016 14:57:10 +0100
Subject: [PATCH 31/48] apply mbeddr migrations

---
 .../__spreferences/PlatformTemplates.mps      |   4 +-
 _spreferences/PlatformTemplates/module.msd    |  52 +++----
 .../__spreferences/TypeSizeConfiguration.mps  |   2 +-
 .../TypeSizeConfiguration/module.msd          |  40 +++---
 .../generator/template/main@generator.mps     |   9 +-
 .../languageModels/actions.mps                |   2 +-
 .../languageModels/editor.mps                 | 130 ++++++++----------
 .../languageModels/intentions.mps             |   4 +-
 .../languageModels/structure.mps              |   3 +-
 .../languageModels/typesystem.mps             |   2 +-
 .../mbeddr.arduino.core.mpl                   |  37 ++---
 .../pluginSolution/mbeddr.arduino.util.msd    |  44 +++---
 .../arduino/core/pluginSolution/plugin.mps    |  13 +-
 .../languageModels/structure.mps              |   3 +-
 .../mbeddr.arduino.interrupts.mpl             |  15 +-
 .../mbeddr.arduino.registers.mpl              |  36 +++++
 .../generator/template/main@generator.mps     |   4 +-
 .../languageModels/editor.mps                 |  10 +-
 .../languageModels/structure.mps              |   3 +-
 .../mbeddr.arduino.statemachine.mpl           |  31 +++--
 solutions/arduino.samples/arduino.samples.msd |  18 +--
 .../models/arduino/samples/Serial/.model      |   6 +-
 .../arduino/samples/statemachine/.model       |   8 +-
 .../models/arduino/samples/weather/.model     |   8 +-
 .../mbeddr.arduino.platform.msd               |  41 ++++++
 25 files changed, 294 insertions(+), 231 deletions(-)

diff --git a/_spreferences/PlatformTemplates/models/mbeddr/arduino/__spreferences/PlatformTemplates.mps b/_spreferences/PlatformTemplates/models/mbeddr/arduino/__spreferences/PlatformTemplates.mps
index 4768d56..faee1c1 100644
--- a/_spreferences/PlatformTemplates/models/mbeddr/arduino/__spreferences/PlatformTemplates.mps
+++ b/_spreferences/PlatformTemplates/models/mbeddr/arduino/__spreferences/PlatformTemplates.mps
@@ -2,7 +2,7 @@
 <model ref="r:0b7ab537-8e2d-339d-960f-70950647ff3c(mbeddr.arduino.__spreferences.PlatformTemplates)">
   <persistence version="9" />
   <languages>
-    <use id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" name="com.mbeddr.core.buildconfig" version="0" />
+    <use id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" name="com.mbeddr.core.buildconfig" version="1" />
   </languages>
   <imports />
   <registry>
@@ -18,6 +18,7 @@
         <property id="5323740605968447024" name="compiler" index="2AWWZJ" />
         <property id="3963667026125442601" name="gdb" index="3r8Kw1" />
         <property id="3963667026125442676" name="make" index="3r8Kxs" />
+        <property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
       </concept>
       <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
         <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
@@ -38,6 +39,7 @@
         <property role="3r8Kxs" value="make" />
         <property role="2AWWZI" value="-std=c99" />
         <property role="1FkSt$" value="-g" />
+        <property role="3I8uaA" value="" />
       </node>
     </node>
   </node>
diff --git a/_spreferences/PlatformTemplates/module.msd b/_spreferences/PlatformTemplates/module.msd
index b568d0a..f466475 100644
--- a/_spreferences/PlatformTemplates/module.msd
+++ b/_spreferences/PlatformTemplates/module.msd
@@ -7,32 +7,32 @@
   </models>
   <sourcePath />
   <languageVersions>
-    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="2" />
-    <language id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" fqName="com.mbeddr.core.buildconfig" version="0" />
-    <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
-    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="2" />
-    <language id="f93d1dbe-bfd1-42dd-932a-f375fa6f5373" fqName="com.mbeddr.core.make" version="1" />
-    <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" fqName="com.mbeddr.core.modules" version="0" />
-    <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" fqName="com.mbeddr.core.pointers" version="0" />
-    <language id="a9d69647-0840-491e-bf39-2eb0805d2011" fqName="com.mbeddr.core.statements" version="1" />
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
-    <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
-    <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />
-    <language id="b4d28e19-7d2d-47e9-943e-3a41f97a0e52" fqName="com.mbeddr.mpsutil.plantuml.node" version="0" />
-    <language id="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2" fqName="com.mbeddr.mpsutil.suppresswarning" version="0" />
-    <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
-    <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
-    <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" fqName="jetbrains.mps.core.xml" version="0" />
-    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
-    <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
-    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
+    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
+    <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="1" />
+    <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
+    <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="3" />
+    <language slang="l:f93d1dbe-bfd1-42dd-932a-f375fa6f5373:com.mbeddr.core.make" version="1" />
+    <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="4" />
+    <language slang="l:3bf5377a-e904-4ded-9754-5a516023bfaa:com.mbeddr.core.pointers" version="0" />
+    <language slang="l:a9d69647-0840-491e-bf39-2eb0805d2011:com.mbeddr.core.statements" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
+    <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
+    <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
+    <language slang="l:c1c2a88a-323c-4605-a37d-9ab77a2ccbd2:com.mbeddr.mpsutil.suppresswarning" version="0" />
+    <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
+    <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="~_PreferencesModule#mbeddr.arduino.__spreferences.PlatformTemplates(mbeddr.arduino.__spreferences.PlatformTemplates)" version="0" />
diff --git a/_spreferences/TypeSizeConfiguration/models/mbeddr/arduino/__spreferences/TypeSizeConfiguration.mps b/_spreferences/TypeSizeConfiguration/models/mbeddr/arduino/__spreferences/TypeSizeConfiguration.mps
index d8ae20a..3b38e29 100644
--- a/_spreferences/TypeSizeConfiguration/models/mbeddr/arduino/__spreferences/TypeSizeConfiguration.mps
+++ b/_spreferences/TypeSizeConfiguration/models/mbeddr/arduino/__spreferences/TypeSizeConfiguration.mps
@@ -2,7 +2,7 @@
 <model ref="r:c5acdef6-b720-4ea9-8144-f4ed19a0f531(mbeddr.arduino.__spreferences.TypeSizeConfiguration)">
   <persistence version="9" />
   <languages>
-    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="2" />
+    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="3" />
   </languages>
   <imports />
   <registry>
diff --git a/_spreferences/TypeSizeConfiguration/module.msd b/_spreferences/TypeSizeConfiguration/module.msd
index 256340f..e3e7624 100644
--- a/_spreferences/TypeSizeConfiguration/module.msd
+++ b/_spreferences/TypeSizeConfiguration/module.msd
@@ -7,26 +7,26 @@
   </models>
   <sourcePath />
   <languageVersions>
-    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" fqName="com.mbeddr.core.base" version="2" />
-    <language id="223dd778-c44f-4ef3-9535-7aa7d12244a6" fqName="com.mbeddr.core.debug" version="0" />
-    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="2" />
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
-    <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
-    <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />
-    <language id="b4d28e19-7d2d-47e9-943e-3a41f97a0e52" fqName="com.mbeddr.mpsutil.plantuml.node" version="0" />
-    <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
-    <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
-    <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" fqName="jetbrains.mps.core.xml" version="0" />
-    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
-    <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
-    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
+    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
+    <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
+    <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="3" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
+    <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
+    <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
+    <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
+    <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="~_PreferencesModule#mbeddr.arduino.__spreferences.TypeSizeConfiguration(mbeddr.arduino.__spreferences.TypeSizeConfiguration)" version="0" />
diff --git a/languages/mbeddr.arduino.core/generator/template/mbeddr/arduino/core/generator/template/main@generator.mps b/languages/mbeddr.arduino.core/generator/template/mbeddr/arduino/core/generator/template/main@generator.mps
index 419da10..280eeb3 100755
--- a/languages/mbeddr.arduino.core/generator/template/mbeddr/arduino/core/generator/template/main@generator.mps
+++ b/languages/mbeddr.arduino.core/generator/template/mbeddr/arduino/core/generator/template/main@generator.mps
@@ -525,10 +525,7 @@
       <concept id="1240930444945" name="jetbrains.mps.lang.smodel.structure.SEnum_MemberOperation" flags="ng" index="3HdYuL">
         <reference id="1240930444946" name="member" index="3HdYuM" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <reference id="1140138128738" name="concept_old" index="1PxNhF" />
-        <child id="1140138123956" name="leftExpression_old" index="1PxMeX" />
-      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -3807,8 +3804,8 @@
                                         <node concept="2OqwBi" id="EvPvZE4nEP" role="2Oq$k0">
                                           <node concept="1eOMI4" id="EvPvZE4nEQ" role="2Oq$k0">
                                             <node concept="1PxgMI" id="EvPvZE4nER" role="1eOMHV">
-                                              <ref role="1PxNhF" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                                              <node concept="2OqwBi" id="EvPvZE4nES" role="1PxMeX">
+                                              <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                                              <node concept="2OqwBi" id="EvPvZE4nES" role="1m5AlR">
                                                 <node concept="37vLTw" id="2GeljgL483N" role="2Oq$k0">
                                                   <ref role="3cqZAo" node="EvPvZE4nED" resolve="bc" />
                                                 </node>
diff --git a/languages/mbeddr.arduino.core/languageModels/actions.mps b/languages/mbeddr.arduino.core/languageModels/actions.mps
index 96308e0..37cdd0f 100644
--- a/languages/mbeddr.arduino.core/languageModels/actions.mps
+++ b/languages/mbeddr.arduino.core/languageModels/actions.mps
@@ -2,7 +2,7 @@
 <model ref="r:acb1f50d-1355-41b6-8353-00095a559537(mbeddr.arduino.core.actions)">
   <persistence version="9" />
   <languages>
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="-1" />
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="3" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/languages/mbeddr.arduino.core/languageModels/editor.mps b/languages/mbeddr.arduino.core/languageModels/editor.mps
index dbf368e..da0d56a 100644
--- a/languages/mbeddr.arduino.core/languageModels/editor.mps
+++ b/languages/mbeddr.arduino.core/languageModels/editor.mps
@@ -5,7 +5,7 @@
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
     <use id="7e450f4e-1ac3-41ef-a851-4598161bdb94" name="de.slisson.mps.tables" version="-1" />
     <use id="f89904fb-9486-43a1-865e-5ad0375a8a88" name="de.itemis.mps.editor.bool" version="-1" />
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="1" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="4" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -90,7 +90,10 @@
       <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
-      <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
+      <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
+        <property id="16410578721444372" name="customizeEmptyCell" index="2ru_X1" />
+        <child id="16410578721629643" name="emptyCellModel" index="2ruayu" />
+      </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
       <concept id="1176474535556" name="jetbrains.mps.lang.editor.structure.QueryFunction_JComponent" flags="in" index="3Fmcul" />
       <concept id="1225898583838" name="jetbrains.mps.lang.editor.structure.ReadOnlyModelAccessor" flags="ng" index="1HfYo3">
@@ -284,16 +287,6 @@
       <concept id="4900677560559655527" name="de.itemis.mps.editor.bool.structure.CellModel_Checkbox" flags="sg" stub="416014060004381438" index="27S6Sx" />
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1204851882688" name="jetbrains.mps.lang.smodel.structure.LinkRefQualifier" flags="ng" index="26LbJo">
-        <reference id="1204851882689" name="link" index="26LbJp" />
-      </concept>
-      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
-        <child id="1144104376918" name="parameter" index="1xVPHs" />
-      </concept>
-      <concept id="7835263205327057228" name="jetbrains.mps.lang.smodel.structure.Node_GetChildrenAndChildAttributesOperation" flags="ng" index="Bykcj" />
-      <concept id="5168775467716640652" name="jetbrains.mps.lang.smodel.structure.OperationParm_LinkQualifier" flags="ng" index="1aIX9F">
-        <child id="5168775467716640653" name="linkQualifier" index="1aIX9E" />
-      </concept>
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
@@ -313,9 +306,6 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
-    </language>
   </registry>
   <node concept="24kQdi" id="4JsbL6NpKGJ">
     <property role="3GE5qa" value="register" />
@@ -340,7 +330,7 @@
         </node>
         <node concept="2reCLy" id="6OcqZnLQZmJ" role="2reCL6">
           <node concept="3F1sOY" id="6OcqZnLQZmK" role="2reSmM">
-            <ref role="1NtTu8" to="koo2:5cS3I48YO7u" />
+            <ref role="1NtTu8" to="koo2:5cS3I48YO7u" resolve="address" />
           </node>
           <node concept="2rfbtV" id="6OcqZnLQZmL" role="2recC9">
             <property role="2rfbtB" value="Address" />
@@ -375,7 +365,7 @@
         </node>
         <node concept="2reCLy" id="6OcqZnLniAH" role="2reCL6">
           <node concept="1iCGBv" id="4JsbL6NpNrU" role="2reSmM">
-            <ref role="1NtTu8" to="koo2:4JsbL6NpKGU" />
+            <ref role="1NtTu8" to="koo2:4JsbL6NpKGU" resolve="inputReg" />
             <node concept="1sVBvm" id="4JsbL6NpNrV" role="1sWHZn">
               <node concept="1HlG4h" id="cDLCOYieeF" role="2wV5jI">
                 <node concept="1HfYo3" id="cDLCOYieeG" role="1HlULh">
@@ -401,7 +391,7 @@
         </node>
         <node concept="2reCLy" id="6OcqZnLniUx" role="2reCL6">
           <node concept="1iCGBv" id="6OcqZnLniWy" role="2reSmM">
-            <ref role="1NtTu8" to="koo2:2mpt1xbR9gV" />
+            <ref role="1NtTu8" to="koo2:2mpt1xbR9gV" resolve="outputReg" />
             <node concept="1sVBvm" id="6OcqZnLniWz" role="1sWHZn">
               <node concept="1HlG4h" id="6OcqZnLniW$" role="2wV5jI">
                 <node concept="1HfYo3" id="6OcqZnLniW_" role="1HlULh">
@@ -435,7 +425,7 @@
         </node>
         <node concept="2reCLy" id="6OcqZnLnjgM" role="2reCL6">
           <node concept="1iCGBv" id="6OcqZnLnjjY" role="2reSmM">
-            <ref role="1NtTu8" to="koo2:4JsbL6NpKGY" />
+            <ref role="1NtTu8" to="koo2:4JsbL6NpKGY" resolve="dataDirectionReg" />
             <node concept="1sVBvm" id="6OcqZnLnjjZ" role="1sWHZn">
               <node concept="1HlG4h" id="6OcqZnLnjk0" role="2wV5jI">
                 <node concept="1HfYo3" id="6OcqZnLnjk1" role="1HlULh">
@@ -571,7 +561,7 @@
             </node>
             <node concept="2reCLy" id="6OcqZnLLwjq" role="2reCL6">
               <node concept="1iCGBv" id="6OcqZnLLwr$" role="2reSmM">
-                <ref role="1NtTu8" to="koo2:5cS3I48Zmhd" />
+                <ref role="1NtTu8" to="koo2:5cS3I48Zmhd" resolve="sReg" />
                 <node concept="1sVBvm" id="6OcqZnLLwr_" role="1sWHZn">
                   <node concept="1HlG4h" id="6OcqZnLLwrA" role="2wV5jI">
                     <node concept="1HfYo3" id="6OcqZnLLwrB" role="1HlULh">
@@ -601,7 +591,7 @@
             </node>
             <node concept="2reCLy" id="6OcqZnLLwln" role="2reCL6">
               <node concept="1iCGBv" id="6OcqZnLLwDe" role="2reSmM">
-                <ref role="1NtTu8" to="koo2:5cS3I48Zmhe" />
+                <ref role="1NtTu8" to="koo2:5cS3I48Zmhe" resolve="ADMUX" />
                 <node concept="1sVBvm" id="6OcqZnLLwDf" role="1sWHZn">
                   <node concept="1HlG4h" id="6OcqZnLLwDg" role="2wV5jI">
                     <node concept="1HfYo3" id="6OcqZnLLwDh" role="1HlULh">
@@ -641,7 +631,7 @@
             </node>
             <node concept="2reCLy" id="6OcqZnLLwnH" role="2reCL6">
               <node concept="1iCGBv" id="6OcqZnLLxcF" role="2reSmM">
-                <ref role="1NtTu8" to="koo2:5cS3I48Zmhf" />
+                <ref role="1NtTu8" to="koo2:5cS3I48Zmhf" resolve="ADCSRA" />
                 <node concept="1sVBvm" id="6OcqZnLLxcG" role="1sWHZn">
                   <node concept="1HlG4h" id="6OcqZnLLxcH" role="2wV5jI">
                     <node concept="1HfYo3" id="6OcqZnLLxcI" role="1HlULh">
@@ -674,7 +664,7 @@
             </node>
             <node concept="2reCLy" id="6OcqZnLLwQB" role="2reCL6">
               <node concept="1iCGBv" id="6OcqZnLLxql" role="2reSmM">
-                <ref role="1NtTu8" to="koo2:5cS3I48Zmhg" />
+                <ref role="1NtTu8" to="koo2:5cS3I48Zmhg" resolve="ADCL" />
                 <node concept="1sVBvm" id="6OcqZnLLxqm" role="1sWHZn">
                   <node concept="1HlG4h" id="6OcqZnLLxqn" role="2wV5jI">
                     <node concept="1HfYo3" id="6OcqZnLLxqo" role="1HlULh">
@@ -707,7 +697,7 @@
             </node>
             <node concept="2reCLy" id="6OcqZnLLwVt" role="2reCL6">
               <node concept="1iCGBv" id="6OcqZnLLxBZ" role="2reSmM">
-                <ref role="1NtTu8" to="koo2:5cS3I48Zmhi" />
+                <ref role="1NtTu8" to="koo2:5cS3I48Zmhi" resolve="ADCH" />
                 <node concept="1sVBvm" id="6OcqZnLLxC0" role="1sWHZn">
                   <node concept="1HlG4h" id="6OcqZnLLxC1" role="2wV5jI">
                     <node concept="1HfYo3" id="6OcqZnLLxC2" role="1HlULh">
@@ -745,7 +735,7 @@
       </node>
       <node concept="2rfBfz" id="6OcqZnLnhK8" role="3EZMnx">
         <node concept="2reSaE" id="6OcqZnLnhTC" role="2rf8GZ">
-          <ref role="2reCK$" to="koo2:4JsbL6NpKIN" />
+          <ref role="2reCK$" to="koo2:4JsbL6NpKIN" resolve="digitalPins" />
           <node concept="2rfbtV" id="6OcqZnLpw$N" role="2YiT2b">
             <property role="2rfbtB" value="Digital Pins" />
             <node concept="1g0IQG" id="6OcqZnLq_Lx" role="1geGt4">
@@ -770,7 +760,7 @@
       </node>
       <node concept="2rfBfz" id="6OcqZnLL$t2" role="3EZMnx">
         <node concept="2reSaE" id="6OcqZnLL$D2" role="2rf8GZ">
-          <ref role="2reCK$" to="koo2:3gdl6si6AgN" />
+          <ref role="2reCK$" to="koo2:3gdl6si6AgN" resolve="analogPins" />
           <node concept="2rfbtV" id="6OcqZnLPD_j" role="2YiT2b">
             <property role="2rfbtB" value="Analog Pins" />
             <node concept="1g0IQG" id="6OcqZnLPD__" role="1geGt4">
@@ -795,7 +785,7 @@
       </node>
       <node concept="2rfBfz" id="6OcqZnLQXAE" role="3EZMnx">
         <node concept="2reSaE" id="6OcqZnLQXY4" role="2rf8GZ">
-          <ref role="2reCK$" to="koo2:5TY7OGK$Adi" />
+          <ref role="2reCK$" to="koo2:5TY7OGK$Adi" resolve="registers" />
           <node concept="2rfbtV" id="6OcqZnLQXYb" role="2YiT2b">
             <property role="2rfbtB" value="Registers" />
             <node concept="1g0IQG" id="6OcqZnLTSTe" role="1geGt4">
@@ -820,7 +810,7 @@
       </node>
       <node concept="2rfBfz" id="6OcqZnLVMFh" role="3EZMnx">
         <node concept="2reSaE" id="6OcqZnLVMQI" role="2rf8GZ">
-          <ref role="2reCK$" to="koo2:5TY7OGKAIiS" />
+          <ref role="2reCK$" to="koo2:5TY7OGKAIiS" resolve="interrupts" />
           <node concept="2rfbtV" id="6OcqZnLVMRb" role="2YiT2b">
             <property role="2rfbtB" value="Interrupts" />
             <node concept="1g0IQG" id="6OcqZnLVMRc" role="1geGt4">
@@ -845,7 +835,7 @@
       </node>
       <node concept="2rfBfz" id="6OcqZnLVN3n" role="3EZMnx">
         <node concept="2reSaE" id="6OcqZnLVNfi" role="2rf8GZ">
-          <ref role="2reCK$" to="koo2:1ZYgP9n4Cc$" />
+          <ref role="2reCK$" to="koo2:1ZYgP9n4Cc$" resolve="serialPorts" />
           <node concept="18hEb6" id="6OcqZnLVSnG" role="2YiT2b">
             <node concept="2r3Xtq" id="6OcqZnLVSnI" role="18hjfq">
               <node concept="2rfbtV" id="6OcqZnLVSDS" role="uCobI">
@@ -1085,7 +1075,7 @@
         <property role="3F0ifm" value="arduino" />
       </node>
       <node concept="1iCGBv" id="4JsbL6NqgHr" role="3EZMnx">
-        <ref role="1NtTu8" to="koo2:4JsbL6NpX5B" />
+        <ref role="1NtTu8" to="koo2:4JsbL6NpX5B" resolve="description" />
         <node concept="1sVBvm" id="4JsbL6NqgHs" role="1sWHZn">
           <node concept="1HlG4h" id="nYCWklJuZd" role="2wV5jI">
             <node concept="1HfYo3" id="nYCWklJuZe" role="1HlULh">
@@ -1411,7 +1401,7 @@
       <node concept="2reCLk" id="4O$fzoZSO7B" role="2r0Tv6">
         <node concept="2reCLy" id="4O$fzoZSO8T" role="2reCL6">
           <node concept="1iCGBv" id="4O$fzoZSO8Z" role="2reSmM">
-            <ref role="1NtTu8" to="koo2:3gdl6si6JD8" />
+            <ref role="1NtTu8" to="koo2:3gdl6si6JD8" resolve="pin" />
             <node concept="1sVBvm" id="4O$fzoZSO90" role="1sWHZn">
               <node concept="1HlG4h" id="4O$fzoZSO98" role="2wV5jI">
                 <node concept="1HfYo3" id="4O$fzoZSO9a" role="1HlULh">
@@ -1470,7 +1460,7 @@
         <node concept="l2Vlx" id="4O$fzoZU87J" role="2iSdaV" />
         <node concept="2rfBfz" id="4O$fzoZKSN7" role="3EZMnx">
           <node concept="2reSaE" id="4O$fzoZKSN8" role="2rf8GZ">
-            <ref role="2reCK$" to="koo2:3gdl6si6LyV" />
+            <ref role="2reCK$" to="koo2:3gdl6si6LyV" resolve="digitalConfig" />
           </node>
           <node concept="2rfbtV" id="4O$fzoZKSN9" role="2rfbqz">
             <property role="2rfbtB" value="pin" />
@@ -1516,7 +1506,7 @@
         </node>
       </node>
       <node concept="3F2HdR" id="1qwvy7xHbmC" role="3EZMnx">
-        <ref role="1NtTu8" to="koo2:1qwvy7xGKCQ" />
+        <ref role="1NtTu8" to="koo2:1qwvy7xGKCQ" resolve="analogPinConfiguration" />
         <node concept="2iRkQZ" id="1qwvy7xHcdZ" role="2czzBx" />
         <node concept="VPM3Z" id="1qwvy7xHbmE" role="3F10Kt">
           <property role="VOm3f" value="false" />
@@ -1563,7 +1553,7 @@
     <property role="3GE5qa" value="pin" />
     <ref role="1XX52x" to="koo2:4EC9auLFa7N" resolve="DigitalPinRefExpression" />
     <node concept="1iCGBv" id="4EC9auLFa7Y" role="2wV5jI">
-      <ref role="1NtTu8" to="koo2:4EC9auLFa7O" />
+      <ref role="1NtTu8" to="koo2:4EC9auLFa7O" resolve="pinConfig" />
       <node concept="1sVBvm" id="4EC9auLFa7Z" role="1sWHZn">
         <node concept="1HlG4h" id="4EC9auLFa81" role="2wV5jI">
           <node concept="1HfYo3" id="4EC9auLFa82" role="1HlULh">
@@ -1602,7 +1592,7 @@
     <property role="3GE5qa" value="register" />
     <ref role="1XX52x" to="koo2:cDLCOYiq1u" resolve="RegisterRefExpression" />
     <node concept="1iCGBv" id="cDLCOYiq1y" role="2wV5jI">
-      <ref role="1NtTu8" to="koo2:cDLCOYiq1v" />
+      <ref role="1NtTu8" to="koo2:cDLCOYiq1v" resolve="reg" />
       <node concept="1sVBvm" id="cDLCOYiq1z" role="1sWHZn">
         <node concept="1HlG4h" id="cDLCOYiq1_" role="2wV5jI">
           <node concept="1HfYo3" id="cDLCOYiq1A" role="1HlULh">
@@ -1630,7 +1620,7 @@
         <property role="3F0ifm" value="delay(" />
       </node>
       <node concept="3F1sOY" id="26IgR5b9RS6" role="3EZMnx">
-        <ref role="1NtTu8" to="koo2:26IgR5b9RPe" />
+        <ref role="1NtTu8" to="koo2:26IgR5b9RPe" resolve="expression" />
       </node>
       <node concept="3F0ifn" id="26IgR5b9RS8" role="3EZMnx">
         <property role="3F0ifm" value=")" />
@@ -1646,7 +1636,7 @@
         <property role="3F0ifm" value="atomic" />
       </node>
       <node concept="3F1sOY" id="1pOg3uxo39I" role="3EZMnx">
-        <ref role="1NtTu8" to="koo2:1pOg3uxo39B" />
+        <ref role="1NtTu8" to="koo2:1pOg3uxo39B" resolve="body" />
       </node>
     </node>
   </node>
@@ -1654,7 +1644,7 @@
     <property role="3GE5qa" value="pin" />
     <ref role="1XX52x" to="koo2:1qwvy7xGC6o" resolve="AnalogPinRefExpression" />
     <node concept="1iCGBv" id="1qwvy7xGC6u" role="2wV5jI">
-      <ref role="1NtTu8" to="koo2:1qwvy7xGC6t" />
+      <ref role="1NtTu8" to="koo2:1qwvy7xGC6t" resolve="pin" />
       <node concept="1sVBvm" id="1qwvy7xGC6v" role="1sWHZn">
         <node concept="1HlG4h" id="1qwvy7xGC6x" role="2wV5jI">
           <node concept="1HfYo3" id="1qwvy7xGC6y" role="1HlULh">
@@ -1684,7 +1674,7 @@
         <property role="3F0ifm" value="pin" />
       </node>
       <node concept="1iCGBv" id="1qwvy7xGC7f" role="3EZMnx">
-        <ref role="1NtTu8" to="koo2:1qwvy7xGC75" />
+        <ref role="1NtTu8" to="koo2:1qwvy7xGC75" resolve="analogPin" />
         <node concept="1sVBvm" id="1qwvy7xGC7g" role="1sWHZn">
           <node concept="3F0A7n" id="1qwvy7xGC7i" role="2wV5jI">
             <property role="1Intyy" value="true" />
@@ -1716,7 +1706,7 @@
         </node>
       </node>
       <node concept="1iCGBv" id="7fU3Y2eiX7n" role="3EZMnx">
-        <ref role="1NtTu8" to="koo2:7fU3Y2eiWVo" />
+        <ref role="1NtTu8" to="koo2:7fU3Y2eiWVo" resolve="serialConfig" />
         <node concept="1sVBvm" id="7fU3Y2eiX7o" role="1sWHZn">
           <node concept="1HlG4h" id="7fU3Y2eiX7x" role="2wV5jI">
             <node concept="1HfYo3" id="7fU3Y2eiX7z" role="1HlULh">
@@ -1727,7 +1717,7 @@
                       <node concept="2OqwBi" id="7fU3Y2eiXuK" role="2Oq$k0">
                         <node concept="pncrf" id="7fU3Y2eiXkx" role="2Oq$k0" />
                         <node concept="3TrEf2" id="7fU3Y2ej04o" role="2OqNvi">
-                          <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" />
+                          <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
                         </node>
                       </node>
                       <node concept="3TrcHB" id="7fU3Y2ej2Fa" role="2OqNvi">
@@ -1761,7 +1751,7 @@
         </node>
       </node>
       <node concept="1iCGBv" id="3gQUTJ3ycJc" role="3EZMnx">
-        <ref role="1NtTu8" to="koo2:3gQUTJ3y9pO" />
+        <ref role="1NtTu8" to="koo2:3gQUTJ3y9pO" resolve="port" />
         <node concept="1sVBvm" id="3gQUTJ3ycJd" role="1sWHZn">
           <node concept="1HlG4h" id="3gQUTJ3ycJm" role="2wV5jI">
             <node concept="1HfYo3" id="3gQUTJ3ycJo" role="1HlULh">
@@ -1847,7 +1837,7 @@
         </node>
         <node concept="2reCLy" id="6OcqZnLVPNp" role="2reCL6">
           <node concept="1iCGBv" id="6OcqZnLVPOu" role="2reSmM">
-            <ref role="1NtTu8" to="koo2:7fU3Y2ecVfa" />
+            <ref role="1NtTu8" to="koo2:7fU3Y2ecVfa" resolve="UCSRA" />
             <node concept="1sVBvm" id="6OcqZnLVPOv" role="1sWHZn">
               <node concept="1HlG4h" id="6OcqZnLVPOw" role="2wV5jI">
                 <node concept="1HfYo3" id="6OcqZnLVPOx" role="1HlULh">
@@ -1873,7 +1863,7 @@
         </node>
         <node concept="2reCLy" id="6OcqZnLVQ2P" role="2reCL6">
           <node concept="1iCGBv" id="6OcqZnLVQ4Q" role="2reSmM">
-            <ref role="1NtTu8" to="koo2:7fU3Y2ecVh8" />
+            <ref role="1NtTu8" to="koo2:7fU3Y2ecVh8" resolve="UCSRB" />
             <node concept="1sVBvm" id="6OcqZnLVQ4R" role="1sWHZn">
               <node concept="1HlG4h" id="6OcqZnLVQ4S" role="2wV5jI">
                 <node concept="1HfYo3" id="6OcqZnLVQ4T" role="1HlULh">
@@ -1899,7 +1889,7 @@
         </node>
         <node concept="2reCLy" id="6OcqZnLVQjY" role="2reCL6">
           <node concept="1iCGBv" id="6OcqZnLVQmQ" role="2reSmM">
-            <ref role="1NtTu8" to="koo2:7fU3Y2ecVhe" />
+            <ref role="1NtTu8" to="koo2:7fU3Y2ecVhe" resolve="UCSRC" />
             <node concept="1sVBvm" id="6OcqZnLVQmR" role="1sWHZn">
               <node concept="1HlG4h" id="6OcqZnLVQmS" role="2wV5jI">
                 <node concept="1HfYo3" id="6OcqZnLVQmT" role="1HlULh">
@@ -1925,7 +1915,7 @@
         </node>
         <node concept="2reCLy" id="6OcqZnLVQAP" role="2reCL6">
           <node concept="1iCGBv" id="6OcqZnLVQEE" role="2reSmM">
-            <ref role="1NtTu8" to="koo2:7fU3Y2ecVjc" />
+            <ref role="1NtTu8" to="koo2:7fU3Y2ecVjc" resolve="UDR" />
             <node concept="1sVBvm" id="6OcqZnLVQEF" role="1sWHZn">
               <node concept="1HlG4h" id="6OcqZnLVQEG" role="2wV5jI">
                 <node concept="1HfYo3" id="6OcqZnLVQEH" role="1HlULh">
@@ -1951,7 +1941,7 @@
         </node>
         <node concept="2reCLy" id="6OcqZnLVQW1" role="2reCL6">
           <node concept="1iCGBv" id="6OcqZnLVR0S" role="2reSmM">
-            <ref role="1NtTu8" to="koo2:7fU3Y2eemHw" />
+            <ref role="1NtTu8" to="koo2:7fU3Y2eemHw" resolve="UBRRL" />
             <node concept="1sVBvm" id="6OcqZnLVR0T" role="1sWHZn">
               <node concept="1HlG4h" id="6OcqZnLVR0U" role="2wV5jI">
                 <node concept="1HfYo3" id="6OcqZnLVR0V" role="1HlULh">
@@ -1977,7 +1967,7 @@
         </node>
         <node concept="2reCLy" id="6OcqZnLVRiY" role="2reCL6">
           <node concept="1iCGBv" id="6OcqZnLVRow" role="2reSmM">
-            <ref role="1NtTu8" to="koo2:7fU3Y2ecVlc" />
+            <ref role="1NtTu8" to="koo2:7fU3Y2ecVlc" resolve="UBRRH" />
             <node concept="1sVBvm" id="6OcqZnLVRox" role="1sWHZn">
               <node concept="1HlG4h" id="6OcqZnLVRoy" role="2wV5jI">
                 <node concept="1HfYo3" id="6OcqZnLVRoz" role="1HlULh">
@@ -2027,7 +2017,7 @@
         </node>
         <node concept="2reCLy" id="6OcqZnLQYyc" role="2reCL6">
           <node concept="3F1sOY" id="6OcqZnLQYyS" role="2reSmM">
-            <ref role="1NtTu8" to="koo2:5cS3I48YO7u" />
+            <ref role="1NtTu8" to="koo2:5cS3I48YO7u" resolve="address" />
           </node>
           <node concept="2rfbtV" id="6OcqZnLQYyY" role="2recC9">
             <property role="2rfbtB" value="Address" />
@@ -2043,7 +2033,7 @@
         <property role="3F0ifm" value="write to " />
       </node>
       <node concept="1iCGBv" id="4Mvxa96AeQV" role="3EZMnx">
-        <ref role="1NtTu8" to="koo2:4Mvxa96AcG1" />
+        <ref role="1NtTu8" to="koo2:4Mvxa96AcG1" resolve="target" />
         <node concept="1sVBvm" id="4Mvxa96AeQW" role="1sWHZn">
           <node concept="1HlG4h" id="4Mvxa96AeR2" role="2wV5jI">
             <node concept="1HfYo3" id="4Mvxa96AeR4" role="1HlULh">
@@ -2068,7 +2058,7 @@
         <property role="3F0ifm" value="(" />
       </node>
       <node concept="3F1sOY" id="4Mvxa96Akaj" role="3EZMnx">
-        <ref role="1NtTu8" to="koo2:4Mvxa96AcG3" />
+        <ref role="1NtTu8" to="koo2:4Mvxa96AcG3" resolve="expression" />
       </node>
       <node concept="3F0ifn" id="4Mvxa96Aknw" role="3EZMnx">
         <property role="3F0ifm" value=")" />
@@ -2082,7 +2072,7 @@
         <property role="3F0ifm" value="setup" />
       </node>
       <node concept="3F1sOY" id="3dH4JopcvAY" role="3EZMnx">
-        <ref role="1NtTu8" to="koo2:3dH4JopctrO" />
+        <ref role="1NtTu8" to="koo2:3dH4JopctrO" resolve="body" />
       </node>
       <node concept="l2Vlx" id="3dH4JopcvAO" role="2iSdaV" />
     </node>
@@ -2094,7 +2084,7 @@
         <property role="3F0ifm" value="main loop" />
       </node>
       <node concept="3F1sOY" id="3dH4Jopl$nK" role="3EZMnx">
-        <ref role="1NtTu8" to="koo2:3dH4Jopl$nI" />
+        <ref role="1NtTu8" to="koo2:3dH4Jopl$nI" resolve="body" />
       </node>
       <node concept="l2Vlx" id="3dH4Jopl$n$" role="2iSdaV" />
     </node>
@@ -2126,7 +2116,7 @@
                 <node concept="2OqwBi" id="6RZtz2lhxL7" role="2Oq$k0">
                   <node concept="pncrf" id="6RZtz2lhx_D" role="2Oq$k0" />
                   <node concept="3TrEf2" id="6RZtz2lh$hM" role="2OqNvi">
-                    <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" />
+                    <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" resolve="condition" />
                   </node>
                 </node>
                 <node concept="3x8VRR" id="6RZtz2lhAYX" role="2OqNvi" />
@@ -2137,7 +2127,7 @@
         <node concept="Vb9p2" id="6RZtz2loAxN" role="3F10Kt" />
       </node>
       <node concept="3F1sOY" id="6RZtz2kYjfl" role="3EZMnx">
-        <ref role="1NtTu8" to="koo2:6RZtz2kYjen" />
+        <ref role="1NtTu8" to="koo2:6RZtz2kYjen" resolve="mode" />
         <ref role="1k5W1q" to="tpen:hshU_KJ" resolve="Annotation" />
         <node concept="Vb9p2" id="6RZtz2lnrb3" role="3F10Kt">
           <property role="Vbekb" value="BOLD" />
@@ -2152,7 +2142,7 @@
                 <node concept="2OqwBi" id="6RZtz2lhCAR" role="2Oq$k0">
                   <node concept="pncrf" id="6RZtz2lhCrp" role="2Oq$k0" />
                   <node concept="3TrEf2" id="6RZtz2lhF7x" role="2OqNvi">
-                    <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" />
+                    <ref role="3Tt5mk" to="koo2:6RZtz2l5VS8" resolve="condition" />
                   </node>
                 </node>
                 <node concept="3x8VRR" id="6RZtz2lhHSr" role="2OqNvi" />
@@ -2166,25 +2156,13 @@
         </node>
       </node>
       <node concept="3F1sOY" id="6RZtz2lhBYl" role="3EZMnx">
-        <ref role="1NtTu8" to="koo2:6RZtz2l5VS8" />
-        <node concept="pkWqt" id="6RZtz2ljrbj" role="pqm2j">
-          <node concept="3clFbS" id="6RZtz2ljrbk" role="2VODD2">
-            <node concept="3clFbF" id="6RZtz2ljrlU" role="3cqZAp">
-              <node concept="2OqwBi" id="xPyHHTtYTn" role="3clFbG">
-                <node concept="2OqwBi" id="6RZtz2ljrxn" role="2Oq$k0">
-                  <node concept="pncrf" id="6RZtz2ljrlT" role="2Oq$k0" />
-                  <node concept="Bykcj" id="xPyHHTtYTk" role="2OqNvi">
-                    <node concept="1aIX9F" id="xPyHHTtYTl" role="1xVPHs">
-                      <node concept="26LbJo" id="xPyHHTtYTm" role="1aIX9E">
-                        <ref role="26LbJp" to="koo2:6RZtz2l5VS8" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3GX2aA" id="xPyHHTtYTo" role="2OqNvi" />
-              </node>
-            </node>
+        <property role="2ru_X1" value="true" />
+        <ref role="1NtTu8" to="koo2:6RZtz2l5VS8" resolve="condition" />
+        <node concept="3EZMnI" id="1VFlOLSSLXu" role="2ruayu">
+          <node concept="VPM3Z" id="1VFlOLSSLXv" role="3F10Kt">
+            <property role="VOm3f" value="false" />
           </node>
+          <node concept="l2Vlx" id="1VFlOLSSLXw" role="2iSdaV" />
         </node>
       </node>
       <node concept="3F0ifn" id="6RZtz2kYjfs" role="3EZMnx">
@@ -2217,7 +2195,7 @@
         <ref role="1k5W1q" to="cl6c:5Oog2UbR$Q9" resolve="transformationHint" />
       </node>
       <node concept="3F1sOY" id="1Jb2EknJfJh" role="3EZMnx">
-        <ref role="1NtTu8" to="koo2:1Jb2EknHMaW" />
+        <ref role="1NtTu8" to="koo2:1Jb2EknHMaW" resolve="body" />
         <node concept="pVoyu" id="1Jb2EknJfJp" role="3F10Kt" />
       </node>
       <node concept="l2Vlx" id="1Jb2EknJfId" role="2iSdaV" />
@@ -2231,7 +2209,7 @@
         <property role="3F0ifm" value="schedule" />
       </node>
       <node concept="1iCGBv" id="1Jb2EknQ9rl" role="3EZMnx">
-        <ref role="1NtTu8" to="koo2:1Jb2EknQ9mx" />
+        <ref role="1NtTu8" to="koo2:1Jb2EknQ9mx" resolve="task" />
         <node concept="1sVBvm" id="1Jb2EknQ9rm" role="1sWHZn">
           <node concept="1HlG4h" id="1Jb2EknQ9rs" role="2wV5jI">
             <node concept="1HfYo3" id="1Jb2EknQ9ru" role="1HlULh">
diff --git a/languages/mbeddr.arduino.core/languageModels/intentions.mps b/languages/mbeddr.arduino.core/languageModels/intentions.mps
index 15a49ff..53df3e3 100755
--- a/languages/mbeddr.arduino.core/languageModels/intentions.mps
+++ b/languages/mbeddr.arduino.core/languageModels/intentions.mps
@@ -5,8 +5,8 @@
     <use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="-1" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="-1" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="-1" />
-    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="2" />
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="3" />
+    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="3" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/languages/mbeddr.arduino.core/languageModels/structure.mps b/languages/mbeddr.arduino.core/languageModels/structure.mps
index 0d1e0fe..df3c0f0 100755
--- a/languages/mbeddr.arduino.core/languageModels/structure.mps
+++ b/languages/mbeddr.arduino.core/languageModels/structure.mps
@@ -2,7 +2,8 @@
 <model ref="r:3c7790ca-a687-4dfa-a94e-7b5e9848d78c(mbeddr.arduino.core.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="1" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="3" />
+    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
     <devkit ref="d2a9c55c-6bdc-4cc2-97e1-4ba7552f5584(com.mbeddr.core)" />
   </languages>
diff --git a/languages/mbeddr.arduino.core/languageModels/typesystem.mps b/languages/mbeddr.arduino.core/languageModels/typesystem.mps
index 471ee71..0416572 100755
--- a/languages/mbeddr.arduino.core/languageModels/typesystem.mps
+++ b/languages/mbeddr.arduino.core/languageModels/typesystem.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
-    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="2" />
+    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="3" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl b/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl
index 5da5ab5..c4edf7d 100755
--- a/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl
+++ b/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl
@@ -44,22 +44,22 @@
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
       </usedDevKits>
       <languageVersions>
-        <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="2" />
-        <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="0" />
+        <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
+        <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="1" />
         <language slang="l:b2da2e1a-b542-47f5-9be0-4dc21efe74a4:com.mbeddr.core.checks" version="0" />
         <language slang="l:390de4af-0c8d-4716-8dec-3d05ca751b28:com.mbeddr.core.cinterpreter" version="0" />
         <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
         <language slang="l:ebb5e132-d298-4649-b320-b3f4d7f3acff:com.mbeddr.core.debug.blext" version="0" />
         <language slang="l:783af01f-87a7-412c-be99-293a162652b5:com.mbeddr.core.embedded" version="0" />
-        <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="2" />
+        <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="3" />
         <language slang="l:ad5e9db1-9600-47c7-86ef-614165b281b8:com.mbeddr.core.legacy" version="0" />
         <language slang="l:f93d1dbe-bfd1-42dd-932a-f375fa6f5373:com.mbeddr.core.make" version="1" />
-        <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="0" />
+        <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="4" />
         <language slang="l:62296a07-bc38-46d2-8034-198c24063588:com.mbeddr.core.modules.gen" version="0" />
         <language slang="l:3bf5377a-e904-4ded-9754-5a516023bfaa:com.mbeddr.core.pointers" version="0" />
         <language slang="l:a9d69647-0840-491e-bf39-2eb0805d2011:com.mbeddr.core.statements" version="1" />
         <language slang="l:efda956e-491e-4f00-ba14-36af2f213ecf:com.mbeddr.core.udt" version="1" />
-        <language slang="l:06d68b77-b699-4918-83b8-857e63787800:com.mbeddr.core.unittest" version="1" />
+        <language slang="l:06d68b77-b699-4918-83b8-857e63787800:com.mbeddr.core.unittest" version="3" />
         <language slang="l:2693fc71-9b0e-4b05-ab13-f57227d675f2:com.mbeddr.core.util" version="0" />
         <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
         <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
@@ -88,8 +88,8 @@
         <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="2" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="1" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
       </languageVersions>
@@ -134,7 +134,7 @@
         <module reference="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
         <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
@@ -226,22 +226,22 @@
     <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="2" />
-    <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="0" />
+    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
+    <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="1" />
     <language slang="l:b2da2e1a-b542-47f5-9be0-4dc21efe74a4:com.mbeddr.core.checks" version="0" />
     <language slang="l:390de4af-0c8d-4716-8dec-3d05ca751b28:com.mbeddr.core.cinterpreter" version="0" />
     <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
     <language slang="l:ebb5e132-d298-4649-b320-b3f4d7f3acff:com.mbeddr.core.debug.blext" version="0" />
     <language slang="l:783af01f-87a7-412c-be99-293a162652b5:com.mbeddr.core.embedded" version="0" />
-    <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="2" />
+    <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="3" />
     <language slang="l:ad5e9db1-9600-47c7-86ef-614165b281b8:com.mbeddr.core.legacy" version="0" />
     <language slang="l:f93d1dbe-bfd1-42dd-932a-f375fa6f5373:com.mbeddr.core.make" version="1" />
-    <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="0" />
+    <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="4" />
     <language slang="l:62296a07-bc38-46d2-8034-198c24063588:com.mbeddr.core.modules.gen" version="0" />
     <language slang="l:3bf5377a-e904-4ded-9754-5a516023bfaa:com.mbeddr.core.pointers" version="0" />
     <language slang="l:a9d69647-0840-491e-bf39-2eb0805d2011:com.mbeddr.core.statements" version="1" />
     <language slang="l:efda956e-491e-4f00-ba14-36af2f213ecf:com.mbeddr.core.udt" version="1" />
-    <language slang="l:06d68b77-b699-4918-83b8-857e63787800:com.mbeddr.core.unittest" version="1" />
+    <language slang="l:06d68b77-b699-4918-83b8-857e63787800:com.mbeddr.core.unittest" version="3" />
     <language slang="l:2693fc71-9b0e-4b05-ab13-f57227d675f2:com.mbeddr.core.util" version="0" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
     <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
@@ -268,18 +268,19 @@
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="0" />
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
-    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="3" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="1" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="4" />
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="2" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="1" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
@@ -334,7 +335,7 @@
     <module reference="18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="13744753-c81f-424a-9c1b-cf8943bf4e86(jetbrains.mps.lang.sharedConcepts)" version="0" />
-    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
diff --git a/languages/mbeddr.arduino.core/solutions/pluginSolution/mbeddr.arduino.util.msd b/languages/mbeddr.arduino.core/solutions/pluginSolution/mbeddr.arduino.util.msd
index c867d39..d95809b 100644
--- a/languages/mbeddr.arduino.core/solutions/pluginSolution/mbeddr.arduino.util.msd
+++ b/languages/mbeddr.arduino.core/solutions/pluginSolution/mbeddr.arduino.util.msd
@@ -23,27 +23,27 @@
     <dependency reexport="false">3c4c8461-a533-4459-916a-dc0176793b4c(mbeddr.arduino.core)</dependency>
   </dependencies>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
-    <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
-    <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language id="fbc14279-5e2a-4c87-a5d1-5f7061e6c456" fqName="jetbrains.mps.debugger.api.lang" version="0" />
-    <language id="f3347d8a-0e79-4f35-8ac9-1574f25c986f" fqName="jetbrains.mps.execution.commands" version="0" />
-    <language id="73c1a490-99fa-4d0d-8292-b8985697c74b" fqName="jetbrains.mps.execution.common" version="0" />
-    <language id="22e72e4c-0f69-46ce-8403-6750153aa615" fqName="jetbrains.mps.execution.configurations" version="0" />
-    <language id="756e911c-3f1f-4a48-bdf5-a2ceb91b723c" fqName="jetbrains.mps.execution.settings" version="0" />
-    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
-    <language id="fe9d76d7-5809-45c9-ae28-a40915b4d6ff" fqName="jetbrains.mps.lang.checkedName" version="0" />
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" fqName="jetbrains.mps.lang.plugin" version="0" />
-    <language id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" fqName="jetbrains.mps.lang.plugin.standalone" version="0" />
-    <language id="982eb8df-2c96-4bd7-9963-11712ea622e5" fqName="jetbrains.mps.lang.resources" version="0" />
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
-    <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l:fbc14279-5e2a-4c87-a5d1-5f7061e6c456:jetbrains.mps.debugger.api.lang" version="1" />
+    <language slang="l:f3347d8a-0e79-4f35-8ac9-1574f25c986f:jetbrains.mps.execution.commands" version="0" />
+    <language slang="l:73c1a490-99fa-4d0d-8292-b8985697c74b:jetbrains.mps.execution.common" version="0" />
+    <language slang="l:22e72e4c-0f69-46ce-8403-6750153aa615:jetbrains.mps.execution.configurations" version="0" />
+    <language slang="l:756e911c-3f1f-4a48-bdf5-a2ceb91b723c:jetbrains.mps.execution.settings" version="0" />
+    <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
+    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="2" />
+    <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -89,7 +89,7 @@
     <module reference="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
diff --git a/languages/mbeddr.arduino.core/solutions/pluginSolution/models/mbeddr/arduino/core/pluginSolution/plugin.mps b/languages/mbeddr.arduino.core/solutions/pluginSolution/models/mbeddr/arduino/core/pluginSolution/plugin.mps
index 95e92c2..fc851a2 100755
--- a/languages/mbeddr.arduino.core/solutions/pluginSolution/models/mbeddr/arduino/core/pluginSolution/plugin.mps
+++ b/languages/mbeddr.arduino.core/solutions/pluginSolution/models/mbeddr/arduino/core/pluginSolution/plugin.mps
@@ -9,9 +9,9 @@
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
     <use id="756e911c-3f1f-4a48-bdf5-a2ceb91b723c" name="jetbrains.mps.execution.settings" version="-1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
-    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="-1" />
+    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="2" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
   </languages>
   <imports>
@@ -34,9 +34,8 @@
   </imports>
   <registry>
     <language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
-      <concept id="8974276187400029883" name="jetbrains.mps.lang.resources.structure.FileIcon" flags="ng" index="1QGGSu" />
-      <concept id="8974276187400029898" name="jetbrains.mps.lang.resources.structure.Resource" flags="ng" index="1QGGTJ">
-        <property id="8974276187400029899" name="path" index="1QGGTI" />
+      <concept id="8974276187400029883" name="jetbrains.mps.lang.resources.structure.FileIcon" flags="ng" index="1QGGSu">
+        <property id="2756621024541341363" name="file" index="1iqoE4" />
       </concept>
     </language>
     <language id="f3347d8a-0e79-4f35-8ac9-1574f25c986f" name="jetbrains.mps.execution.commands">
@@ -372,7 +371,7 @@
   <node concept="3wDVqV" id="4aykRFtH60g">
     <property role="TrG5h" value="Arduino Binary" />
     <node concept="1QGGSu" id="4aykRFtH60h" role="1bitO_">
-      <property role="1QGGTI" value="${mbeddr.arduino}/icons/arduino-icon-small.png" />
+      <property role="1iqoE4" value="${mbeddr.arduino}/icons/arduino-icon-small.png" />
     </node>
   </node>
   <node concept="2DaZZR" id="2GeljgLtRP$" />
@@ -588,7 +587,7 @@
       </node>
     </node>
     <node concept="1QGGSu" id="4aykRFtH3Tn" role="3GxumY">
-      <property role="1QGGTI" value="${mbeddr.arduino}/icons/arduino-icon-small.png" />
+      <property role="1iqoE4" value="${mbeddr.arduino}/icons/arduino-icon-small.png" />
     </node>
     <node concept="yHkDk" id="4aykRFtH7fz" role="yHkHj">
       <node concept="3clFbS" id="4aykRFtH7f$" role="2VODD2">
diff --git a/languages/mbeddr.arduino.interrupts/languageModels/structure.mps b/languages/mbeddr.arduino.interrupts/languageModels/structure.mps
index 37abc7b..04f38d3 100755
--- a/languages/mbeddr.arduino.interrupts/languageModels/structure.mps
+++ b/languages/mbeddr.arduino.interrupts/languageModels/structure.mps
@@ -2,7 +2,8 @@
 <model ref="r:d55f0341-9e17-4146-bd31-d6e253c08cba(mbeddr.arduino.interrupts.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="1" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="3" />
+    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl b/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl
index b1331ca..6ed212d 100755
--- a/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl
+++ b/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl
@@ -60,7 +60,7 @@
         <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="2" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
         <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
@@ -104,7 +104,7 @@
         <module reference="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
         <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
@@ -134,15 +134,16 @@
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="3" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="1" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="4" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="2" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="1" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
@@ -183,7 +184,7 @@
     <module reference="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
diff --git a/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl b/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl
index 03ea365..2fd7798 100755
--- a/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl
+++ b/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl
@@ -24,7 +24,39 @@
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
       </usedDevKits>
       <languageVersions>
+        <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
+        <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
+        <language slang="l:783af01f-87a7-412c-be99-293a162652b5:com.mbeddr.core.embedded" version="0" />
+        <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="3" />
+        <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="4" />
+        <language slang="l:3bf5377a-e904-4ded-9754-5a516023bfaa:com.mbeddr.core.pointers" version="0" />
+        <language slang="l:a9d69647-0840-491e-bf39-2eb0805d2011:com.mbeddr.core.statements" version="1" />
+        <language slang="l:efda956e-491e-4f00-ba14-36af2f213ecf:com.mbeddr.core.udt" version="1" />
+        <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+        <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
+        <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
+        <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
+        <language slang="l:c1c2a88a-323c-4605-a37d-9ab77a2ccbd2:com.mbeddr.mpsutil.suppresswarning" version="0" />
+        <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
+        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+        <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+        <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
+        <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
+        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+        <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
+        <language slang="l:3828799d-97c8-48d0-af8b-39b903457e1e:mbeddr.arduino.registers" version="0" />
       </languageVersions>
       <dependencyVersions>
         <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -102,15 +134,19 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
     <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="3" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="4" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/languages/mbeddr.arduino.statemachine/generator/template/main@generator.mps b/languages/mbeddr.arduino.statemachine/generator/template/main@generator.mps
index 817a22e..cefd706 100755
--- a/languages/mbeddr.arduino.statemachine/generator/template/main@generator.mps
+++ b/languages/mbeddr.arduino.statemachine/generator/template/main@generator.mps
@@ -5,11 +5,11 @@
     <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="-1" />
     <use id="028007ba-e266-4d05-ab46-25264b977671" name="mbeddr.arduino.statemachine" version="-1" />
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="-1" />
-    <use id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules" version="-1" />
+    <use id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules" version="4" />
     <use id="564e97d6-8fb7-41f5-bfc1-c7ed376efd62" name="com.mbeddr.ext.statemachines" version="-1" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="-1" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
-    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="2" />
+    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="3" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/languages/mbeddr.arduino.statemachine/languageModels/editor.mps b/languages/mbeddr.arduino.statemachine/languageModels/editor.mps
index 6ca274a..f4bc42f 100644
--- a/languages/mbeddr.arduino.statemachine/languageModels/editor.mps
+++ b/languages/mbeddr.arduino.statemachine/languageModels/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:e0ee660a-32fe-4b0d-b08e-ab53b362dcbd(mbeddr.arduino.statemachine.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="1" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="4" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -117,7 +117,7 @@
         <property role="3F0ifm" value="bind" />
       </node>
       <node concept="1iCGBv" id="2NO1T5RzgQV" role="3EZMnx">
-        <ref role="1NtTu8" to="ttha:2NO1T5RzgPG" />
+        <ref role="1NtTu8" to="ttha:2NO1T5RzgPG" resolve="var" />
         <node concept="1sVBvm" id="2NO1T5RzgQW" role="1sWHZn">
           <node concept="1HlG4h" id="2NO1T5RzgR1" role="2wV5jI">
             <node concept="1HfYo3" id="2NO1T5RzgR3" role="1HlULh">
@@ -169,7 +169,7 @@
         </node>
       </node>
       <node concept="1iCGBv" id="2NO1T5R$iLD" role="3EZMnx">
-        <ref role="1NtTu8" to="ttha:2NO1T5R$isZ" />
+        <ref role="1NtTu8" to="ttha:2NO1T5R$isZ" resolve="event" />
         <node concept="1sVBvm" id="2NO1T5R$iLE" role="1sWHZn">
           <node concept="3F0A7n" id="2NO1T5R$iM5" role="2wV5jI">
             <property role="1Intyy" value="true" />
@@ -181,7 +181,7 @@
         <property role="3F0ifm" value="to" />
       </node>
       <node concept="1iCGBv" id="2NO1T5R$iNq" role="3EZMnx">
-        <ref role="1NtTu8" to="ttha:2NO1T5RzfCx" />
+        <ref role="1NtTu8" to="ttha:2NO1T5RzfCx" resolve="interrupt" />
         <node concept="1sVBvm" id="2NO1T5R$iNr" role="1sWHZn">
           <node concept="3F0A7n" id="2NO1T5R$iNU" role="2wV5jI">
             <property role="1Intyy" value="true" />
@@ -199,7 +199,7 @@
         <property role="3F0ifm" value="statemachine-interrupt bindings {" />
       </node>
       <node concept="3F2HdR" id="2NO1T5REUAs" role="3EZMnx">
-        <ref role="1NtTu8" to="ttha:2NO1T5REU$T" />
+        <ref role="1NtTu8" to="ttha:2NO1T5REU$T" resolve="bindings" />
         <node concept="l2Vlx" id="2NO1T5REUAt" role="2czzBx" />
         <node concept="pVoyu" id="2NO1T5REUC0" role="3F10Kt">
           <property role="VOm3f" value="true" />
diff --git a/languages/mbeddr.arduino.statemachine/languageModels/structure.mps b/languages/mbeddr.arduino.statemachine/languageModels/structure.mps
index 3059327..b0a4b8a 100755
--- a/languages/mbeddr.arduino.statemachine/languageModels/structure.mps
+++ b/languages/mbeddr.arduino.statemachine/languageModels/structure.mps
@@ -2,7 +2,8 @@
 <model ref="r:ad7103c9-f253-4cba-81d0-baadf2d307a0(mbeddr.arduino.statemachine.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="1" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="3" />
+    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl b/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl
index f5c0eb3..7a8b560 100755
--- a/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl
+++ b/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl
@@ -26,18 +26,21 @@
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
       </usedDevKits>
       <languageVersions>
-        <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="2" />
-        <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="0" />
+        <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
+        <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="1" />
         <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
-        <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="2" />
+        <language slang="l:783af01f-87a7-412c-be99-293a162652b5:com.mbeddr.core.embedded" version="0" />
+        <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="3" />
         <language slang="l:f93d1dbe-bfd1-42dd-932a-f375fa6f5373:com.mbeddr.core.make" version="1" />
-        <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="0" />
+        <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="4" />
         <language slang="l:62296a07-bc38-46d2-8034-198c24063588:com.mbeddr.core.modules.gen" version="0" />
         <language slang="l:3bf5377a-e904-4ded-9754-5a516023bfaa:com.mbeddr.core.pointers" version="0" />
         <language slang="l:a9d69647-0840-491e-bf39-2eb0805d2011:com.mbeddr.core.statements" version="1" />
         <language slang="l:efda956e-491e-4f00-ba14-36af2f213ecf:com.mbeddr.core.udt" version="1" />
-        <language slang="l:06d68b77-b699-4918-83b8-857e63787800:com.mbeddr.core.unittest" version="1" />
+        <language slang="l:06d68b77-b699-4918-83b8-857e63787800:com.mbeddr.core.unittest" version="3" />
         <language slang="l:2693fc71-9b0e-4b05-ab13-f57227d675f2:com.mbeddr.core.util" version="0" />
+        <language slang="l:97d24244-51db-4e2e-97fc-7bd73b1f5f40:com.mbeddr.ext.components" version="1" />
+        <language slang="l:13a36f90-83c5-4bf6-9dd6-70e455f1ef36:com.mbeddr.ext.components.statemachine" version="0" />
         <language slang="l:564e97d6-8fb7-41f5-bfc1-c7ed376efd62:com.mbeddr.ext.statemachines" version="0" />
         <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
         <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
@@ -59,10 +62,11 @@
         <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="2" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="1" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
+        <language slang="l:3c4c8461-a533-4459-916a-dc0176793b4c:mbeddr.arduino.core" version="0" />
         <language slang="l:028007ba-e266-4d05-ab46-25264b977671:mbeddr.arduino.statemachine" version="0" />
       </languageVersions>
       <dependencyVersions>
@@ -114,7 +118,7 @@
         <module reference="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
         <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
@@ -159,15 +163,16 @@
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
-    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="3" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="1" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="4" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="2" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="1" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
   </languageVersions>
@@ -215,7 +220,7 @@
     <module reference="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
diff --git a/solutions/arduino.samples/arduino.samples.msd b/solutions/arduino.samples/arduino.samples.msd
index b1c02be..9c76f26 100755
--- a/solutions/arduino.samples/arduino.samples.msd
+++ b/solutions/arduino.samples/arduino.samples.msd
@@ -34,29 +34,29 @@
     <language slang="l:634736cf-ea73-4eb1-abe9-d2ecc5fcf837:com.mbeddr.cc.var.c" version="0" />
     <language slang="l:e401b447-8019-4ccd-a72c-bfb0230f5782:com.mbeddr.cc.var.fm" version="1" />
     <language slang="l:b8eeb935-038d-48d8-ae7f-0c6768b8d4fc:com.mbeddr.cc.var.rt" version="0" />
-    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="2" />
-    <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="0" />
+    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
+    <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="1" />
     <language slang="l:b2da2e1a-b542-47f5-9be0-4dc21efe74a4:com.mbeddr.core.checks" version="0" />
     <language slang="l:390de4af-0c8d-4716-8dec-3d05ca751b28:com.mbeddr.core.cinterpreter" version="0" />
     <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
     <language slang="l:ebb5e132-d298-4649-b320-b3f4d7f3acff:com.mbeddr.core.debug.blext" version="0" />
     <language slang="l:783af01f-87a7-412c-be99-293a162652b5:com.mbeddr.core.embedded" version="0" />
-    <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="2" />
+    <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="3" />
     <language slang="l:ad5e9db1-9600-47c7-86ef-614165b281b8:com.mbeddr.core.legacy" version="0" />
     <language slang="l:f93d1dbe-bfd1-42dd-932a-f375fa6f5373:com.mbeddr.core.make" version="1" />
-    <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="0" />
+    <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="4" />
     <language slang="l:62296a07-bc38-46d2-8034-198c24063588:com.mbeddr.core.modules.gen" version="0" />
     <language slang="l:3bf5377a-e904-4ded-9754-5a516023bfaa:com.mbeddr.core.pointers" version="0" />
     <language slang="l:a9d69647-0840-491e-bf39-2eb0805d2011:com.mbeddr.core.statements" version="1" />
     <language slang="l:efda956e-491e-4f00-ba14-36af2f213ecf:com.mbeddr.core.udt" version="1" />
-    <language slang="l:06d68b77-b699-4918-83b8-857e63787800:com.mbeddr.core.unittest" version="1" />
+    <language slang="l:06d68b77-b699-4918-83b8-857e63787800:com.mbeddr.core.unittest" version="3" />
     <language slang="l:2693fc71-9b0e-4b05-ab13-f57227d675f2:com.mbeddr.core.util" version="0" />
     <language slang="l:2374bc90-7e37-41f1-a9c4-c2e35194c36a:com.mbeddr.doc" version="0" />
     <language slang="l:f44f6b9a-bf30-4f73-866e-fac17c177409:com.mbeddr.doc.gen_latex" version="0" />
     <language slang="l:2dec0852-3a21-4c4e-a68c-b05236cc37f2:com.mbeddr.doc.gen_xhtml" version="0" />
     <language slang="l:f8f68d92-c6d2-44b3-8d63-c00ade75ec86:com.mbeddr.doc.latex" version="0" />
     <language slang="l:e06345c7-da82-4f8b-bd44-1425fe158640:com.mbeddr.doc.meta" version="0" />
-    <language slang="l:97d24244-51db-4e2e-97fc-7bd73b1f5f40:com.mbeddr.ext.components" version="0" />
+    <language slang="l:97d24244-51db-4e2e-97fc-7bd73b1f5f40:com.mbeddr.ext.components" version="1" />
     <language slang="l:028899e1-bfee-4db6-b470-ed0f9ee5f662:com.mbeddr.ext.components.embedded" version="0" />
     <language slang="l:bd640b8f-4be4-42b6-8dc0-2c94d1ddf606:com.mbeddr.ext.components.gen_nomw" version="0" />
     <language slang="l:36a565f1-3fa0-42d6-baac-f87e209c9789:com.mbeddr.ext.components.mock" version="0" />
@@ -87,8 +87,8 @@
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:86ef8290-12bb-4ca7-947f-093788f263a9:jetbrains.mps.lang.project" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="2" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="1" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
     <language slang="l:3c4c8461-a533-4459-916a-dc0176793b4c:mbeddr.arduino.core" version="0" />
@@ -137,7 +137,7 @@
     <module reference="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
diff --git a/solutions/arduino.samples/models/arduino/samples/Serial/.model b/solutions/arduino.samples/models/arduino/samples/Serial/.model
index fc3bedf..9aa954a 100755
--- a/solutions/arduino.samples/models/arduino/samples/Serial/.model
+++ b/solutions/arduino.samples/models/arduino/samples/Serial/.model
@@ -4,10 +4,10 @@
   <attribute name="content" value="header" />
   <languages>
     <use id="2693fc71-9b0e-4b05-ab13-f57227d675f2" name="com.mbeddr.core.util" version="-1" />
-    <use id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" name="com.mbeddr.core.buildconfig" version="-1" />
-    <use id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules" version="-1" />
+    <use id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" name="com.mbeddr.core.buildconfig" version="1" />
+    <use id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules" version="4" />
     <use id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements" version="1" />
-    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="2" />
+    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="3" />
     <devkit ref="6845f348-7ea5-449c-ae3b-3d600bc3b73d(mbeddr.arduino)" />
   </languages>
   <imports>
diff --git a/solutions/arduino.samples/models/arduino/samples/statemachine/.model b/solutions/arduino.samples/models/arduino/samples/statemachine/.model
index fdaf55e..dc15f8a 100755
--- a/solutions/arduino.samples/models/arduino/samples/statemachine/.model
+++ b/solutions/arduino.samples/models/arduino/samples/statemachine/.model
@@ -6,12 +6,12 @@
     <use id="028007ba-e266-4d05-ab46-25264b977671" name="mbeddr.arduino.statemachine" version="-1" />
     <use id="564e97d6-8fb7-41f5-bfc1-c7ed376efd62" name="com.mbeddr.ext.statemachines" version="-1" />
     <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="-1" />
-    <use id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules" version="-1" />
-    <use id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" name="com.mbeddr.core.buildconfig" version="-1" />
+    <use id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules" version="4" />
+    <use id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" name="com.mbeddr.core.buildconfig" version="1" />
     <use id="2693fc71-9b0e-4b05-ab13-f57227d675f2" name="com.mbeddr.core.util" version="-1" />
     <use id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements" version="1" />
-    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="2" />
-    <use id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base" version="2" />
+    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="3" />
+    <use id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base" version="3" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2" name="com.mbeddr.mpsutil.suppresswarning" version="0" />
     <use id="a482b416-d0c9-473f-8f67-725ed642b3f3" name="com.mbeddr.mpsutil.breadcrumb" version="0" />
diff --git a/solutions/arduino.samples/models/arduino/samples/weather/.model b/solutions/arduino.samples/models/arduino/samples/weather/.model
index eeabcc5..e3416f2 100755
--- a/solutions/arduino.samples/models/arduino/samples/weather/.model
+++ b/solutions/arduino.samples/models/arduino/samples/weather/.model
@@ -4,13 +4,13 @@
   <attribute name="content" value="header" />
   <languages>
     <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="-1" />
-    <use id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules" version="-1" />
-    <use id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" name="com.mbeddr.core.buildconfig" version="-1" />
+    <use id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules" version="4" />
+    <use id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" name="com.mbeddr.core.buildconfig" version="1" />
     <use id="2693fc71-9b0e-4b05-ab13-f57227d675f2" name="com.mbeddr.core.util" version="-1" />
     <use id="783af01f-87a7-412c-be99-293a162652b5" name="com.mbeddr.core.embedded" version="-1" />
     <use id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements" version="1" />
-    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="2" />
-    <use id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base" version="2" />
+    <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="3" />
+    <use id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base" version="3" />
     <devkit ref="6845f348-7ea5-449c-ae3b-3d600bc3b73d(mbeddr.arduino)" />
     <devkit ref="1a986be1-0ef0-4f9f-9d8a-81c3ea7227ae(com.mbeddr.physicalunits)" />
     <devkit ref="54c79f9f-f3ba-4167-91f1-eb4e98a9c47c(com.mbeddr.documentation)" />
diff --git a/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd b/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd
index ee53c40..a1f5e34 100755
--- a/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd
+++ b/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd
@@ -14,7 +14,48 @@
     <usedDevKit>d2a9c55c-6bdc-4cc2-97e1-4ba7552f5584(com.mbeddr.core)</usedDevKit>
   </usedDevKits>
   <languageVersions>
+    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
+    <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="1" />
+    <language slang="l:b2da2e1a-b542-47f5-9be0-4dc21efe74a4:com.mbeddr.core.checks" version="0" />
+    <language slang="l:390de4af-0c8d-4716-8dec-3d05ca751b28:com.mbeddr.core.cinterpreter" version="0" />
+    <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
+    <language slang="l:ebb5e132-d298-4649-b320-b3f4d7f3acff:com.mbeddr.core.debug.blext" version="0" />
+    <language slang="l:783af01f-87a7-412c-be99-293a162652b5:com.mbeddr.core.embedded" version="0" />
+    <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="3" />
+    <language slang="l:ad5e9db1-9600-47c7-86ef-614165b281b8:com.mbeddr.core.legacy" version="0" />
+    <language slang="l:f93d1dbe-bfd1-42dd-932a-f375fa6f5373:com.mbeddr.core.make" version="1" />
+    <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="4" />
+    <language slang="l:62296a07-bc38-46d2-8034-198c24063588:com.mbeddr.core.modules.gen" version="0" />
+    <language slang="l:3bf5377a-e904-4ded-9754-5a516023bfaa:com.mbeddr.core.pointers" version="0" />
+    <language slang="l:a9d69647-0840-491e-bf39-2eb0805d2011:com.mbeddr.core.statements" version="1" />
+    <language slang="l:efda956e-491e-4f00-ba14-36af2f213ecf:com.mbeddr.core.udt" version="1" />
+    <language slang="l:06d68b77-b699-4918-83b8-857e63787800:com.mbeddr.core.unittest" version="3" />
+    <language slang="l:2693fc71-9b0e-4b05-ab13-f57227d675f2:com.mbeddr.core.util" version="0" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
+    <language slang="l:1c897ba5-9d43-4035-ac7f-0306495743ac:com.mbeddr.mpsutil.interpreter.test" version="0" />
+    <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
+    <language slang="l:92f195b6-a209-4804-ad65-f5248ecd5873:com.mbeddr.mpsutil.margincell" version="0" />
+    <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
+    <language slang="l:c788b046-2019-4656-8b60-8bb9bbb177b5:com.mbeddr.mpsutil.review" version="0" />
+    <language slang="l:7a060fae-09e0-4372-be36-6696d6554c0e:com.mbeddr.mpsutil.review.annotation" version="0" />
+    <language slang="l:c1c2a88a-323c-4605-a37d-9ab77a2ccbd2:com.mbeddr.mpsutil.suppresswarning" version="0" />
+    <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="0" />
+    <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
+    <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
+    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
+    <language slang="l:3c4c8461-a533-4459-916a-dc0176793b4c:mbeddr.arduino.core" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="336a1564-6617-4b5b-84e7-3d25ed4b8c8c(mbeddr.arduino.header)" version="0" />

From a25142837d72320984e9e3b105977374583519c2 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 22 Nov 2016 15:56:35 +0100
Subject: [PATCH 32/48] fix bugs in lib and models

---
 .../generator/template/main@generator.mps     | 766 ++++++++++--------
 .../languageModels/typesystem.mps             | 190 +++++
 lib/src/mbeddr_arduino.c                      |  24 +-
 .../models/arduino/samples/Atomic/Atomic.mpsr |  13 +-
 4 files changed, 658 insertions(+), 335 deletions(-)

diff --git a/languages/mbeddr.arduino.core/generator/template/mbeddr/arduino/core/generator/template/main@generator.mps b/languages/mbeddr.arduino.core/generator/template/mbeddr/arduino/core/generator/template/main@generator.mps
index 280eeb3..738a7c5 100755
--- a/languages/mbeddr.arduino.core/generator/template/mbeddr/arduino/core/generator/template/main@generator.mps
+++ b/languages/mbeddr.arduino.core/generator/template/mbeddr/arduino/core/generator/template/main@generator.mps
@@ -876,48 +876,58 @@
               </node>
             </node>
             <node concept="3wxyx2" id="2mpt1xbRGLQ" role="3TlMhI">
-              <node concept="3TlMh9" id="2mpt1xbRGLS" role="1_9fRO">
-                <property role="2hmy$m" value="1" />
-                <node concept="17Uvod" id="2mpt1xbRGLT" role="lGtFl">
-                  <property role="2qtEX9" value="value" />
-                  <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
-                  <node concept="3zFVjK" id="2mpt1xbRGLU" role="3zH0cK">
-                    <node concept="3clFbS" id="2mpt1xbRGME" role="2VODD2">
-                      <node concept="3clFbF" id="2mpt1xbRGOB" role="3cqZAp">
-                        <node concept="2YIFZM" id="2mpt1xbRGOD" role="3clFbG">
-                          <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                          <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                          <node concept="2OqwBi" id="5cS3I48Za5x" role="37wK5m">
-                            <node concept="2OqwBi" id="2mpt1xbRGOv" role="2Oq$k0">
-                              <node concept="2OqwBi" id="2mpt1xbRGO3" role="2Oq$k0">
-                                <node concept="2OqwBi" id="2mpt1xbRGNt" role="2Oq$k0">
-                                  <node concept="2OqwBi" id="2mpt1xbRGN1" role="2Oq$k0">
-                                    <node concept="30H73N" id="2mpt1xbRGMG" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="2mpt1xbRGN7" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" resolve="pinConfig" />
+              <node concept="1S8S4T" id="1VFlOLSWimL" role="1_9fRO">
+                <node concept="3TlMh9" id="2mpt1xbRGLS" role="1S8S4V">
+                  <property role="2hmy$m" value="1" />
+                  <node concept="17Uvod" id="2mpt1xbRGLT" role="lGtFl">
+                    <property role="2qtEX9" value="value" />
+                    <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
+                    <node concept="3zFVjK" id="2mpt1xbRGLU" role="3zH0cK">
+                      <node concept="3clFbS" id="2mpt1xbRGME" role="2VODD2">
+                        <node concept="3clFbF" id="2mpt1xbRGOB" role="3cqZAp">
+                          <node concept="2YIFZM" id="2mpt1xbRGOD" role="3clFbG">
+                            <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                            <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                            <node concept="2OqwBi" id="5cS3I48Za5x" role="37wK5m">
+                              <node concept="2OqwBi" id="2mpt1xbRGOv" role="2Oq$k0">
+                                <node concept="2OqwBi" id="2mpt1xbRGO3" role="2Oq$k0">
+                                  <node concept="2OqwBi" id="2mpt1xbRGNt" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="2mpt1xbRGN1" role="2Oq$k0">
+                                      <node concept="30H73N" id="2mpt1xbRGMG" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="2mpt1xbRGN7" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="koo2:4EC9auLFa7O" resolve="pinConfig" />
+                                      </node>
+                                    </node>
+                                    <node concept="3TrEf2" id="2mpt1xbRGNz" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
                                     </node>
                                   </node>
-                                  <node concept="3TrEf2" id="2mpt1xbRGNz" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="koo2:3gdl6si6JD8" resolve="pin" />
+                                  <node concept="3TrEf2" id="2mpt1xbRGO9" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="koo2:4JsbL6NpKGU" resolve="inputReg" />
                                   </node>
                                 </node>
-                                <node concept="3TrEf2" id="2mpt1xbRGO9" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="koo2:4JsbL6NpKGU" resolve="inputReg" />
+                                <node concept="3TrEf2" id="5cS3I48Za59" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                 </node>
                               </node>
-                              <node concept="3TrEf2" id="5cS3I48Za59" role="2OqNvi">
-                                <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
+                              <node concept="2qgKlT" id="5cS3I48Za5E" role="2OqNvi">
+                                <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
                               </node>
                             </node>
-                            <node concept="2qgKlT" id="5cS3I48Za5E" role="2OqNvi">
-                              <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
-                            </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
+                <node concept="3wxxNl" id="1VFlOLSWiNt" role="1S8S4N">
+                  <property role="2caQfQ" value="false" />
+                  <property role="2c7vTL" value="false" />
+                  <node concept="26Vqp4" id="1VFlOLSWiNu" role="2umbIo">
+                    <property role="2caQfQ" value="false" />
+                    <property role="2c7vTL" value="false" />
+                  </node>
+                </node>
               </node>
             </node>
           </node>
@@ -2633,43 +2643,53 @@
                         <property role="2hmy$m" value="00011000" />
                       </node>
                       <node concept="3wxyx2" id="7fU3Y2elIMJ" role="3TlMhI">
-                        <node concept="3TlMh9" id="7fU3Y2elKpF" role="1_9fRO">
-                          <property role="2hmy$m" value="1" />
-                          <node concept="17Uvod" id="7fU3Y2enWV7" role="lGtFl">
-                            <property role="2qtEX9" value="value" />
-                            <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
-                            <node concept="3zFVjK" id="7fU3Y2enWV8" role="3zH0cK">
-                              <node concept="3clFbS" id="7fU3Y2enWV9" role="2VODD2">
-                                <node concept="3clFbF" id="7fU3Y2enXy6" role="3cqZAp">
-                                  <node concept="2YIFZM" id="7fU3Y2eogwg" role="3clFbG">
-                                    <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                                    <node concept="2OqwBi" id="7fU3Y2eoiOP" role="37wK5m">
-                                      <node concept="2OqwBi" id="7fU3Y2eodEU" role="2Oq$k0">
-                                        <node concept="2OqwBi" id="7fU3Y2eo8jx" role="2Oq$k0">
-                                          <node concept="2OqwBi" id="7fU3Y2enYZK" role="2Oq$k0">
-                                            <node concept="30H73N" id="7fU3Y2enXy5" role="2Oq$k0" />
-                                            <node concept="3TrEf2" id="7fU3Y2eo5Jx" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
+                        <node concept="1S8S4T" id="1VFlOLSWef0" role="1_9fRO">
+                          <node concept="3TlMh9" id="7fU3Y2elKpF" role="1S8S4V">
+                            <property role="2hmy$m" value="1" />
+                            <node concept="17Uvod" id="7fU3Y2enWV7" role="lGtFl">
+                              <property role="2qtEX9" value="value" />
+                              <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
+                              <node concept="3zFVjK" id="7fU3Y2enWV8" role="3zH0cK">
+                                <node concept="3clFbS" id="7fU3Y2enWV9" role="2VODD2">
+                                  <node concept="3clFbF" id="7fU3Y2enXy6" role="3cqZAp">
+                                    <node concept="2YIFZM" id="7fU3Y2eogwg" role="3clFbG">
+                                      <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                                      <node concept="2OqwBi" id="7fU3Y2eoiOP" role="37wK5m">
+                                        <node concept="2OqwBi" id="7fU3Y2eodEU" role="2Oq$k0">
+                                          <node concept="2OqwBi" id="7fU3Y2eo8jx" role="2Oq$k0">
+                                            <node concept="2OqwBi" id="7fU3Y2enYZK" role="2Oq$k0">
+                                              <node concept="30H73N" id="7fU3Y2enXy5" role="2Oq$k0" />
+                                              <node concept="3TrEf2" id="7fU3Y2eo5Jx" role="2OqNvi">
+                                                <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
+                                              </node>
+                                            </node>
+                                            <node concept="3TrEf2" id="7fU3Y2eocog" role="2OqNvi">
+                                              <ref role="3Tt5mk" to="koo2:7fU3Y2ecVh8" resolve="UCSRB" />
                                             </node>
                                           </node>
-                                          <node concept="3TrEf2" id="7fU3Y2eocog" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:7fU3Y2ecVh8" resolve="UCSRB" />
+                                          <node concept="3TrEf2" id="7fU3Y2eofJZ" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                           </node>
                                         </node>
-                                        <node concept="3TrEf2" id="7fU3Y2eofJZ" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
+                                        <node concept="2qgKlT" id="7fU3Y2eokVl" role="2OqNvi">
+                                          <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
                                         </node>
                                       </node>
-                                      <node concept="2qgKlT" id="7fU3Y2eokVl" role="2OqNvi">
-                                        <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
-                                      </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
+                          <node concept="3wxxNl" id="1VFlOLSWeGj" role="1S8S4N">
+                            <property role="2caQfQ" value="false" />
+                            <property role="2c7vTL" value="false" />
+                            <node concept="26Vqp4" id="1VFlOLSWeGg" role="2umbIo">
+                              <property role="2caQfQ" value="false" />
+                              <property role="2c7vTL" value="false" />
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -3007,43 +3027,53 @@
                         </node>
                       </node>
                       <node concept="3wxyx2" id="7fU3Y2elXau" role="3TlMhI">
-                        <node concept="3TlMh9" id="7fU3Y2elYMI" role="1_9fRO">
-                          <property role="2hmy$m" value="1" />
-                          <node concept="17Uvod" id="7fU3Y2eoliB" role="lGtFl">
-                            <property role="2qtEX9" value="value" />
-                            <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
-                            <node concept="3zFVjK" id="7fU3Y2eoliC" role="3zH0cK">
-                              <node concept="3clFbS" id="7fU3Y2eoliD" role="2VODD2">
-                                <node concept="3clFbF" id="7fU3Y2eomtd" role="3cqZAp">
-                                  <node concept="2YIFZM" id="7fU3Y2eomEh" role="3clFbG">
-                                    <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                                    <node concept="2OqwBi" id="7fU3Y2eo$XJ" role="37wK5m">
-                                      <node concept="2OqwBi" id="7fU3Y2eoxi8" role="2Oq$k0">
-                                        <node concept="2OqwBi" id="7fU3Y2eotw8" role="2Oq$k0">
-                                          <node concept="2OqwBi" id="7fU3Y2eoomE" role="2Oq$k0">
-                                            <node concept="30H73N" id="7fU3Y2eomT1" role="2Oq$k0" />
-                                            <node concept="3TrEf2" id="7fU3Y2eoqGs" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
+                        <node concept="1S8S4T" id="1VFlOLSWf8s" role="1_9fRO">
+                          <node concept="3TlMh9" id="7fU3Y2elYMI" role="1S8S4V">
+                            <property role="2hmy$m" value="1" />
+                            <node concept="17Uvod" id="7fU3Y2eoliB" role="lGtFl">
+                              <property role="2qtEX9" value="value" />
+                              <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
+                              <node concept="3zFVjK" id="7fU3Y2eoliC" role="3zH0cK">
+                                <node concept="3clFbS" id="7fU3Y2eoliD" role="2VODD2">
+                                  <node concept="3clFbF" id="7fU3Y2eomtd" role="3cqZAp">
+                                    <node concept="2YIFZM" id="7fU3Y2eomEh" role="3clFbG">
+                                      <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                                      <node concept="2OqwBi" id="7fU3Y2eo$XJ" role="37wK5m">
+                                        <node concept="2OqwBi" id="7fU3Y2eoxi8" role="2Oq$k0">
+                                          <node concept="2OqwBi" id="7fU3Y2eotw8" role="2Oq$k0">
+                                            <node concept="2OqwBi" id="7fU3Y2eoomE" role="2Oq$k0">
+                                              <node concept="30H73N" id="7fU3Y2eomT1" role="2Oq$k0" />
+                                              <node concept="3TrEf2" id="7fU3Y2eoqGs" role="2OqNvi">
+                                                <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
+                                              </node>
+                                            </node>
+                                            <node concept="3TrEf2" id="7fU3Y2eovXF" role="2OqNvi">
+                                              <ref role="3Tt5mk" to="koo2:7fU3Y2ecVhe" resolve="UCSRC" />
                                             </node>
                                           </node>
-                                          <node concept="3TrEf2" id="7fU3Y2eovXF" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:7fU3Y2ecVhe" resolve="UCSRC" />
+                                          <node concept="3TrEf2" id="7fU3Y2eozkb" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                           </node>
                                         </node>
-                                        <node concept="3TrEf2" id="7fU3Y2eozkb" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
+                                        <node concept="2qgKlT" id="7fU3Y2eoB4f" role="2OqNvi">
+                                          <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
                                         </node>
                                       </node>
-                                      <node concept="2qgKlT" id="7fU3Y2eoB4f" role="2OqNvi">
-                                        <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
-                                      </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
+                          <node concept="3wxxNl" id="1VFlOLSWfKi" role="1S8S4N">
+                            <property role="2caQfQ" value="false" />
+                            <property role="2c7vTL" value="false" />
+                            <node concept="26Vqp4" id="1VFlOLSWfKj" role="2umbIo">
+                              <property role="2caQfQ" value="false" />
+                              <property role="2c7vTL" value="false" />
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -3135,43 +3165,53 @@
                         </node>
                       </node>
                       <node concept="3wxyx2" id="7fU3Y2em8v9" role="3TlMhI">
-                        <node concept="3TlMh9" id="7fU3Y2ema8D" role="1_9fRO">
-                          <property role="2hmy$m" value="1" />
-                          <node concept="17Uvod" id="7fU3Y2ew3uX" role="lGtFl">
-                            <property role="2qtEX9" value="value" />
-                            <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
-                            <node concept="3zFVjK" id="7fU3Y2ew3uY" role="3zH0cK">
-                              <node concept="3clFbS" id="7fU3Y2ew3uZ" role="2VODD2">
-                                <node concept="3clFbF" id="7fU3Y2ewa4e" role="3cqZAp">
-                                  <node concept="2YIFZM" id="7fU3Y2ewvLH" role="3clFbG">
-                                    <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                                    <node concept="2OqwBi" id="7fU3Y2ewnW7" role="37wK5m">
-                                      <node concept="2OqwBi" id="7fU3Y2ewlrH" role="2Oq$k0">
-                                        <node concept="2OqwBi" id="7fU3Y2ewinZ" role="2Oq$k0">
-                                          <node concept="2OqwBi" id="7fU3Y2ewbxS" role="2Oq$k0">
-                                            <node concept="30H73N" id="7fU3Y2ewa4d" role="2Oq$k0" />
-                                            <node concept="3TrEf2" id="7fU3Y2ewfW5" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
+                        <node concept="1S8S4T" id="1VFlOLSWgcn" role="1_9fRO">
+                          <node concept="3TlMh9" id="7fU3Y2ema8D" role="1S8S4V">
+                            <property role="2hmy$m" value="1" />
+                            <node concept="17Uvod" id="7fU3Y2ew3uX" role="lGtFl">
+                              <property role="2qtEX9" value="value" />
+                              <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
+                              <node concept="3zFVjK" id="7fU3Y2ew3uY" role="3zH0cK">
+                                <node concept="3clFbS" id="7fU3Y2ew3uZ" role="2VODD2">
+                                  <node concept="3clFbF" id="7fU3Y2ewa4e" role="3cqZAp">
+                                    <node concept="2YIFZM" id="7fU3Y2ewvLH" role="3clFbG">
+                                      <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                                      <node concept="2OqwBi" id="7fU3Y2ewnW7" role="37wK5m">
+                                        <node concept="2OqwBi" id="7fU3Y2ewlrH" role="2Oq$k0">
+                                          <node concept="2OqwBi" id="7fU3Y2ewinZ" role="2Oq$k0">
+                                            <node concept="2OqwBi" id="7fU3Y2ewbxS" role="2Oq$k0">
+                                              <node concept="30H73N" id="7fU3Y2ewa4d" role="2Oq$k0" />
+                                              <node concept="3TrEf2" id="7fU3Y2ewfW5" role="2OqNvi">
+                                                <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
+                                              </node>
+                                            </node>
+                                            <node concept="3TrEf2" id="7fU3Y2ewkmV" role="2OqNvi">
+                                              <ref role="3Tt5mk" to="koo2:7fU3Y2ecVlc" resolve="UBRRH" />
                                             </node>
                                           </node>
-                                          <node concept="3TrEf2" id="7fU3Y2ewkmV" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:7fU3Y2ecVlc" resolve="UBRRH" />
+                                          <node concept="3TrEf2" id="7fU3Y2ewmBC" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                           </node>
                                         </node>
-                                        <node concept="3TrEf2" id="7fU3Y2ewmBC" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
+                                        <node concept="2qgKlT" id="7fU3Y2ewq10" role="2OqNvi">
+                                          <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
                                         </node>
                                       </node>
-                                      <node concept="2qgKlT" id="7fU3Y2ewq10" role="2OqNvi">
-                                        <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
-                                      </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
+                          <node concept="3wxxNl" id="1VFlOLSWgPo" role="1S8S4N">
+                            <property role="2caQfQ" value="false" />
+                            <property role="2c7vTL" value="false" />
+                            <node concept="26Vqp4" id="1VFlOLSWgPp" role="2umbIo">
+                              <property role="2caQfQ" value="false" />
+                              <property role="2c7vTL" value="false" />
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -3258,43 +3298,53 @@
                         </node>
                       </node>
                       <node concept="3wxyx2" id="7fU3Y2emiLd" role="3TlMhI">
-                        <node concept="3TlMh9" id="7fU3Y2emks1" role="1_9fRO">
-                          <property role="2hmy$m" value="1" />
-                          <node concept="17Uvod" id="7fU3Y2ezRbo" role="lGtFl">
-                            <property role="2qtEX9" value="value" />
-                            <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
-                            <node concept="3zFVjK" id="7fU3Y2ezRbp" role="3zH0cK">
-                              <node concept="3clFbS" id="7fU3Y2ezRbq" role="2VODD2">
-                                <node concept="3clFbF" id="7fU3Y2ezZQH" role="3cqZAp">
-                                  <node concept="2YIFZM" id="7fU3Y2e$gL6" role="3clFbG">
-                                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                                    <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                                    <node concept="2OqwBi" id="7fU3Y2e$e55" role="37wK5m">
-                                      <node concept="2OqwBi" id="7fU3Y2e$bzj" role="2Oq$k0">
-                                        <node concept="2OqwBi" id="7fU3Y2e$8lu" role="2Oq$k0">
-                                          <node concept="2OqwBi" id="7fU3Y2e$1kn" role="2Oq$k0">
-                                            <node concept="30H73N" id="7fU3Y2ezZQG" role="2Oq$k0" />
-                                            <node concept="3TrEf2" id="7fU3Y2e$5Lf" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
+                        <node concept="1S8S4T" id="1VFlOLSWhht" role="1_9fRO">
+                          <node concept="3TlMh9" id="7fU3Y2emks1" role="1S8S4V">
+                            <property role="2hmy$m" value="1" />
+                            <node concept="17Uvod" id="7fU3Y2ezRbo" role="lGtFl">
+                              <property role="2qtEX9" value="value" />
+                              <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
+                              <node concept="3zFVjK" id="7fU3Y2ezRbp" role="3zH0cK">
+                                <node concept="3clFbS" id="7fU3Y2ezRbq" role="2VODD2">
+                                  <node concept="3clFbF" id="7fU3Y2ezZQH" role="3cqZAp">
+                                    <node concept="2YIFZM" id="7fU3Y2e$gL6" role="3clFbG">
+                                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                                      <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                                      <node concept="2OqwBi" id="7fU3Y2e$e55" role="37wK5m">
+                                        <node concept="2OqwBi" id="7fU3Y2e$bzj" role="2Oq$k0">
+                                          <node concept="2OqwBi" id="7fU3Y2e$8lu" role="2Oq$k0">
+                                            <node concept="2OqwBi" id="7fU3Y2e$1kn" role="2Oq$k0">
+                                              <node concept="30H73N" id="7fU3Y2ezZQG" role="2Oq$k0" />
+                                              <node concept="3TrEf2" id="7fU3Y2e$5Lf" role="2OqNvi">
+                                                <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
+                                              </node>
+                                            </node>
+                                            <node concept="3TrEf2" id="7fU3Y2e$akI" role="2OqNvi">
+                                              <ref role="3Tt5mk" to="koo2:7fU3Y2eemHw" resolve="UBRRL" />
                                             </node>
                                           </node>
-                                          <node concept="3TrEf2" id="7fU3Y2e$akI" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:7fU3Y2eemHw" resolve="UBRRL" />
+                                          <node concept="3TrEf2" id="7fU3Y2e$cJM" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                           </node>
                                         </node>
-                                        <node concept="3TrEf2" id="7fU3Y2e$cJM" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
+                                        <node concept="2qgKlT" id="7fU3Y2e$fZy" role="2OqNvi">
+                                          <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
                                         </node>
                                       </node>
-                                      <node concept="2qgKlT" id="7fU3Y2e$fZy" role="2OqNvi">
-                                        <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
-                                      </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
+                          <node concept="3wxxNl" id="1VFlOLSWhUG" role="1S8S4N">
+                            <property role="2caQfQ" value="false" />
+                            <property role="2c7vTL" value="false" />
+                            <node concept="26Vqp4" id="1VFlOLSWhUH" role="2umbIo">
+                              <property role="2caQfQ" value="false" />
+                              <property role="2c7vTL" value="false" />
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -3651,76 +3701,86 @@
                     <property role="2caQfQ" value="false" />
                     <property role="2c7vTL" value="false" />
                   </node>
-                  <node concept="3wxyx2" id="EvPvZE4eMI" role="3XIe9u">
-                    <node concept="3TlMh9" id="EvPvZE4eMV" role="1_9fRO">
-                      <property role="2hmy$m" value="1" />
-                      <node concept="17Uvod" id="EvPvZE4eQn" role="lGtFl">
-                        <property role="2qtEX9" value="value" />
-                        <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
-                        <node concept="3zFVjK" id="EvPvZE4eQo" role="3zH0cK">
-                          <node concept="3clFbS" id="EvPvZE4eQp" role="2VODD2">
-                            <node concept="3cpWs8" id="EvPvZE4eQq" role="3cqZAp">
-                              <node concept="3cpWsn" id="EvPvZE4eQr" role="3cpWs9">
-                                <property role="TrG5h" value="bc" />
-                                <node concept="3Tqbb2" id="EvPvZE4eQs" role="1tU5fm">
-                                  <ref role="ehGHo" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
-                                </node>
-                                <node concept="2OqwBi" id="EvPvZE4eQt" role="33vP2m">
-                                  <node concept="2OqwBi" id="EvPvZE4eQu" role="2Oq$k0">
-                                    <node concept="2OqwBi" id="EvPvZE4eQv" role="2Oq$k0">
-                                      <node concept="1iwH7S" id="EvPvZE4eQw" role="2Oq$k0" />
-                                      <node concept="1r8y6K" id="EvPvZE4eQx" role="2OqNvi" />
-                                    </node>
-                                    <node concept="2RRcyG" id="EvPvZE4eQy" role="2OqNvi">
-                                      <ref role="2RRcyH" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
+                  <node concept="3wxyx2" id="1VFlOLSWcth" role="3XIe9u">
+                    <node concept="1S8S4T" id="1VFlOLSWa89" role="1_9fRO">
+                      <node concept="3TlMh9" id="EvPvZE4eMV" role="1S8S4V">
+                        <property role="2hmy$m" value="1" />
+                        <node concept="17Uvod" id="EvPvZE4eQn" role="lGtFl">
+                          <property role="2qtEX9" value="value" />
+                          <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
+                          <node concept="3zFVjK" id="EvPvZE4eQo" role="3zH0cK">
+                            <node concept="3clFbS" id="EvPvZE4eQp" role="2VODD2">
+                              <node concept="3cpWs8" id="EvPvZE4eQq" role="3cqZAp">
+                                <node concept="3cpWsn" id="EvPvZE4eQr" role="3cpWs9">
+                                  <property role="TrG5h" value="bc" />
+                                  <node concept="3Tqbb2" id="EvPvZE4eQs" role="1tU5fm">
+                                    <ref role="ehGHo" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
+                                  </node>
+                                  <node concept="2OqwBi" id="EvPvZE4eQt" role="33vP2m">
+                                    <node concept="2OqwBi" id="EvPvZE4eQu" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="EvPvZE4eQv" role="2Oq$k0">
+                                        <node concept="1iwH7S" id="EvPvZE4eQw" role="2Oq$k0" />
+                                        <node concept="1r8y6K" id="EvPvZE4eQx" role="2OqNvi" />
+                                      </node>
+                                      <node concept="2RRcyG" id="EvPvZE4eQy" role="2OqNvi">
+                                        <ref role="2RRcyH" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
+                                      </node>
                                     </node>
+                                    <node concept="1uHKPH" id="EvPvZE4eQz" role="2OqNvi" />
                                   </node>
-                                  <node concept="1uHKPH" id="EvPvZE4eQz" role="2OqNvi" />
                                 </node>
                               </node>
-                            </node>
-                            <node concept="3clFbF" id="EvPvZE4mz3" role="3cqZAp">
-                              <node concept="2YIFZM" id="EvPvZE4mz6" role="3clFbG">
-                                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                                <node concept="2OqwBi" id="5cS3I48ZK$S" role="37wK5m">
-                                  <node concept="2OqwBi" id="5cS3I48ZK$o" role="2Oq$k0">
-                                    <node concept="2OqwBi" id="EvPvZE4eQB" role="2Oq$k0">
-                                      <node concept="2OqwBi" id="EvPvZE4eQC" role="2Oq$k0">
-                                        <node concept="1eOMI4" id="EvPvZE4eQD" role="2Oq$k0">
-                                          <node concept="1PxgMI" id="3tp$LrDynWv" role="1eOMHV">
-                                            <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                                            <node concept="2OqwBi" id="3tp$LrDylF1" role="1m5AlR">
-                                              <node concept="37vLTw" id="3tp$LrDylo4" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="EvPvZE4eQr" resolve="bc" />
-                                              </node>
-                                              <node concept="3TrEf2" id="3tp$LrDymNP" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
+                              <node concept="3clFbF" id="EvPvZE4mz3" role="3cqZAp">
+                                <node concept="2YIFZM" id="EvPvZE4mz6" role="3clFbG">
+                                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                                  <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                                  <node concept="2OqwBi" id="5cS3I48ZK$S" role="37wK5m">
+                                    <node concept="2OqwBi" id="5cS3I48ZK$o" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="EvPvZE4eQB" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="EvPvZE4eQC" role="2Oq$k0">
+                                          <node concept="1eOMI4" id="EvPvZE4eQD" role="2Oq$k0">
+                                            <node concept="1PxgMI" id="3tp$LrDynWv" role="1eOMHV">
+                                              <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                                              <node concept="2OqwBi" id="3tp$LrDylF1" role="1m5AlR">
+                                                <node concept="37vLTw" id="3tp$LrDylo4" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="EvPvZE4eQr" resolve="bc" />
+                                                </node>
+                                                <node concept="3TrEf2" id="3tp$LrDymNP" role="2OqNvi">
+                                                  <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
+                                                </node>
                                               </node>
                                             </node>
                                           </node>
+                                          <node concept="3TrEf2" id="EvPvZE4eQI" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
+                                          </node>
                                         </node>
-                                        <node concept="3TrEf2" id="EvPvZE4eQI" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
+                                        <node concept="3TrEf2" id="5cS3I48ZK$0" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="koo2:5cS3I48Zmhd" resolve="sReg" />
                                         </node>
                                       </node>
-                                      <node concept="3TrEf2" id="5cS3I48ZK$0" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:5cS3I48Zmhd" resolve="sReg" />
+                                      <node concept="3TrEf2" id="5cS3I48ZK$x" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                       </node>
                                     </node>
-                                    <node concept="3TrEf2" id="5cS3I48ZK$x" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
+                                    <node concept="2qgKlT" id="5cS3I48ZK_1" role="2OqNvi">
+                                      <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
                                     </node>
                                   </node>
-                                  <node concept="2qgKlT" id="5cS3I48ZK_1" role="2OqNvi">
-                                    <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
-                                  </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
+                      <node concept="3wxxNl" id="1VFlOLSWaHQ" role="1S8S4N">
+                        <property role="2caQfQ" value="false" />
+                        <property role="2c7vTL" value="false" />
+                        <node concept="26Vqp4" id="1VFlOLSWaFB" role="2umbIo">
+                          <property role="2caQfQ" value="false" />
+                          <property role="2c7vTL" value="false" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -3766,76 +3826,86 @@
                     <node concept="3ZVu4v" id="EvPvZE4eP$" role="3TlMhJ">
                       <ref role="3ZVs_2" node="EvPvZE4eMg" resolve="__sreg" />
                     </node>
-                    <node concept="3wxyx2" id="EvPvZE4ePb" role="3TlMhI">
-                      <node concept="3TlMh9" id="EvPvZE4ePo" role="1_9fRO">
-                        <property role="2hmy$m" value="1" />
-                        <node concept="17Uvod" id="EvPvZE4nE_" role="lGtFl">
-                          <property role="2qtEX9" value="value" />
-                          <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
-                          <node concept="3zFVjK" id="EvPvZE4nEA" role="3zH0cK">
-                            <node concept="3clFbS" id="EvPvZE4nEB" role="2VODD2">
-                              <node concept="3cpWs8" id="EvPvZE4nEC" role="3cqZAp">
-                                <node concept="3cpWsn" id="EvPvZE4nED" role="3cpWs9">
-                                  <property role="TrG5h" value="bc" />
-                                  <node concept="3Tqbb2" id="EvPvZE4nEE" role="1tU5fm">
-                                    <ref role="ehGHo" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
-                                  </node>
-                                  <node concept="2OqwBi" id="EvPvZE4nEF" role="33vP2m">
-                                    <node concept="2OqwBi" id="EvPvZE4nEG" role="2Oq$k0">
-                                      <node concept="2OqwBi" id="EvPvZE4nEH" role="2Oq$k0">
-                                        <node concept="1iwH7S" id="EvPvZE4nEI" role="2Oq$k0" />
-                                        <node concept="1r8y6K" id="EvPvZE4nEJ" role="2OqNvi" />
-                                      </node>
-                                      <node concept="2RRcyG" id="EvPvZE4nEK" role="2OqNvi">
-                                        <ref role="2RRcyH" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
+                    <node concept="3wxyx2" id="1VFlOLSWdD6" role="3TlMhI">
+                      <node concept="1S8S4T" id="1VFlOLSWaXa" role="1_9fRO">
+                        <node concept="3TlMh9" id="EvPvZE4ePo" role="1S8S4V">
+                          <property role="2hmy$m" value="1" />
+                          <node concept="17Uvod" id="EvPvZE4nE_" role="lGtFl">
+                            <property role="2qtEX9" value="value" />
+                            <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
+                            <node concept="3zFVjK" id="EvPvZE4nEA" role="3zH0cK">
+                              <node concept="3clFbS" id="EvPvZE4nEB" role="2VODD2">
+                                <node concept="3cpWs8" id="EvPvZE4nEC" role="3cqZAp">
+                                  <node concept="3cpWsn" id="EvPvZE4nED" role="3cpWs9">
+                                    <property role="TrG5h" value="bc" />
+                                    <node concept="3Tqbb2" id="EvPvZE4nEE" role="1tU5fm">
+                                      <ref role="ehGHo" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
+                                    </node>
+                                    <node concept="2OqwBi" id="EvPvZE4nEF" role="33vP2m">
+                                      <node concept="2OqwBi" id="EvPvZE4nEG" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="EvPvZE4nEH" role="2Oq$k0">
+                                          <node concept="1iwH7S" id="EvPvZE4nEI" role="2Oq$k0" />
+                                          <node concept="1r8y6K" id="EvPvZE4nEJ" role="2OqNvi" />
+                                        </node>
+                                        <node concept="2RRcyG" id="EvPvZE4nEK" role="2OqNvi">
+                                          <ref role="2RRcyH" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
+                                        </node>
                                       </node>
+                                      <node concept="1uHKPH" id="EvPvZE4nEL" role="2OqNvi" />
                                     </node>
-                                    <node concept="1uHKPH" id="EvPvZE4nEL" role="2OqNvi" />
                                   </node>
                                 </node>
-                              </node>
-                              <node concept="3clFbF" id="EvPvZE4nEM" role="3cqZAp">
-                                <node concept="2YIFZM" id="EvPvZE4nEN" role="3clFbG">
-                                  <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                                  <node concept="2OqwBi" id="5cS3I48ZK_W" role="37wK5m">
-                                    <node concept="2OqwBi" id="5cS3I48ZK_s" role="2Oq$k0">
-                                      <node concept="2OqwBi" id="EvPvZE4nEO" role="2Oq$k0">
-                                        <node concept="2OqwBi" id="EvPvZE4nEP" role="2Oq$k0">
-                                          <node concept="1eOMI4" id="EvPvZE4nEQ" role="2Oq$k0">
-                                            <node concept="1PxgMI" id="EvPvZE4nER" role="1eOMHV">
-                                              <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
-                                              <node concept="2OqwBi" id="EvPvZE4nES" role="1m5AlR">
-                                                <node concept="37vLTw" id="2GeljgL483N" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="EvPvZE4nED" resolve="bc" />
-                                                </node>
-                                                <node concept="3TrEf2" id="EvPvZE4nEU" role="2OqNvi">
-                                                  <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
+                                <node concept="3clFbF" id="EvPvZE4nEM" role="3cqZAp">
+                                  <node concept="2YIFZM" id="EvPvZE4nEN" role="3clFbG">
+                                    <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                                    <node concept="2OqwBi" id="5cS3I48ZK_W" role="37wK5m">
+                                      <node concept="2OqwBi" id="5cS3I48ZK_s" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="EvPvZE4nEO" role="2Oq$k0">
+                                          <node concept="2OqwBi" id="EvPvZE4nEP" role="2Oq$k0">
+                                            <node concept="1eOMI4" id="EvPvZE4nEQ" role="2Oq$k0">
+                                              <node concept="1PxgMI" id="EvPvZE4nER" role="1eOMHV">
+                                                <ref role="1m5ApE" to="koo2:22vbFi$tgwm" resolve="ArduinoPlatform" />
+                                                <node concept="2OqwBi" id="EvPvZE4nES" role="1m5AlR">
+                                                  <node concept="37vLTw" id="2GeljgL483N" role="2Oq$k0">
+                                                    <ref role="3cqZAo" node="EvPvZE4nED" resolve="bc" />
+                                                  </node>
+                                                  <node concept="3TrEf2" id="EvPvZE4nEU" role="2OqNvi">
+                                                    <ref role="3Tt5mk" to="51wr:4BxItZJ4BoM" resolve="target" />
+                                                  </node>
                                                 </node>
                                               </node>
                                             </node>
+                                            <node concept="3TrEf2" id="EvPvZE4nEV" role="2OqNvi">
+                                              <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
+                                            </node>
                                           </node>
-                                          <node concept="3TrEf2" id="EvPvZE4nEV" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="koo2:4JsbL6NpX5B" resolve="description" />
+                                          <node concept="3TrEf2" id="5cS3I48ZK_4" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="koo2:5cS3I48Zmhd" resolve="sReg" />
                                           </node>
                                         </node>
-                                        <node concept="3TrEf2" id="5cS3I48ZK_4" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:5cS3I48Zmhd" resolve="sReg" />
+                                        <node concept="3TrEf2" id="5cS3I48ZK__" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                         </node>
                                       </node>
-                                      <node concept="3TrEf2" id="5cS3I48ZK__" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
+                                      <node concept="2qgKlT" id="5cS3I48ZKA5" role="2OqNvi">
+                                        <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
                                       </node>
                                     </node>
-                                    <node concept="2qgKlT" id="5cS3I48ZKA5" role="2OqNvi">
-                                      <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
-                                    </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
+                        <node concept="3wxxNl" id="1VFlOLSWbzr" role="1S8S4N">
+                          <property role="2caQfQ" value="false" />
+                          <property role="2c7vTL" value="false" />
+                          <node concept="26Vqp4" id="1VFlOLSWbwz" role="2umbIo">
+                            <property role="2caQfQ" value="false" />
+                            <property role="2c7vTL" value="false" />
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -8234,43 +8304,53 @@
                     <property role="2hmy$m" value="00011000" />
                   </node>
                   <node concept="3wxyx2" id="7pMSfLXvjo5" role="3TlMhI">
-                    <node concept="3TlMh9" id="7pMSfLXvjo7" role="1_9fRO">
-                      <property role="2hmy$m" value="1" />
-                      <node concept="17Uvod" id="7pMSfLXvjo8" role="lGtFl">
-                        <property role="2qtEX9" value="value" />
-                        <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
-                        <node concept="3zFVjK" id="7pMSfLXvjo9" role="3zH0cK">
-                          <node concept="3clFbS" id="7pMSfLXvjoa" role="2VODD2">
-                            <node concept="3clFbF" id="7pMSfLXvjob" role="3cqZAp">
-                              <node concept="2YIFZM" id="7pMSfLXvjoc" role="3clFbG">
-                                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                                <node concept="2OqwBi" id="7pMSfLXvjod" role="37wK5m">
-                                  <node concept="2OqwBi" id="7pMSfLXvjoe" role="2Oq$k0">
-                                    <node concept="2OqwBi" id="7pMSfLXvjof" role="2Oq$k0">
-                                      <node concept="2OqwBi" id="7pMSfLXvjog" role="2Oq$k0">
-                                        <node concept="30H73N" id="7pMSfLXvjoh" role="2Oq$k0" />
-                                        <node concept="3TrEf2" id="7pMSfLXvjoi" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
+                    <node concept="1S8S4T" id="1VFlOLSX5Y$" role="1_9fRO">
+                      <node concept="3TlMh9" id="7pMSfLXvjo7" role="1S8S4V">
+                        <property role="2hmy$m" value="1" />
+                        <node concept="17Uvod" id="7pMSfLXvjo8" role="lGtFl">
+                          <property role="2qtEX9" value="value" />
+                          <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
+                          <node concept="3zFVjK" id="7pMSfLXvjo9" role="3zH0cK">
+                            <node concept="3clFbS" id="7pMSfLXvjoa" role="2VODD2">
+                              <node concept="3clFbF" id="7pMSfLXvjob" role="3cqZAp">
+                                <node concept="2YIFZM" id="7pMSfLXvjoc" role="3clFbG">
+                                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                                  <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                                  <node concept="2OqwBi" id="7pMSfLXvjod" role="37wK5m">
+                                    <node concept="2OqwBi" id="7pMSfLXvjoe" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="7pMSfLXvjof" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="7pMSfLXvjog" role="2Oq$k0">
+                                          <node concept="30H73N" id="7pMSfLXvjoh" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="7pMSfLXvjoi" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
+                                          </node>
+                                        </node>
+                                        <node concept="3TrEf2" id="7pMSfLXvjoj" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="koo2:7fU3Y2ecVh8" resolve="UCSRB" />
                                         </node>
                                       </node>
-                                      <node concept="3TrEf2" id="7pMSfLXvjoj" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:7fU3Y2ecVh8" resolve="UCSRB" />
+                                      <node concept="3TrEf2" id="7pMSfLXvjok" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                       </node>
                                     </node>
-                                    <node concept="3TrEf2" id="7pMSfLXvjok" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
+                                    <node concept="2qgKlT" id="7pMSfLXvjol" role="2OqNvi">
+                                      <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
                                     </node>
                                   </node>
-                                  <node concept="2qgKlT" id="7pMSfLXvjol" role="2OqNvi">
-                                    <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
-                                  </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
+                      <node concept="3wxxNl" id="1VFlOLSX69h" role="1S8S4N">
+                        <property role="2caQfQ" value="false" />
+                        <property role="2c7vTL" value="false" />
+                        <node concept="26Vqp4" id="1VFlOLSX69i" role="2umbIo">
+                          <property role="2caQfQ" value="false" />
+                          <property role="2c7vTL" value="false" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -8608,43 +8688,53 @@
                     </node>
                   </node>
                   <node concept="3wxyx2" id="7pMSfLXvjq_" role="3TlMhI">
-                    <node concept="3TlMh9" id="7pMSfLXvjqB" role="1_9fRO">
-                      <property role="2hmy$m" value="1" />
-                      <node concept="17Uvod" id="7pMSfLXvjqC" role="lGtFl">
-                        <property role="2qtEX9" value="value" />
-                        <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
-                        <node concept="3zFVjK" id="7pMSfLXvjqD" role="3zH0cK">
-                          <node concept="3clFbS" id="7pMSfLXvjqE" role="2VODD2">
-                            <node concept="3clFbF" id="7pMSfLXvjqF" role="3cqZAp">
-                              <node concept="2YIFZM" id="7pMSfLXvjqG" role="3clFbG">
-                                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                                <node concept="2OqwBi" id="7pMSfLXvjqH" role="37wK5m">
-                                  <node concept="2OqwBi" id="7pMSfLXvjqI" role="2Oq$k0">
-                                    <node concept="2OqwBi" id="7pMSfLXvjqJ" role="2Oq$k0">
-                                      <node concept="2OqwBi" id="7pMSfLXvjqK" role="2Oq$k0">
-                                        <node concept="30H73N" id="7pMSfLXvjqL" role="2Oq$k0" />
-                                        <node concept="3TrEf2" id="7pMSfLXvjqM" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
+                    <node concept="1S8S4T" id="1VFlOLSX6QN" role="1_9fRO">
+                      <node concept="3TlMh9" id="7pMSfLXvjqB" role="1S8S4V">
+                        <property role="2hmy$m" value="1" />
+                        <node concept="17Uvod" id="7pMSfLXvjqC" role="lGtFl">
+                          <property role="2qtEX9" value="value" />
+                          <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
+                          <node concept="3zFVjK" id="7pMSfLXvjqD" role="3zH0cK">
+                            <node concept="3clFbS" id="7pMSfLXvjqE" role="2VODD2">
+                              <node concept="3clFbF" id="7pMSfLXvjqF" role="3cqZAp">
+                                <node concept="2YIFZM" id="7pMSfLXvjqG" role="3clFbG">
+                                  <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                                  <node concept="2OqwBi" id="7pMSfLXvjqH" role="37wK5m">
+                                    <node concept="2OqwBi" id="7pMSfLXvjqI" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="7pMSfLXvjqJ" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="7pMSfLXvjqK" role="2Oq$k0">
+                                          <node concept="30H73N" id="7pMSfLXvjqL" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="7pMSfLXvjqM" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
+                                          </node>
+                                        </node>
+                                        <node concept="3TrEf2" id="7pMSfLXvjqN" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="koo2:7fU3Y2ecVhe" resolve="UCSRC" />
                                         </node>
                                       </node>
-                                      <node concept="3TrEf2" id="7pMSfLXvjqN" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:7fU3Y2ecVhe" resolve="UCSRC" />
+                                      <node concept="3TrEf2" id="7pMSfLXvjqO" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                       </node>
                                     </node>
-                                    <node concept="3TrEf2" id="7pMSfLXvjqO" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
+                                    <node concept="2qgKlT" id="7pMSfLXvjqP" role="2OqNvi">
+                                      <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
                                     </node>
                                   </node>
-                                  <node concept="2qgKlT" id="7pMSfLXvjqP" role="2OqNvi">
-                                    <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
-                                  </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
+                      <node concept="3wxxNl" id="1VFlOLSX7tl" role="1S8S4N">
+                        <property role="2caQfQ" value="false" />
+                        <property role="2c7vTL" value="false" />
+                        <node concept="26Vqp4" id="1VFlOLSX7tm" role="2umbIo">
+                          <property role="2caQfQ" value="false" />
+                          <property role="2c7vTL" value="false" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -8736,43 +8826,53 @@
                     </node>
                   </node>
                   <node concept="3wxyx2" id="7pMSfLXvjrt" role="3TlMhI">
-                    <node concept="3TlMh9" id="7pMSfLXvjrv" role="1_9fRO">
-                      <property role="2hmy$m" value="1" />
-                      <node concept="17Uvod" id="7pMSfLXvjrw" role="lGtFl">
-                        <property role="2qtEX9" value="value" />
-                        <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
-                        <node concept="3zFVjK" id="7pMSfLXvjrx" role="3zH0cK">
-                          <node concept="3clFbS" id="7pMSfLXvjry" role="2VODD2">
-                            <node concept="3clFbF" id="7pMSfLXvjrz" role="3cqZAp">
-                              <node concept="2YIFZM" id="7pMSfLXvjr$" role="3clFbG">
-                                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                                <node concept="2OqwBi" id="7pMSfLXvjr_" role="37wK5m">
-                                  <node concept="2OqwBi" id="7pMSfLXvjrA" role="2Oq$k0">
-                                    <node concept="2OqwBi" id="7pMSfLXvjrB" role="2Oq$k0">
-                                      <node concept="2OqwBi" id="7pMSfLXvjrC" role="2Oq$k0">
-                                        <node concept="30H73N" id="7pMSfLXvjrD" role="2Oq$k0" />
-                                        <node concept="3TrEf2" id="7pMSfLXvjrE" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
+                    <node concept="1S8S4T" id="1VFlOLSX7Tq" role="1_9fRO">
+                      <node concept="3TlMh9" id="7pMSfLXvjrv" role="1S8S4V">
+                        <property role="2hmy$m" value="1" />
+                        <node concept="17Uvod" id="7pMSfLXvjrw" role="lGtFl">
+                          <property role="2qtEX9" value="value" />
+                          <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
+                          <node concept="3zFVjK" id="7pMSfLXvjrx" role="3zH0cK">
+                            <node concept="3clFbS" id="7pMSfLXvjry" role="2VODD2">
+                              <node concept="3clFbF" id="7pMSfLXvjrz" role="3cqZAp">
+                                <node concept="2YIFZM" id="7pMSfLXvjr$" role="3clFbG">
+                                  <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                                  <node concept="2OqwBi" id="7pMSfLXvjr_" role="37wK5m">
+                                    <node concept="2OqwBi" id="7pMSfLXvjrA" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="7pMSfLXvjrB" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="7pMSfLXvjrC" role="2Oq$k0">
+                                          <node concept="30H73N" id="7pMSfLXvjrD" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="7pMSfLXvjrE" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
+                                          </node>
+                                        </node>
+                                        <node concept="3TrEf2" id="7pMSfLXvjrF" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="koo2:7fU3Y2ecVlc" resolve="UBRRH" />
                                         </node>
                                       </node>
-                                      <node concept="3TrEf2" id="7pMSfLXvjrF" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:7fU3Y2ecVlc" resolve="UBRRH" />
+                                      <node concept="3TrEf2" id="7pMSfLXvjrG" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                       </node>
                                     </node>
-                                    <node concept="3TrEf2" id="7pMSfLXvjrG" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
+                                    <node concept="2qgKlT" id="7pMSfLXvjrH" role="2OqNvi">
+                                      <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
                                     </node>
                                   </node>
-                                  <node concept="2qgKlT" id="7pMSfLXvjrH" role="2OqNvi">
-                                    <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
-                                  </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
+                      <node concept="3wxxNl" id="1VFlOLSX8xl" role="1S8S4N">
+                        <property role="2caQfQ" value="false" />
+                        <property role="2c7vTL" value="false" />
+                        <node concept="26Vqp4" id="1VFlOLSX8xm" role="2umbIo">
+                          <property role="2caQfQ" value="false" />
+                          <property role="2c7vTL" value="false" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -8859,43 +8959,53 @@
                     </node>
                   </node>
                   <node concept="3wxyx2" id="7pMSfLXvjsj" role="3TlMhI">
-                    <node concept="3TlMh9" id="7pMSfLXvjsl" role="1_9fRO">
-                      <property role="2hmy$m" value="1" />
-                      <node concept="17Uvod" id="7pMSfLXvjsm" role="lGtFl">
-                        <property role="2qtEX9" value="value" />
-                        <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
-                        <node concept="3zFVjK" id="7pMSfLXvjsn" role="3zH0cK">
-                          <node concept="3clFbS" id="7pMSfLXvjso" role="2VODD2">
-                            <node concept="3clFbF" id="7pMSfLXvjsp" role="3cqZAp">
-                              <node concept="2YIFZM" id="7pMSfLXvjsq" role="3clFbG">
-                                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                                <node concept="2OqwBi" id="7pMSfLXvjsr" role="37wK5m">
-                                  <node concept="2OqwBi" id="7pMSfLXvjss" role="2Oq$k0">
-                                    <node concept="2OqwBi" id="7pMSfLXvjst" role="2Oq$k0">
-                                      <node concept="2OqwBi" id="7pMSfLXvjsu" role="2Oq$k0">
-                                        <node concept="30H73N" id="7pMSfLXvjsv" role="2Oq$k0" />
-                                        <node concept="3TrEf2" id="7pMSfLXvjsw" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
+                    <node concept="1S8S4T" id="1VFlOLSX8Xq" role="1_9fRO">
+                      <node concept="3TlMh9" id="7pMSfLXvjsl" role="1S8S4V">
+                        <property role="2hmy$m" value="1" />
+                        <node concept="17Uvod" id="7pMSfLXvjsm" role="lGtFl">
+                          <property role="2qtEX9" value="value" />
+                          <property role="P4ACc" value="61c69711-ed61-4850-81d9-7714ff227fb0/2212975673976017893/2212975673976043696" />
+                          <node concept="3zFVjK" id="7pMSfLXvjsn" role="3zH0cK">
+                            <node concept="3clFbS" id="7pMSfLXvjso" role="2VODD2">
+                              <node concept="3clFbF" id="7pMSfLXvjsp" role="3cqZAp">
+                                <node concept="2YIFZM" id="7pMSfLXvjsq" role="3clFbG">
+                                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                                  <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                                  <node concept="2OqwBi" id="7pMSfLXvjsr" role="37wK5m">
+                                    <node concept="2OqwBi" id="7pMSfLXvjss" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="7pMSfLXvjst" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="7pMSfLXvjsu" role="2Oq$k0">
+                                          <node concept="30H73N" id="7pMSfLXvjsv" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="7pMSfLXvjsw" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="koo2:3gQUTJ3y9pO" resolve="port" />
+                                          </node>
+                                        </node>
+                                        <node concept="3TrEf2" id="7pMSfLXvjsx" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="koo2:7fU3Y2eemHw" resolve="UBRRL" />
                                         </node>
                                       </node>
-                                      <node concept="3TrEf2" id="7pMSfLXvjsx" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="koo2:7fU3Y2eemHw" resolve="UBRRL" />
+                                      <node concept="3TrEf2" id="7pMSfLXvjsy" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
                                       </node>
                                     </node>
-                                    <node concept="3TrEf2" id="7pMSfLXvjsy" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="koo2:5cS3I48YO7u" resolve="address" />
+                                    <node concept="2qgKlT" id="7pMSfLXvjsz" role="2OqNvi">
+                                      <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
                                     </node>
                                   </node>
-                                  <node concept="2qgKlT" id="7pMSfLXvjsz" role="2OqNvi">
-                                    <ref role="37wK5l" to="ywuz:6OxpEKG0KPv" resolve="evaluateStatically" />
-                                  </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
+                      <node concept="3wxxNl" id="1VFlOLSX9_l" role="1S8S4N">
+                        <property role="2caQfQ" value="false" />
+                        <property role="2c7vTL" value="false" />
+                        <node concept="26Vqp4" id="1VFlOLSX9_m" role="2umbIo">
+                          <property role="2caQfQ" value="false" />
+                          <property role="2c7vTL" value="false" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
diff --git a/languages/mbeddr.arduino.core/languageModels/typesystem.mps b/languages/mbeddr.arduino.core/languageModels/typesystem.mps
index 0416572..9bcb557 100755
--- a/languages/mbeddr.arduino.core/languageModels/typesystem.mps
+++ b/languages/mbeddr.arduino.core/languageModels/typesystem.mps
@@ -18,7 +18,10 @@
     <import index="7ord" ref="r:73ed2111-380d-4165-b748-fc106633f87d(mbeddr.arduino.core.behavior)" />
     <import index="nb4f" ref="r:272921e7-7030-4de3-ab20-a851a2e6ef5a(com.mbeddr.core.embedded.behavior)" />
     <import index="c4fa" ref="r:9f0e84b6-2ec7-4f9e-83e0-feedc77b63a3(com.mbeddr.core.statements.structure)" />
+    <import index="aelz" ref="r:832a1eb9-6df4-4b76-8168-017ed7892fc6(mbeddr.arduino.header.Import)" />
+    <import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+    <import index="hwgx" ref="r:fd2980c8-676c-4b19-b524-18c70e02f8b7(com.mbeddr.core.base.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -38,6 +41,9 @@
       <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
         <child id="1145553007750" name="creator" index="2ShVmc" />
       </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
@@ -95,6 +101,22 @@
       <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
         <child id="1196350785114" name="quotedNode" index="2c44tc" />
       </concept>
+      <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
+        <reference id="5455284157994012188" name="link" index="2pIpSl" />
+      </concept>
+      <concept id="5455284157993911097" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitPart" flags="ng" index="2pJxcK">
+        <child id="5455284157993911094" name="expression" index="2pJxcZ" />
+      </concept>
+      <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
+        <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
+      </concept>
+      <concept id="5455284157993863840" name="jetbrains.mps.lang.quotation.structure.NodeBuilderNode" flags="nn" index="2pJPED">
+        <reference id="5455284157993910961" name="concept" index="2pJxaS" />
+        <child id="5455284157993911099" name="values" index="2pJxcM" />
+      </concept>
+      <concept id="8182547171709752110" name="jetbrains.mps.lang.quotation.structure.NodeBuilderExpression" flags="nn" index="36biLy">
+        <child id="8182547171709752112" name="expression" index="36biLW" />
+      </concept>
     </language>
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
       <concept id="1207055528241" name="jetbrains.mps.lang.typesystem.structure.WarningStatement" flags="nn" index="a7r0C">
@@ -103,6 +125,9 @@
       <concept id="1185788614172" name="jetbrains.mps.lang.typesystem.structure.NormalTypeClause" flags="ng" index="mw_s8">
         <child id="1185788644032" name="normalType" index="mwGJk" />
       </concept>
+      <concept id="1175517400280" name="jetbrains.mps.lang.typesystem.structure.AssertStatement" flags="nn" index="2Mj0R9">
+        <child id="1175517761460" name="condition" index="2MkoU_" />
+      </concept>
       <concept id="1175517767210" name="jetbrains.mps.lang.typesystem.structure.ReportErrorStatement" flags="nn" index="2MkqsV">
         <child id="1175517851849" name="errorString" index="2MkJ7o" />
       </concept>
@@ -110,13 +135,35 @@
         <reference id="1227096521710" name="propertyDeclaration" index="2ODJFN" />
       </concept>
       <concept id="1227096774658" name="jetbrains.mps.lang.typesystem.structure.MessageStatement" flags="ng" index="2OEH$v">
+        <child id="1227096802791" name="helginsIntention" index="2OEOjU" />
         <child id="1227096802790" name="nodeToReport" index="2OEOjV" />
         <child id="1227096836496" name="messageTarget" index="2OEWyd" />
       </concept>
+      <concept id="1216383170661" name="jetbrains.mps.lang.typesystem.structure.TypesystemQuickFix" flags="ng" index="Q5z_Y">
+        <child id="1216383424566" name="executeBlock" index="Q6x$H" />
+        <child id="1216383476350" name="quickFixArgument" index="Q6Id_" />
+        <child id="1216391046856" name="descriptionBlock" index="QzAvj" />
+      </concept>
+      <concept id="1216383287005" name="jetbrains.mps.lang.typesystem.structure.QuickFixExecuteBlock" flags="in" index="Q5ZZ6" />
+      <concept id="1216383482742" name="jetbrains.mps.lang.typesystem.structure.QuickFixArgument" flags="ng" index="Q6JDH">
+        <child id="1216383511839" name="argumentType" index="Q6QK4" />
+      </concept>
+      <concept id="1216390348809" name="jetbrains.mps.lang.typesystem.structure.QuickFixArgumentReference" flags="nn" index="QwW4i">
+        <reference id="1216390348810" name="quickFixArgument" index="QwW4h" />
+      </concept>
+      <concept id="1216390987552" name="jetbrains.mps.lang.typesystem.structure.QuickFixDescriptionBlock" flags="in" index="QznSV" />
       <concept id="1195213580585" name="jetbrains.mps.lang.typesystem.structure.AbstractCheckingRule" flags="ig" index="18hYwZ">
         <child id="1195213635060" name="body" index="18ibNy" />
       </concept>
       <concept id="1195214364922" name="jetbrains.mps.lang.typesystem.structure.NonTypesystemRule" flags="ig" index="18kY7G" />
+      <concept id="1210784285454" name="jetbrains.mps.lang.typesystem.structure.TypesystemIntention" flags="ng" index="3Cnw8n">
+        <reference id="1216388525179" name="quickFix" index="QpYPw" />
+        <child id="1210784493590" name="actualArgument" index="3Coj4f" />
+      </concept>
+      <concept id="1210784384552" name="jetbrains.mps.lang.typesystem.structure.TypesystemIntentionArgument" flags="ng" index="3CnSsL">
+        <reference id="1216386999476" name="quickFixArgument" index="QkamJ" />
+        <child id="1210784642750" name="value" index="3CoRuB" />
+      </concept>
       <concept id="1174642788531" name="jetbrains.mps.lang.typesystem.structure.ConceptReference" flags="ig" index="1YaCAy">
         <reference id="1174642800329" name="concept" index="1YaFvo" />
       </concept>
@@ -141,18 +188,28 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
+      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
+        <child id="1144104376918" name="parameter" index="1xVPHs" />
+      </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
       </concept>
+      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
+      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
+        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
+      </concept>
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </concept>
+      <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
+        <reference id="1219352800908" name="referentNode" index="3B5MYn" />
+      </concept>
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
@@ -185,6 +242,9 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
+      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
+        <child id="540871147943773366" name="argument" index="25WWJ7" />
+      </concept>
       <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
         <child id="1153944400369" name="variable" index="2Gsz3X" />
         <child id="1153944424730" name="inputSequence" index="2GsD0m" />
@@ -193,7 +253,9 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
+      <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -919,5 +981,133 @@
       <ref role="1YaFvo" to="koo2:1Jb2EknHM2o" resolve="Task" />
     </node>
   </node>
+  <node concept="18kY7G" id="1VFlOLT0B6V">
+    <property role="TrG5h" value="check_atomicExpressionImport" />
+    <node concept="3clFbS" id="1VFlOLT0B6W" role="18ibNy">
+      <node concept="2Mj0R9" id="1VFlOLT0R6E" role="3cqZAp">
+        <node concept="Xl_RD" id="1VFlOLT0RLh" role="2MkJ7o">
+          <property role="Xl_RC" value="Import for interrupt header is missing" />
+        </node>
+        <node concept="1YBJjd" id="1VFlOLT0S22" role="2OEOjV">
+          <ref role="1YBMHb" node="1VFlOLT0B6Y" resolve="atomicExpression" />
+        </node>
+        <node concept="2OqwBi" id="1VFlOLT0Q$r" role="2MkoU_">
+          <node concept="2OqwBi" id="1VFlOLT0Q$s" role="2Oq$k0">
+            <node concept="2OqwBi" id="1VFlOLT0Q$t" role="2Oq$k0">
+              <node concept="1YBJjd" id="1VFlOLT0Q$u" role="2Oq$k0">
+                <ref role="1YBMHb" node="1VFlOLT0B6Y" resolve="atomicExpression" />
+              </node>
+              <node concept="2Xjw5R" id="1VFlOLT0Q$v" role="2OqNvi">
+                <node concept="1xMEDy" id="1VFlOLT0Q$w" role="1xVPHs">
+                  <node concept="chp4Y" id="1VFlOLT0Q$x" role="ri$Ld">
+                    <ref role="cht4Q" to="x27k:5_l8w1EmTde" resolve="ImplementationModule" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Tsc0h" id="1VFlOLT0Q$y" role="2OqNvi">
+              <ref role="3TtcxE" to="x27k:19a6$uAA8hU" resolve="imports" />
+            </node>
+          </node>
+          <node concept="2HwmR7" id="1VFlOLT0Q$z" role="2OqNvi">
+            <node concept="1bVj0M" id="1VFlOLT0Q$$" role="23t8la">
+              <node concept="3clFbS" id="1VFlOLT0Q$_" role="1bW5cS">
+                <node concept="3clFbF" id="1VFlOLT0Q$A" role="3cqZAp">
+                  <node concept="3clFbC" id="1VFlOLT0Q$B" role="3clFbG">
+                    <node concept="3B5_sB" id="1VFlOLT0Q$C" role="3uHU7w">
+                      <ref role="3B5MYn" to="aelz:3kpMhm4HRQv" resolve="avr_interrupt" />
+                    </node>
+                    <node concept="2OqwBi" id="1VFlOLT0Q$D" role="3uHU7B">
+                      <node concept="37vLTw" id="1VFlOLT0Q$E" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1VFlOLT0Q$G" resolve="it" />
+                      </node>
+                      <node concept="2qgKlT" id="1VFlOLT0Q$F" role="2OqNvi">
+                        <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="Rh6nW" id="1VFlOLT0Q$G" role="1bW2Oz">
+                <property role="TrG5h" value="it" />
+                <node concept="2jxLKc" id="1VFlOLT0Q$H" role="1tU5fm" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Cnw8n" id="1VFlOLT0YgS" role="2OEOjU">
+          <ref role="QpYPw" node="1VFlOLT0Sim" resolve="addImportForInterrupts" />
+          <node concept="3CnSsL" id="1VFlOLT0YxH" role="3Coj4f">
+            <ref role="QkamJ" node="1VFlOLT0SiF" resolve="module" />
+            <node concept="2OqwBi" id="1VFlOLT0YN6" role="3CoRuB">
+              <node concept="1YBJjd" id="1VFlOLT0YxU" role="2Oq$k0">
+                <ref role="1YBMHb" node="1VFlOLT0B6Y" resolve="atomicExpression" />
+              </node>
+              <node concept="2Xjw5R" id="1VFlOLT0ZLr" role="2OqNvi">
+                <node concept="1xMEDy" id="1VFlOLT0ZLt" role="1xVPHs">
+                  <node concept="chp4Y" id="1VFlOLT102B" role="ri$Ld">
+                    <ref role="cht4Q" to="x27k:5_l8w1EmTde" resolve="ImplementationModule" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="1VFlOLT0B6Y" role="1YuTPh">
+      <property role="TrG5h" value="atomicExpression" />
+      <ref role="1YaFvo" to="koo2:1pOg3uxo38n" resolve="AtomicExpression" />
+    </node>
+  </node>
+  <node concept="Q5z_Y" id="1VFlOLT0Sim">
+    <property role="TrG5h" value="addImportForInterrupts" />
+    <node concept="Q5ZZ6" id="1VFlOLT0Sin" role="Q6x$H">
+      <node concept="3clFbS" id="1VFlOLT0Sio" role="2VODD2">
+        <node concept="3clFbF" id="1VFlOLT0SiZ" role="3cqZAp">
+          <node concept="2OqwBi" id="1VFlOLT0Ve$" role="3clFbG">
+            <node concept="2OqwBi" id="1VFlOLT0SCI" role="2Oq$k0">
+              <node concept="QwW4i" id="1VFlOLT0SiY" role="2Oq$k0">
+                <ref role="QwW4h" node="1VFlOLT0SiF" resolve="module" />
+              </node>
+              <node concept="3Tsc0h" id="1VFlOLT0TfW" role="2OqNvi">
+                <ref role="3TtcxE" to="x27k:19a6$uAA8hU" resolve="imports" />
+              </node>
+            </node>
+            <node concept="TSZUe" id="1VFlOLT0WGX" role="2OqNvi">
+              <node concept="2pJPEk" id="1VFlOLT0WNU" role="25WWJ7">
+                <node concept="2pJPED" id="1VFlOLT0XhI" role="2pJPEn">
+                  <ref role="2pJxaS" to="vs0r:DubiFAXpld" resolve="DefaultGenericChunkDependency" />
+                  <node concept="2pIpSj" id="1VFlOLT0XGT" role="2pJxcM">
+                    <ref role="2pIpSl" to="vs0r:DubiFAXDKB" resolve="chunk" />
+                    <node concept="36biLy" id="1VFlOLT0XUA" role="2pJxcZ">
+                      <node concept="3B5_sB" id="1VFlOLT0XV2" role="36biLW">
+                        <ref role="3B5MYn" to="aelz:3kpMhm4HRQv" resolve="avr_interrupt" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="Q6JDH" id="1VFlOLT0SiF" role="Q6Id_">
+      <property role="TrG5h" value="module" />
+      <node concept="3Tqbb2" id="1VFlOLT0SiL" role="Q6QK4">
+        <ref role="ehGHo" to="x27k:5_l8w1EmTde" resolve="ImplementationModule" />
+      </node>
+    </node>
+    <node concept="QznSV" id="1VFlOLT10l0" role="QzAvj">
+      <node concept="3clFbS" id="1VFlOLT10l1" role="2VODD2">
+        <node concept="3clFbF" id="1VFlOLT10tq" role="3cqZAp">
+          <node concept="Xl_RD" id="1VFlOLT10tp" role="3clFbG">
+            <property role="Xl_RC" value="Add Import to Required Header" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/lib/src/mbeddr_arduino.c b/lib/src/mbeddr_arduino.c
index b852977..a6543d8 100644
--- a/lib/src/mbeddr_arduino.c
+++ b/lib/src/mbeddr_arduino.c
@@ -1,17 +1,29 @@
 #include <avr/io.h>
 
+
+#if defined (__AVR_ATmega328__)
+#define 	UCSRA 	UCSR0A
+#define 	UCSRB 	UCSR0B
+#define 	UCSRC 	UCSR0C
+#define 	UBRRH 	UBRR0H
+#define 	UBRRL 	UBRR0L
+#define 	UDRE 	UDRE0
+#define 	UDR 	UDR0
+#define 	RXC 	RXC0
+#endif
+
 void ADC_Init(void) {
- 
+
   uint16_t result;
   //set ADCref to AVcc
-  ADMUX = (1<<REFS0);    
+  ADMUX = (1<<REFS0);
 
   //set ADC prescale to 128
   ADCSRA = (1<<ADPS1) | (1<<ADPS0);
   ADCSRA |= (1<<ADEN);                  // enable ADC
- 
+
   ADCSRA |= (1<<ADSC);                  // start a dummy conversion
-  while (ADCSRA & (1<<ADSC) ) {         // because the first conversion after          
+  while (ADCSRA & (1<<ADSC) ) {         // because the first conversion after
   }                                     // after set up is invalid
 
   result = ADCW;
@@ -51,8 +63,8 @@ void uart_write_byte(uint8_t d)
 }
 
 unsigned char uart_receive(void){
- 
+
  while(!(UCSRA & (1<<RXC)));
  return UDR;
- 
+
 }
diff --git a/solutions/arduino.samples/models/arduino/samples/Atomic/Atomic.mpsr b/solutions/arduino.samples/models/arduino/samples/Atomic/Atomic.mpsr
index e170d29..927b724 100755
--- a/solutions/arduino.samples/models/arduino/samples/Atomic/Atomic.mpsr
+++ b/solutions/arduino.samples/models/arduino/samples/Atomic/Atomic.mpsr
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:85ad1dcd-51a2-4011-8682-690adc5a12a8(arduino.samples.Atomic)" content="root">
   <persistence version="9" />
-  <imports />
+  <imports>
+    <import index="aelz" ref="r:832a1eb9-6df4-4b76-8168-017ed7892fc6(mbeddr.arduino.header.Import)" implicit="true" />
+  </imports>
   <registry>
     <language id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements">
       <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
@@ -24,6 +26,11 @@
       <concept id="6113173064528067332" name="com.mbeddr.core.pointers.structure.StringType" flags="ng" index="Pu267" />
       <concept id="5679441017214012545" name="com.mbeddr.core.pointers.structure.ArrayType" flags="ng" index="3J0A42" />
     </language>
+    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
+      <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
+        <reference id="747084250476878887" name="chunk" index="3GEb4d" />
+      </concept>
+    </language>
     <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules">
       <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
         <child id="8967919205527146150" name="expression" index="2BFjQA" />
@@ -33,6 +40,7 @@
       </concept>
       <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
         <child id="6437088627575722833" name="contents" index="N3F5h" />
+        <child id="1317894735999304826" name="imports" index="2OODSX" />
       </concept>
       <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
       <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
@@ -150,6 +158,9 @@
         </node>
       </node>
     </node>
+    <node concept="3GEVxB" id="1VFlOLT1Yd0" role="2OODSX">
+      <ref role="3GEb4d" to="aelz:3kpMhm4HRQv" resolve="avr_interrupt" />
+    </node>
   </node>
 </model>
 

From 4c19f67391874d1c59ecbe3aca84be9267e3d41e Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 22 Nov 2016 17:33:41 +0100
Subject: [PATCH 33/48] build lib with gcc 4.9

---
 .gitlab-ci.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 332f6b3..96f944c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,6 +36,13 @@ build:
     - gradle/build/artifacts/mbeddr-arduino/
     expire_in: 1 week
 
+build lib with GCC 4.9:
+  stage: build
+  image: coolya/gcc-avr:4.9
+  script:
+    - cd lib
+    - make
+
 # Use the generated build output to run the tests.
 test:
   stage: test

From 27e501613fc1f30cc273475bd43300890081aaa6 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 22 Nov 2016 17:52:22 +0100
Subject: [PATCH 34/48] install git?

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96f944c..830b96f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,6 +39,8 @@ build:
 build lib with GCC 4.9:
   stage: build
   image: coolya/gcc-avr:4.9
+  before_script:
+    - apt-get install git
   script:
     - cd lib
     - make

From b41c7dd3018cf330d4cbe2dce9498f5ea070b5a0 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 22 Nov 2016 17:58:49 +0100
Subject: [PATCH 35/48] no git

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 830b96f..b3ad7d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,6 +39,8 @@ build:
 build lib with GCC 4.9:
   stage: build
   image: coolya/gcc-avr:4.9
+  variables:
+    GIT_STRATEGY: none
   before_script:
     - apt-get install git
   script:

From 2a6d721eb4460a6f277fa6c9c34e114c2c3d4566 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 22 Nov 2016 18:18:58 +0100
Subject: [PATCH 36/48] don't install git

---
 .gitlab-ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3ad7d4..96f944c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,10 +39,6 @@ build:
 build lib with GCC 4.9:
   stage: build
   image: coolya/gcc-avr:4.9
-  variables:
-    GIT_STRATEGY: none
-  before_script:
-    - apt-get install git
   script:
     - cd lib
     - make

From c37b791e3972ff61978ec33798d14dcfae9cd143 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 22 Nov 2016 18:26:05 +0100
Subject: [PATCH 37/48] register artifacts

---
 .gitlab-ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96f944c..7f408ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,6 +39,10 @@ build:
 build lib with GCC 4.9:
   stage: build
   image: coolya/gcc-avr:4.9
+  artifacts:
+    paths:
+    - lib/build/
+    expire_in: 1 week
   script:
     - cd lib
     - make

From 6f16db32cb25f7b4c65f24ff52d0bb4f7e4ba009 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 22 Nov 2016 18:26:30 +0100
Subject: [PATCH 38/48] bump version to 1.7

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f408ad..bb9bc12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ image: java:8
 
 
 variables:
-  VERSION: "0.1.6"
+  VERSION: "0.1.7"
 
 # Make the gradle wrapper executable. This essentially downloads a copy of
 # Gradle to build the project with.

From 63e959f98d1ccb4434255190738028da1b086123 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 22 Nov 2016 18:57:15 +0100
Subject: [PATCH 39/48] don't push tag to gitlab

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb9bc12..b80c946 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,7 @@ deploy github release:
   before_script:
     # Install ssh-agent if not already installed, it is required by Docker.
     # (change apt-get to yum if you use a CentOS-based image)
-    - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+    - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client zip -y )'
     # Run ssh-agent (inside the build environment)
     - eval $(ssh-agent -s)
     # For Docker builds disable host key checking. Be aware that by adding that
@@ -83,7 +83,6 @@ deploy github release:
   - git tag $VERSION HEAD
   - git push github HEAD:release
   - git push github $VERSION
-  - git push $VERSION
   - github-release release -s $GITHUB_TOKEN -u coolya -r mbeddr.arduino -t $VERSION
   - github-release upload -s $GITHUB_TOKEN  -u coolya -r mbeddr.arduino -t $VERSION -f gradle/build/artifacts/mbeddr-arduino/mbeddr-arduino.zip -n mbeddr-arduino.zip
   only:

From f5761abf3c7c5d2ea41995d3f0708f56ddcbb975 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 22 Nov 2016 22:48:40 +0000
Subject: [PATCH 40/48] Add changelog

---
 CHANGELOG | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..e6877e6
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,15 @@
+## Changelog
+
+### 0.1.7 (Saker)
+    - bug fixes
+    - adapted support library to new AVR SDK
+
+### 0.1.6 (Hobby)
+    - bug fix release for 0.1.5
+
+### 0.1.5 (Kestrel)
+    - basic migration to MPS 3.4
+
+### 0.1.0 (Merlin)
+    - initial release
+

From a5bbe58b13a27fbe032a31ff8d062154653d237c Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 22 Nov 2016 22:49:41 +0000
Subject: [PATCH 41/48] Update CHANGELOG

---
 CHANGELOG => CHANGELOG.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename CHANGELOG => CHANGELOG.md (100%)

diff --git a/CHANGELOG b/CHANGELOG.md
similarity index 100%
rename from CHANGELOG
rename to CHANGELOG.md

From 2caee3ba44f9dde3f7836ac7b5c80c6b85859246 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 22 Nov 2016 22:50:20 +0000
Subject: [PATCH 42/48] Update CHANGELOG.md

---
 CHANGELOG.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6877e6..47cd002 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,15 @@
 ## Changelog
 
 ### 0.1.7 (Saker)
-    - bug fixes
-    - adapted support library to new AVR SDK
+- bug fixes
+- adapted support library to new AVR SDK
 
 ### 0.1.6 (Hobby)
-    - bug fix release for 0.1.5
+- bug fix release for 0.1.5
 
 ### 0.1.5 (Kestrel)
-    - basic migration to MPS 3.4
+- basic migration to MPS 3.4
 
 ### 0.1.0 (Merlin)
-    - initial release
+- initial release
 

From 4e15f900a9bf03d1f1f82003263ca2500aefb376 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Tue, 22 Nov 2016 22:54:41 +0000
Subject: [PATCH 43/48] fix readme typo

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index d4bf52a..a63b5f0 100644
--- a/Readme.md
+++ b/Readme.md
@@ -6,7 +6,7 @@
 
 This is a DSL to write programs for the [Arduino][ar] platform. It is based on the [mbeddr][mbddr] project which is an extensible C implementation in [JetBrains MPS][mps].
 
-Currently this project nothing but a playground if offers some really limited support for the Arduino Uno and is likely to change and break stuff so this nothing you want to put you work on right now.
+Currently this project nothing but a playground it offers some really limited support for the Arduino Uno and is likely to change and break stuff so this nothing you want to put you work on right now.
 
 ## Installation
 

From e272bb4d688db823ef980dcfc5685ccee144822b Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Wed, 23 Nov 2016 21:29:39 +0100
Subject: [PATCH 44/48] build lib with gcc 5.4

---
 .gitlab-ci.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b80c946..cb69e4b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,6 +47,17 @@ build lib with GCC 4.9:
     - cd lib
     - make
 
+build lib with GCC 5.4:
+  stage: build
+  image: coolya/gcc-avr:5.4
+  artifacts:
+    paths:
+    - lib/build/
+    expire_in: 1 week
+  script:
+    - cd lib
+    - make
+
 # Use the generated build output to run the tests.
 test:
   stage: test

From 103f4b70420e7f833a211ba8588864932f11f85c Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Sat, 4 Feb 2017 11:23:09 +0100
Subject: [PATCH 45/48] apply migrations

---
 _spreferences/PlatformTemplates/module.msd    |  3 ++-
 .../TypeSizeConfiguration/module.msd          |  3 ++-
 .../mbeddr.arduino.core.mpl                   | 12 ++++++----
 .../pluginSolution/mbeddr.arduino.util.msd    |  3 ++-
 .../mbeddr.arduino.interrupts.mpl             | 24 ++++---------------
 .../mbeddr.arduino.registers.mpl              | 14 +++++------
 .../mbeddr.arduino.statemachine.mpl           | 13 +++++-----
 solutions/arduino.samples/arduino.samples.msd |  6 +++--
 .../arduino/samples/statemachine/.model       |  2 +-
 .../models/arduino/samples/weather/.model     |  2 +-
 .../mbeddr.arduino.header.msd                 |  3 ++-
 .../mbeddr.arduino.platform.msd               |  3 ++-
 12 files changed, 40 insertions(+), 48 deletions(-)

diff --git a/_spreferences/PlatformTemplates/module.msd b/_spreferences/PlatformTemplates/module.msd
index f466475..61006c6 100644
--- a/_spreferences/PlatformTemplates/module.msd
+++ b/_spreferences/PlatformTemplates/module.msd
@@ -7,7 +7,7 @@
   </models>
   <sourcePath />
   <languageVersions>
-    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
+    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="4" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="1" />
     <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="3" />
@@ -17,6 +17,7 @@
     <language slang="l:a9d69647-0840-491e-bf39-2eb0805d2011:com.mbeddr.core.statements" version="1" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
     <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
+    <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
     <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
     <language slang="l:c1c2a88a-323c-4605-a37d-9ab77a2ccbd2:com.mbeddr.mpsutil.suppresswarning" version="0" />
diff --git a/_spreferences/TypeSizeConfiguration/module.msd b/_spreferences/TypeSizeConfiguration/module.msd
index e3e7624..7fdc26c 100644
--- a/_spreferences/TypeSizeConfiguration/module.msd
+++ b/_spreferences/TypeSizeConfiguration/module.msd
@@ -7,11 +7,12 @@
   </models>
   <sourcePath />
   <languageVersions>
-    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
+    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="4" />
     <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="3" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
     <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
+    <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
     <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
diff --git a/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl b/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl
index c4edf7d..c27afeb 100755
--- a/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl
+++ b/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl
@@ -44,7 +44,7 @@
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
       </usedDevKits>
       <languageVersions>
-        <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
+        <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="4" />
         <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="1" />
         <language slang="l:b2da2e1a-b542-47f5-9be0-4dc21efe74a4:com.mbeddr.core.checks" version="0" />
         <language slang="l:390de4af-0c8d-4716-8dec-3d05ca751b28:com.mbeddr.core.cinterpreter" version="0" />
@@ -63,6 +63,7 @@
         <language slang="l:2693fc71-9b0e-4b05-ab13-f57227d675f2:com.mbeddr.core.util" version="0" />
         <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
         <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
+        <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
         <language slang="l:b67a6ca0-735e-4903-b238-4b525bddf96a:com.mbeddr.mpsutil.genutil" version="0" />
         <language slang="l:1c897ba5-9d43-4035-ac7f-0306495743ac:com.mbeddr.mpsutil.interpreter.test" version="0" />
         <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
@@ -101,7 +102,7 @@
         <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
         <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
         <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-        <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+        <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="1" />
         <module reference="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" version="0" />
         <module reference="3201b692-7d0a-49d1-ac65-5d4aaeb141fb(com.mbeddr.core.buildconfig#7717755763392579406)" version="0" />
         <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
@@ -117,6 +118,7 @@
         <module reference="2693fc71-9b0e-4b05-ab13-f57227d675f2(com.mbeddr.core.util)" version="0" />
         <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
         <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
+        <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
         <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
         <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
         <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
@@ -226,7 +228,7 @@
     <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
+    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="4" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="1" />
     <language slang="l:b2da2e1a-b542-47f5-9be0-4dc21efe74a4:com.mbeddr.core.checks" version="0" />
     <language slang="l:390de4af-0c8d-4716-8dec-3d05ca751b28:com.mbeddr.core.cinterpreter" version="0" />
@@ -245,6 +247,7 @@
     <language slang="l:2693fc71-9b0e-4b05-ab13-f57227d675f2:com.mbeddr.core.util" version="0" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
     <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
+    <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:1c897ba5-9d43-4035-ac7f-0306495743ac:com.mbeddr.mpsutil.interpreter.test" version="0" />
     <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
     <language slang="l:92f195b6-a209-4804-ad65-f5248ecd5873:com.mbeddr.mpsutil.margincell" version="0" />
@@ -293,7 +296,7 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="1" />
     <module reference="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" version="0" />
     <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
     <module reference="783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)" version="0" />
@@ -307,6 +310,7 @@
     <module reference="2693fc71-9b0e-4b05-ab13-f57227d675f2(com.mbeddr.core.util)" version="0" />
     <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
     <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
+    <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
     <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
     <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
     <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
diff --git a/languages/mbeddr.arduino.core/solutions/pluginSolution/mbeddr.arduino.util.msd b/languages/mbeddr.arduino.core/solutions/pluginSolution/mbeddr.arduino.util.msd
index d95809b..4d578bd 100644
--- a/languages/mbeddr.arduino.core/solutions/pluginSolution/mbeddr.arduino.util.msd
+++ b/languages/mbeddr.arduino.core/solutions/pluginSolution/mbeddr.arduino.util.msd
@@ -54,7 +54,7 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" version="0" />
-    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="1" />
     <module reference="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" version="0" />
     <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
     <module reference="783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)" version="0" />
@@ -69,6 +69,7 @@
     <module reference="2693fc71-9b0e-4b05-ab13-f57227d675f2(com.mbeddr.core.util)" version="0" />
     <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
     <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
+    <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
     <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
     <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
     <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
diff --git a/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl b/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl
index 6ed212d..08ceddc 100755
--- a/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl
+++ b/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl
@@ -32,20 +32,6 @@
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
       </usedDevKits>
       <languageVersions>
-        <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
-        <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
-        <language slang="l:783af01f-87a7-412c-be99-293a162652b5:com.mbeddr.core.embedded" version="0" />
-        <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="3" />
-        <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="4" />
-        <language slang="l:3bf5377a-e904-4ded-9754-5a516023bfaa:com.mbeddr.core.pointers" version="0" />
-        <language slang="l:a9d69647-0840-491e-bf39-2eb0805d2011:com.mbeddr.core.statements" version="1" />
-        <language slang="l:efda956e-491e-4f00-ba14-36af2f213ecf:com.mbeddr.core.udt" version="1" />
-        <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
-        <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
-        <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
-        <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
-        <language slang="l:c1c2a88a-323c-4605-a37d-9ab77a2ccbd2:com.mbeddr.mpsutil.suppresswarning" version="0" />
-        <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
         <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
@@ -53,17 +39,13 @@
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
-        <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
         <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-        <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
         <language slang="l:e562f51e-6403-4857-b773-44632077c67d:mbeddr.arduino.interrupts" version="0" />
       </languageVersions>
       <dependencyVersions>
@@ -74,7 +56,7 @@
         <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
         <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
         <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-        <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+        <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="1" />
         <module reference="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" version="0" />
         <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
         <module reference="783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)" version="0" />
@@ -87,6 +69,7 @@
         <module reference="efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt)" version="0" />
         <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
         <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
+        <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
         <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
         <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
         <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
@@ -156,7 +139,7 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="1" />
     <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
     <module reference="783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)" version="0" />
     <module reference="61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)" version="0" />
@@ -167,6 +150,7 @@
     <module reference="efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt)" version="0" />
     <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
     <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
+    <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
     <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
     <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
     <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
diff --git a/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl b/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl
index 2fd7798..8d892fb 100755
--- a/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl
+++ b/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl
@@ -24,19 +24,15 @@
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
       </usedDevKits>
       <languageVersions>
-        <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
+        <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="4" />
         <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
-        <language slang="l:783af01f-87a7-412c-be99-293a162652b5:com.mbeddr.core.embedded" version="0" />
         <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="3" />
-        <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="4" />
-        <language slang="l:3bf5377a-e904-4ded-9754-5a516023bfaa:com.mbeddr.core.pointers" version="0" />
         <language slang="l:a9d69647-0840-491e-bf39-2eb0805d2011:com.mbeddr.core.statements" version="1" />
-        <language slang="l:efda956e-491e-4f00-ba14-36af2f213ecf:com.mbeddr.core.udt" version="1" />
         <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
         <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
+        <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
         <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
         <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
-        <language slang="l:c1c2a88a-323c-4605-a37d-9ab77a2ccbd2:com.mbeddr.mpsutil.suppresswarning" version="0" />
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
         <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
@@ -66,7 +62,7 @@
         <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
         <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
         <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-        <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+        <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="1" />
         <module reference="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" version="0" />
         <module reference="3201b692-7d0a-49d1-ac65-5d4aaeb141fb(com.mbeddr.core.buildconfig#7717755763392579406)" version="0" />
         <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
@@ -81,6 +77,7 @@
         <module reference="efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt)" version="0" />
         <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
         <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
+        <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
         <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
         <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
         <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
@@ -160,7 +157,7 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="1" />
     <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
     <module reference="783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)" version="0" />
     <module reference="61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)" version="0" />
@@ -171,6 +168,7 @@
     <module reference="efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt)" version="0" />
     <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
     <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
+    <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
     <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
     <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
     <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
diff --git a/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl b/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl
index 7a8b560..70a5e97 100755
--- a/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl
+++ b/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl
@@ -26,10 +26,9 @@
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
       </usedDevKits>
       <languageVersions>
-        <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
+        <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="4" />
         <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="1" />
         <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
-        <language slang="l:783af01f-87a7-412c-be99-293a162652b5:com.mbeddr.core.embedded" version="0" />
         <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="3" />
         <language slang="l:f93d1dbe-bfd1-42dd-932a-f375fa6f5373:com.mbeddr.core.make" version="1" />
         <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="4" />
@@ -39,11 +38,10 @@
         <language slang="l:efda956e-491e-4f00-ba14-36af2f213ecf:com.mbeddr.core.udt" version="1" />
         <language slang="l:06d68b77-b699-4918-83b8-857e63787800:com.mbeddr.core.unittest" version="3" />
         <language slang="l:2693fc71-9b0e-4b05-ab13-f57227d675f2:com.mbeddr.core.util" version="0" />
-        <language slang="l:97d24244-51db-4e2e-97fc-7bd73b1f5f40:com.mbeddr.ext.components" version="1" />
-        <language slang="l:13a36f90-83c5-4bf6-9dd6-70e455f1ef36:com.mbeddr.ext.components.statemachine" version="0" />
         <language slang="l:564e97d6-8fb7-41f5-bfc1-c7ed376efd62:com.mbeddr.ext.statemachines" version="0" />
         <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
         <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
+        <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
         <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
         <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
         <language slang="l:c1c2a88a-323c-4605-a37d-9ab77a2ccbd2:com.mbeddr.mpsutil.suppresswarning" version="0" />
@@ -66,7 +64,6 @@
         <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
-        <language slang="l:3c4c8461-a533-4459-916a-dc0176793b4c:mbeddr.arduino.core" version="0" />
         <language slang="l:028007ba-e266-4d05-ab46-25264b977671:mbeddr.arduino.statemachine" version="0" />
       </languageVersions>
       <dependencyVersions>
@@ -77,7 +74,7 @@
         <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
         <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
         <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-        <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+        <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="1" />
         <module reference="2764de2d-de8a-48ff-9db3-f78342da5c1a(com.mbeddr.core.base#8626086128958648025)" version="0" />
         <module reference="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" version="0" />
         <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
@@ -101,6 +98,7 @@
         <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
         <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
         <module reference="c7a315e6-1d93-4186-85bc-2dfafd1ccc21(com.mbeddr.mpsutil.common)" version="0" />
+        <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
         <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
         <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
         <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
@@ -184,7 +182,7 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="1" />
     <module reference="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" version="0" />
     <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
     <module reference="783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)" version="0" />
@@ -203,6 +201,7 @@
     <module reference="564e97d6-8fb7-41f5-bfc1-c7ed376efd62(com.mbeddr.ext.statemachines)" version="0" />
     <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
     <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
+    <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
     <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
     <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
     <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
diff --git a/solutions/arduino.samples/arduino.samples.msd b/solutions/arduino.samples/arduino.samples.msd
index 9c76f26..f90f3ae 100755
--- a/solutions/arduino.samples/arduino.samples.msd
+++ b/solutions/arduino.samples/arduino.samples.msd
@@ -34,7 +34,7 @@
     <language slang="l:634736cf-ea73-4eb1-abe9-d2ecc5fcf837:com.mbeddr.cc.var.c" version="0" />
     <language slang="l:e401b447-8019-4ccd-a72c-bfb0230f5782:com.mbeddr.cc.var.fm" version="1" />
     <language slang="l:b8eeb935-038d-48d8-ae7f-0c6768b8d4fc:com.mbeddr.cc.var.rt" version="0" />
-    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
+    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="4" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="1" />
     <language slang="l:b2da2e1a-b542-47f5-9be0-4dc21efe74a4:com.mbeddr.core.checks" version="0" />
     <language slang="l:390de4af-0c8d-4716-8dec-3d05ca751b28:com.mbeddr.core.cinterpreter" version="0" />
@@ -67,6 +67,7 @@
     <language slang="l:0d04a6cc-773e-4069-b9b0-11884b2ff1c8:com.mbeddr.ext.units" version="1" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
     <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
+    <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:1c897ba5-9d43-4035-ac7f-0306495743ac:com.mbeddr.mpsutil.interpreter.test" version="0" />
     <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
     <language slang="l:92f195b6-a209-4804-ad65-f5248ecd5873:com.mbeddr.mpsutil.margincell" version="0" />
@@ -105,7 +106,7 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="6641f174-372a-4d9c-becb-c158db4f4770(arduino.samples)" version="0" />
-    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="0" />
+    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="1" />
     <module reference="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" version="0" />
     <module reference="223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)" version="0" />
     <module reference="783af01f-87a7-412c-be99-293a162652b5(com.mbeddr.core.embedded)" version="0" />
@@ -120,6 +121,7 @@
     <module reference="30d40e06-2249-4bd3-b8ab-109459f5021f(com.mbeddr.ext.units.runtime)" version="0" />
     <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
     <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
+    <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
     <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
     <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
     <module reference="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning)" version="0" />
diff --git a/solutions/arduino.samples/models/arduino/samples/statemachine/.model b/solutions/arduino.samples/models/arduino/samples/statemachine/.model
index dc15f8a..309d271 100755
--- a/solutions/arduino.samples/models/arduino/samples/statemachine/.model
+++ b/solutions/arduino.samples/models/arduino/samples/statemachine/.model
@@ -11,7 +11,7 @@
     <use id="2693fc71-9b0e-4b05-ab13-f57227d675f2" name="com.mbeddr.core.util" version="-1" />
     <use id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements" version="1" />
     <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="3" />
-    <use id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base" version="3" />
+    <use id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base" version="4" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="c1c2a88a-323c-4605-a37d-9ab77a2ccbd2" name="com.mbeddr.mpsutil.suppresswarning" version="0" />
     <use id="a482b416-d0c9-473f-8f67-725ed642b3f3" name="com.mbeddr.mpsutil.breadcrumb" version="0" />
diff --git a/solutions/arduino.samples/models/arduino/samples/weather/.model b/solutions/arduino.samples/models/arduino/samples/weather/.model
index e3416f2..c36aed9 100755
--- a/solutions/arduino.samples/models/arduino/samples/weather/.model
+++ b/solutions/arduino.samples/models/arduino/samples/weather/.model
@@ -10,7 +10,7 @@
     <use id="783af01f-87a7-412c-be99-293a162652b5" name="com.mbeddr.core.embedded" version="-1" />
     <use id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements" version="1" />
     <use id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions" version="3" />
-    <use id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base" version="3" />
+    <use id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base" version="4" />
     <devkit ref="6845f348-7ea5-449c-ae3b-3d600bc3b73d(mbeddr.arduino)" />
     <devkit ref="1a986be1-0ef0-4f9f-9d8a-81c3ea7227ae(com.mbeddr.physicalunits)" />
     <devkit ref="54c79f9f-f3ba-4167-91f1-eb4e98a9c47c(com.mbeddr.documentation)" />
diff --git a/solutions/mbeddr.arduino.header/mbeddr.arduino.header.msd b/solutions/mbeddr.arduino.header/mbeddr.arduino.header.msd
index 356fea3..84ab56c 100755
--- a/solutions/mbeddr.arduino.header/mbeddr.arduino.header.msd
+++ b/solutions/mbeddr.arduino.header/mbeddr.arduino.header.msd
@@ -10,7 +10,7 @@
     <usedDevKit>d2a9c55c-6bdc-4cc2-97e1-4ba7552f5584(com.mbeddr.core)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
+    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="4" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="1" />
     <language slang="l:b2da2e1a-b542-47f5-9be0-4dc21efe74a4:com.mbeddr.core.checks" version="0" />
     <language slang="l:390de4af-0c8d-4716-8dec-3d05ca751b28:com.mbeddr.core.cinterpreter" version="0" />
@@ -29,6 +29,7 @@
     <language slang="l:2693fc71-9b0e-4b05-ab13-f57227d675f2:com.mbeddr.core.util" version="0" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
     <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
+    <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:1c897ba5-9d43-4035-ac7f-0306495743ac:com.mbeddr.mpsutil.interpreter.test" version="0" />
     <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
     <language slang="l:92f195b6-a209-4804-ad65-f5248ecd5873:com.mbeddr.mpsutil.margincell" version="0" />
diff --git a/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd b/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd
index a1f5e34..28ce60b 100755
--- a/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd
+++ b/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd
@@ -14,7 +14,7 @@
     <usedDevKit>d2a9c55c-6bdc-4cc2-97e1-4ba7552f5584(com.mbeddr.core)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="3" />
+    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="4" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="1" />
     <language slang="l:b2da2e1a-b542-47f5-9be0-4dc21efe74a4:com.mbeddr.core.checks" version="0" />
     <language slang="l:390de4af-0c8d-4716-8dec-3d05ca751b28:com.mbeddr.core.cinterpreter" version="0" />
@@ -33,6 +33,7 @@
     <language slang="l:2693fc71-9b0e-4b05-ab13-f57227d675f2:com.mbeddr.core.util" version="0" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
     <language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
+    <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:1c897ba5-9d43-4035-ac7f-0306495743ac:com.mbeddr.mpsutil.interpreter.test" version="0" />
     <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
     <language slang="l:92f195b6-a209-4804-ad65-f5248ecd5873:com.mbeddr.mpsutil.margincell" version="0" />

From 7b42d575a72d954810d8ac451b82a4bd619bdc0e Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Sat, 4 Feb 2017 11:30:23 +0100
Subject: [PATCH 46/48] build: adapt changes in mbeddr

---
 build.gradle                                  |   4 +-
 build/build.xml                               | 823 +++++++++---------
 .../models/mbeddr/arduino/build/build.mps     |  23 +-
 3 files changed, 438 insertions(+), 412 deletions(-)

diff --git a/build.gradle b/build.gradle
index e44c4f5..5640fa2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ if (project.hasProperty('projectVersion')) {
 }
 
 // Dependency versions
-ext.mpsVersion = '3.4.1'
+ext.mpsVersion = '3.4.3'
 ext.mbeddrVersion = '1.0.+'
 ext.iets3Version = '0.1.+'
 
@@ -62,7 +62,7 @@ configurations {
 dependencies {
     mps "com.jetbrains:mps:$mpsVersion"
     mpsArtifacts "com.mbeddr:allScripts:$mbeddrVersion"
-    mpsArtifacts "com.mbeddr:allInOne:$mbeddrVersion"
+    mpsArtifacts "com.mbeddr:mbeddr:$mbeddrVersion"
 }
 
 repositories {
diff --git a/build/build.xml b/build/build.xml
index 09f0ab1..aaa8eb7 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -5,21 +5,21 @@
   <property name="build.layout" location="${build.dir}/artifacts/mbeddr-arduino" />
   <property name="mbeddr.arduino" location="${basedir}/.." />
   <property name="mps.home" location="${basedir}/../../../../../../Applications/MPS_3.3.app/Contents" />
-  <property name="mbeddr.github.core.home" location="${basedir}/../../../mbeddr.core" />
-  <property name="artifacts.root" location="" />
-  <property name="mbeddr.artifacts" location="${artifacts.root}/com.mbeddr.allInOne" />
+  <property name="mbeddr.github.core.home" location="${basedir}/../../mbeddr.core-34" />
+  <property name="artifacts.root" location="${mbeddr.github.core.home}/artifacts" />
+  <property name="mbeddr.artifacts" location="${artifacts.root}/mbeddr" />
   <property name="sl-all.artifacts" location="${artifacts.root}/mps-sl-all" />
   <property name="platform.artifacts" location="${artifacts.root}/com.mbeddr.platform" />
   <property name="spawner.artifacts" location="${artifacts.root}/spawner" />
   <property name="artifacts.mps" location="${mps.home}" />
   <property name="artifacts.jetpad" location="${mps.home}" />
   <property name="artifacts.mpsDiagramEditor" location="${mps.home}" />
-  <property name="artifacts.com.mbeddr.allInOne" location="${mbeddr.artifacts}" />
+  <property name="artifacts.mbeddr" location="${mbeddr.artifacts}" />
   <property name="artifacts.com.mbeddr.platform" location="${platform.artifacts}" />
   <property name="artifacts.mps-sl-all" location="${sl-all.artifacts}" />
   <property name="artifacts.spawner" location="${spawner.artifacts}" />
   <property file="${artifacts.mps}/build.properties" prefix="import.mps" />
-  <property file="${artifacts.com.mbeddr.allInOne}/build.properties" prefix="import.com.mbeddr.allInOne" />
+  <property file="${artifacts.mbeddr}/build.properties" prefix="import.mbeddr" />
   <property name="mps.build.number" value="${import.mps.mps.build.number}" />
   <property name="mps.date" value="${import.mps.mps.date}" />
   <property name="mps.build.vcs.number" value="${import.mps.mps.build.vcs.number}" />
@@ -27,15 +27,19 @@
   <property name="mps.idea.platform.build.number" value="${import.mps.mps.idea.platform.build.number}" />
   <property name="mps.mps.build.counter" value="${import.mps.mps.mps.build.counter}" />
   <property name="mpsBootstrapCore.version" value="${import.mps.mpsBootstrapCore.version}" />
-  <property name="mps-sl-all.versionNumber" value="${import.com.mbeddr.allInOne.mps-sl-all.versionNumber}" />
-  <property name="com.mbeddr.platform.major.version" value="${import.com.mbeddr.allInOne.com.mbeddr.platform.major.version}" />
-  <property name="com.mbeddr.platform.minor.version" value="${import.com.mbeddr.allInOne.com.mbeddr.platform.minor.version}" />
-  <property name="com.mbeddr.platform.build" value="${import.com.mbeddr.allInOne.com.mbeddr.platform.build}" />
-  <property name="com.mbeddr.platform.mbeddr.version" value="${import.com.mbeddr.allInOne.com.mbeddr.platform.mbeddr.version}" />
-  <property name="spawner.major.version" value="${import.com.mbeddr.allInOne.spawner.major.version}" />
-  <property name="spawner.minor.version" value="${import.com.mbeddr.allInOne.spawner.minor.version}" />
-  <property name="spawner.build" value="${import.com.mbeddr.allInOne.spawner.build}" />
-  <property name="spawner.mbeddr.version" value="${import.com.mbeddr.allInOne.spawner.mbeddr.version}" />
+  <property name="mbeddr.major.version" value="${import.mbeddr.mbeddr.major.version}" />
+  <property name="mbeddr.minor.version" value="${import.mbeddr.mbeddr.minor.version}" />
+  <property name="mbeddr.build" value="${import.mbeddr.mbeddr.build}" />
+  <property name="mbeddr.mbeddr.version" value="${import.mbeddr.mbeddr.mbeddr.version}" />
+  <property name="com.mbeddr.platform.major.version" value="${import.mbeddr.com.mbeddr.platform.major.version}" />
+  <property name="com.mbeddr.platform.minor.version" value="${import.mbeddr.com.mbeddr.platform.minor.version}" />
+  <property name="com.mbeddr.platform.build" value="${import.mbeddr.com.mbeddr.platform.build}" />
+  <property name="com.mbeddr.platform.mbeddr.version" value="${import.mbeddr.com.mbeddr.platform.mbeddr.version}" />
+  <property name="mps-sl-all.versionNumber" value="${import.mbeddr.mps-sl-all.versionNumber}" />
+  <property name="spawner.major.version" value="${import.mbeddr.spawner.major.version}" />
+  <property name="spawner.minor.version" value="${import.mbeddr.spawner.minor.version}" />
+  <property name="spawner.build" value="${import.mbeddr.spawner.build}" />
+  <property name="spawner.mbeddr.version" value="${import.mbeddr.spawner.mbeddr.version}" />
   <property name="environment" value="env" />
   <property name="env.JAVA_HOME" value="${java.home}/.." />
   <property name="jdk.home" value="${env.JAVA_HOME}" />
@@ -465,15 +469,12 @@
       <zipfileset file="${mbeddr.arduino}/devkits/mbeddr.arduino/mbeddr.arduino.devkit" prefix="mbeddr-arduino/languages/mbeddr.arduino" />
       <fileset dir="${build.tmp}/default/mbeddr-arduino.zip" />
     </zip>
-    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}mps-sl-all.versionNumber=${mps-sl-all.versionNumber}${line.separator}com.mbeddr.platform.major.version=${com.mbeddr.platform.major.version}${line.separator}com.mbeddr.platform.minor.version=${com.mbeddr.platform.minor.version}${line.separator}com.mbeddr.platform.build=${com.mbeddr.platform.build}${line.separator}com.mbeddr.platform.mbeddr.version=${com.mbeddr.platform.mbeddr.version}${line.separator}spawner.major.version=${spawner.major.version}${line.separator}spawner.minor.version=${spawner.minor.version}${line.separator}spawner.build=${spawner.build}${line.separator}spawner.mbeddr.version=${spawner.mbeddr.version}</echo>
+    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}mbeddr.major.version=${mbeddr.major.version}${line.separator}mbeddr.minor.version=${mbeddr.minor.version}${line.separator}mbeddr.build=${mbeddr.build}${line.separator}mbeddr.mbeddr.version=${mbeddr.mbeddr.version}${line.separator}com.mbeddr.platform.major.version=${com.mbeddr.platform.major.version}${line.separator}com.mbeddr.platform.minor.version=${com.mbeddr.platform.minor.version}${line.separator}com.mbeddr.platform.build=${com.mbeddr.platform.build}${line.separator}com.mbeddr.platform.mbeddr.version=${com.mbeddr.platform.mbeddr.version}${line.separator}mps-sl-all.versionNumber=${mps-sl-all.versionNumber}${line.separator}spawner.major.version=${spawner.major.version}${line.separator}spawner.minor.version=${spawner.minor.version}${line.separator}spawner.build=${spawner.build}${line.separator}spawner.mbeddr.version=${spawner.mbeddr.version}</echo>
   </target>
   
   <target name="buildDependents" />
   
-  <target name="fetchDependencies">
-    <mkdir dir="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip" />
-    <unzip src="http://github.com/$%7Bartifacts.com.mbeddr.allInOne%7D/com.mbeddr.allInOne.zip" dest="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip" />
-  </target>
+  <target name="fetchDependencies" />
   
   <target name="build" depends="assemble" />
   
@@ -495,6 +496,31 @@
   <target name="generate" depends="declare-mps-tasks, fetchDependencies">
     <echo message="generating" />
     <generate strictMode="true" parallelMode="true" parallelThreads="4" useInplaceTransform="true" hideWarnings="false" createStaticRefs="true" fork="true" targetJavaVersion="1.8">
+      <plugin path="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.filepicker" />
+      <plugin path="${artifacts.com.mbeddr.platform}/de-itemis-mps-selection" />
+      <plugin path="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout" />
+      <plugin path="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.diagram" />
+      <plugin path="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.layout" />
+      <plugin path="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.widgets" />
+      <plugin path="${artifacts.com.mbeddr.platform}/de.itemis.mps.tooltips" />
+      <plugin path="${artifacts.com.mbeddr.platform}/de.slisson.mps.conditionalEditor" />
+      <plugin path="${artifacts.com.mbeddr.platform}/de.slisson.mps.hacks" />
+      <plugin path="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil" />
+      <plugin path="${artifacts.com.mbeddr.platform}/mbeddr.platform" />
+      <plugin path="${artifacts.com.mbeddr.platform}/mps-apache-commons" />
+      <plugin path="${artifacts.com.mbeddr.platform}/mps-math-editor" />
+      <plugin path="${artifacts.com.mbeddr.platform}/mps-multiline" />
+      <plugin path="${artifacts.com.mbeddr.platform}/mps-richtext" />
+      <plugin path="${artifacts.com.mbeddr.platform}/mps-tables" />
+      <plugin path="${artifacts.mbeddr}/mbeddr.SmInComp" />
+      <plugin path="${artifacts.mbeddr}/mbeddr.components" />
+      <plugin path="${artifacts.mbeddr}/mbeddr.concurrency" />
+      <plugin path="${artifacts.mbeddr}/mbeddr.core" />
+      <plugin path="${artifacts.mbeddr}/mbeddr.debugger" />
+      <plugin path="${artifacts.mbeddr}/mbeddr.math" />
+      <plugin path="${artifacts.mbeddr}/mbeddr.spawner" />
+      <plugin path="${artifacts.mbeddr}/mbeddr.statemachine" />
+      <plugin path="${artifacts.mbeddr}/mbeddr.units" />
       <plugin path="${artifacts.mps}/plugins/mps-build" />
       <plugin path="${artifacts.mps}/plugins/mps-core/META-INF/plugin.xml/../.." />
       <plugin path="${artifacts.mps}/plugins/mps-debugger-api" />
@@ -503,30 +529,101 @@
       <plugin path="${artifacts.mps}/plugins/mps-execution-languages" />
       <plugin path="${artifacts.mps}/plugins/mps-make" />
       <plugin path="${artifacts.mps}/plugins/mps-testing" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.diagram" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.layout" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.widgets" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.tooltips" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.slisson.mps.conditionalEditor" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.slisson.mps.hacks" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.SmInComp" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.concurrency" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.math" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.spawner" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.statemachine" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.units" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-apache-commons" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-math-editor" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext" />
-      <plugin path="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-tables" />
+      <library file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.filepicker/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.styles.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.layout.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.styles.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.layout/languages/de.itemis.mps.editor.miglayout/de.itemis.mps.editor.layout.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.widgets/languages/de.itemis.mps.editor.widgets/de.itemis.mps.editor.bool.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.widgets/languages/de.itemis.mps.editor.widgets/de.itemis.mps.editor.bool.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.widgets/languages/de.itemis.mps.editor.widgets/de.itemis.mps.editor.collapsible.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.widgets/languages/de.itemis.mps.editor.widgets/de.itemis.mps.mouselistener.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/de.itemis.mps.tooltips/languages/de.itemis.mps.tooltips/de.itemis.mps.tooltips.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/de.slisson.mps.conditionalEditor/languages/de.slisson.mps.conditionalEditor/de.slisson.mps.conditionalEditor.hints.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/de.slisson.mps.conditionalEditor/languages/de.slisson.mps.conditionalEditor/de.slisson.mps.conditionalEditor.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/de.slisson.mps.hacks/languages/de.slisson.mps.hacks/de.slisson.mps.hacks.editor.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/de.slisson.mps.hacks/languages/de.slisson.mps.hacks/de.slisson.mps.reflection.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.baseLanguage/com.mbeddr.mpsutil.common.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/com.mbeddr.mpsutil.ccmenu.reftarget.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/com.mbeddr.mpsutil.compare.pattern.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/com.mbeddr.mpsutil.contextactions.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/com.mbeddr.mpsutil.dataflow.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/com.mbeddr.mpsutil.dataflow.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.gen-support/com.mbeddr.mpsutil.genutil.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells/com.mbeddr.mpsutil.grammarcells.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells/com.mbeddr.mpsutil.grammarcells.runtimelang.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/com.mbeddr.mpsutil.httpsupport.rt.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.infrastructure-support/com.mbeddr.mpsutil.nodeaccess.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.infrastructure-support/com.mbeddr.mpsutil.serializer.xml.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.rt.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.test.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.pluginSolution.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.editor.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.annotation.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.readonly.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.context.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mps-apache-commons/languages/mps-apache-commons/org.apache.commons.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.customcell.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mps-tables/languages/mps-tables/de.slisson.mps.tables.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/mps-tables/languages/mps-tables/de.slisson.mps.tables.runtime.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.SmInComp/languages/com.mbeddr.ext.statemachineInComponents/com.mbeddr.ext.components.statemachine.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.embedded.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.gen_nomw.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.mock.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.test.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.compositecomponents.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.components/languages/com.mbeddr.ext.components/components.devkit" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbddr.core.buildconfig.pluginSolution.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.checks.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.cinterpreter.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.debugger.gdb.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.legacy.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.gen.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.runconfiguration.pluginSolution.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.stdlib.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.unittest.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddt.core.expressions.pluginSolution.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/core.devkit" />
+      <library file="${artifacts.mbeddr}/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.blext.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.blext.runtime.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.spawner/languages/Eclipse.Debugger.jar" />
+      <library file="${artifacts.mbeddr}/mbeddr.statemachine/languages/com.mbeddr.ext.statemachine/com.mbeddr.ext.statemachines.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.checkedDots.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -620,108 +717,16 @@
       <library file="${artifacts.mps}/plugins/mps-execution-languages/lib/execution-languages.jar" />
       <library file="${artifacts.mps}/plugins/mps-make/solutions/jetbrains.mps.ide.make.jar" />
       <library file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.styles.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.layout.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.styles.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.layout/languages/de.itemis.mps.editor.miglayout/de.itemis.mps.editor.layout.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.widgets/languages/de.itemis.mps.editor.widgets/de.itemis.mps.editor.bool.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.widgets/languages/de.itemis.mps.editor.widgets/de.itemis.mps.editor.bool.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.widgets/languages/de.itemis.mps.editor.widgets/de.itemis.mps.editor.collapsible.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.widgets/languages/de.itemis.mps.editor.widgets/de.itemis.mps.mouselistener.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.tooltips/languages/de.itemis.mps.tooltips/de.itemis.mps.tooltips.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.slisson.mps.conditionalEditor/languages/de.slisson.mps.conditionalEditor/de.slisson.mps.conditionalEditor.hints.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.slisson.mps.conditionalEditor/languages/de.slisson.mps.conditionalEditor/de.slisson.mps.conditionalEditor.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.slisson.mps.hacks/languages/de.slisson.mps.hacks/de.slisson.mps.hacks.editor.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.slisson.mps.hacks/languages/de.slisson.mps.hacks/de.slisson.mps.reflection.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.SmInComp/languages/com.mbeddr.ext.statemachineInComponents/com.mbeddr.ext.components.statemachine.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.embedded.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.gen_nomw.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.mock.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.test.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.compositecomponents.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components/languages/com.mbeddr.ext.components/components.devkit" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbddr.core.buildconfig.pluginSolution.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.checks.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.cinterpreter.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.debugger.gdb.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.legacy.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.gen.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.runconfiguration.pluginSolution.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.stdlib.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.unittest.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddt.core.expressions.pluginSolution.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/core.devkit" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.blext.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.blext.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.baseLanguage/com.mbeddr.mpsutil.common.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ccmenu/com.mbeddr.mpsutil.ccmenu.reftarget.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/com.mbeddr.mpsutil.compare.pattern.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.contextactions/com.mbeddr.mpsutil.contextactions.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/com.mbeddr.mpsutil.dataflow.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/com.mbeddr.mpsutil.dataflow.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.gen-support/com.mbeddr.mpsutil.genutil.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells/com.mbeddr.mpsutil.grammarcells.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells/com.mbeddr.mpsutil.grammarcells.runtimelang.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/com.mbeddr.mpsutil.httpsupport.rt.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.infrastructure-support/com.mbeddr.mpsutil.nodeaccess.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.infrastructure-support/com.mbeddr.mpsutil.serializer.xml.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.rt.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.test.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.pluginSolution.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.editor.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.annotation.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.readonly.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.context.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.spawner/languages/Eclipse.Debugger.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.statemachine/languages/com.mbeddr.ext.statemachine/com.mbeddr.ext.statemachines.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-apache-commons/languages/mps-apache-commons/org.apache.commons.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.customcell.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-tables/languages/mps-tables/de.slisson.mps.tables.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-tables/languages/mps-tables/de.slisson.mps.tables.runtime.jar" />
       <chunk>
-        <module file="${mbeddr.arduino}/devkits/mbeddr.arduino/mbeddr.arduino.devkit" />
         <module file="${mbeddr.arduino}/languages/mbeddr.arduino.core/mbeddr.arduino.core.mpl" />
         <module file="${mbeddr.arduino}/languages/mbeddr.arduino.core/solutions/pluginSolution/mbeddr.arduino.util.msd" />
         <module file="${mbeddr.arduino}/solutions/mbeddr.arduino.header/mbeddr.arduino.header.msd" />
         <module file="${mbeddr.arduino}/languages/mbeddr.arduino.interrupts/mbeddr.arduino.interrupts.mpl" />
-        <module file="${mbeddr.arduino}/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd" />
         <module file="${mbeddr.arduino}/languages/mbeddr.arduino.registers/mbeddr.arduino.registers.mpl" />
+      </chunk>
+      <chunk>
+        <module file="${mbeddr.arduino}/devkits/mbeddr.arduino/mbeddr.arduino.devkit" />
+        <module file="${mbeddr.arduino}/solutions/mbeddr.arduino.platform/mbeddr.arduino.platform.msd" />
         <module file="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine/mbeddr.arduino.statemachine.mpl" />
       </chunk>
       <chunk />
@@ -786,7 +791,7 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2-sources.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/lib/diff_match_patch.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-multiline/lib/diff_match_patch.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -795,41 +800,42 @@
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.blext.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.rt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.editor.widgets/languages/de.itemis.mps.editor.widgets/de.itemis.mps.editor.bool.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.slisson.mps.hacks/languages/de.slisson.mps.hacks/de.slisson.mps.hacks.editor.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-tables/languages/mps-tables/de.slisson.mps.tables.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-tables/languages/mps-tables/de.slisson.mps.tables.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.blext.runtime.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.filepicker/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.rt.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.widgets/languages/de.itemis.mps.editor.widgets/de.itemis.mps.editor.bool.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/de.slisson.mps.hacks/languages/de.slisson.mps.hacks/de.slisson.mps.hacks.editor.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-tables/languages/mps-tables/de.slisson.mps.tables.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-tables/languages/mps-tables/de.slisson.mps.tables.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -900,7 +906,7 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2-sources.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/lib/diff_match_patch.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-multiline/lib/diff_match_patch.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -909,37 +915,38 @@
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.blext.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.rt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.blext.runtime.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.filepicker/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.rt.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -999,24 +1006,25 @@
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.filepicker/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -1069,7 +1077,7 @@
         <fileset file="${artifacts.mps}/plugins/mps-debugger-api/lib/debugger-api.jar" />
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.interrupts" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/lib/diff_match_patch.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-multiline/lib/diff_match_patch.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -1078,32 +1086,33 @@
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.filepicker/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -1163,24 +1172,25 @@
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.filepicker/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -1233,6 +1243,7 @@
         <fileset file="${artifacts.mps}/plugins/mps-debugger-api/lib/debugger-api.jar" />
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.registers" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-multiline/lib/diff_match_patch.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -1241,24 +1252,33 @@
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.filepicker/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -1313,7 +1333,7 @@
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.header" />
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.platform" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/lib/diff_match_patch.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-multiline/lib/diff_match_patch.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -1322,33 +1342,34 @@
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.gen.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.unittest.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.SmInComp/languages/com.mbeddr.ext.statemachineInComponents/com.mbeddr.ext.components.statemachine.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.statemachine/languages/com.mbeddr.ext.statemachine/com.mbeddr.ext.statemachines.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.gen.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.unittest.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.SmInComp/languages/com.mbeddr.ext.statemachineInComponents/com.mbeddr.ext.components.statemachine.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.statemachine/languages/com.mbeddr.ext.statemachine/com.mbeddr.ext.statemachines.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.filepicker/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -1404,7 +1425,7 @@
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.platform" />
         <pathelement path="${build.tmp}/java/out/mbeddr.arduino.statemachine" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/lib/diff_match_patch.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-multiline/lib/diff_match_patch.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -1413,38 +1434,39 @@
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.gen.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.unittest.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.SmInComp/languages/com.mbeddr.ext.statemachineInComponents/com.mbeddr.ext.components.statemachine.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.statemachine/languages/com.mbeddr.ext.statemachine/com.mbeddr.ext.statemachines.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.gen.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.unittest.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.components/languages/com.mbeddr.ext.components/com.mbeddr.ext.components.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.SmInComp/languages/com.mbeddr.ext.statemachineInComponents/com.mbeddr.ext.components.statemachine.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.statemachine/languages/com.mbeddr.ext.statemachine/com.mbeddr.ext.statemachines.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.filepicker/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -1505,7 +1527,7 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2-sources.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/lib/diff_match_patch.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-multiline/lib/diff_match_patch.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -1514,19 +1536,19 @@
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.blext.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.rt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.blext.runtime.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.rt.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/mbeddr.arduino.platform">
@@ -1572,7 +1594,7 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2-sources.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/lib/diff_match_patch.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-multiline/lib/diff_match_patch.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -1581,19 +1603,19 @@
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.blext.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.rt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.blext.runtime.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.rt.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual/com.mbeddr.mpsutil.multilingual.common.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.review.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.spreferences/com.mbeddr.mpsutil.spreferences.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-multiline/languages/mps-multiline/de.slisson.mps.editor.multiline.runtime.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/mbeddr.arduino.header">
@@ -1643,26 +1665,27 @@
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.runconfiguration.pluginSolution.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allInOne/com.mbeddr.allInOne.zip/plugins/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.platform/languages/com.mbeddr.platform/com.mbeddr.core.base.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.buildconfig.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.debugger/languages/com.mbeddr.core.debugger/com.mbeddr.core.debug.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.embedded.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.make.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.modules.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.pointers.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.runconfiguration.pluginSolution.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.statements.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.udt.jar" />
+        <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.util.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.filepicker/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.plantuml/com.mbeddr.mpsutil.plantuml.node.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.suppresswarning/com.mbeddr.mpsutil.suppresswarning.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/mps-richtext/languages/mps-richtext/de.slisson.mps.richtext.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -1689,12 +1712,12 @@
     <delete dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/solutions/pluginSolution/source_gen" />
     <delete dir="${mbeddr.arduino}/solutions/mbeddr.arduino.header/source_gen" />
     <delete dir="${mbeddr.arduino}/languages/mbeddr.arduino.interrupts/source_gen" />
-    <delete dir="${mbeddr.arduino}/solutions/mbeddr.arduino.platform/source_gen" />
     <delete dir="${mbeddr.arduino}/languages/mbeddr.arduino.registers/source_gen" />
-    <delete dir="${mbeddr.arduino}/languages/mbeddr.arduino.registers/generator/source_gen" />
-    <delete dir="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine/source_gen" />
     <delete dir="${mbeddr.arduino}/languages/mbeddr.arduino.core/generator/source_gen" />
     <delete dir="${mbeddr.arduino}/languages/mbeddr.arduino.interrupts/generator/source_gen" />
+    <delete dir="${mbeddr.arduino}/solutions/mbeddr.arduino.platform/source_gen" />
+    <delete dir="${mbeddr.arduino}/languages/mbeddr.arduino.registers/generator/source_gen" />
+    <delete dir="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine/source_gen" />
     <delete dir="${mbeddr.arduino}/languages/mbeddr.arduino.statemachine/generator/source_gen" />
   </target>
 </project>
\ No newline at end of file
diff --git a/solutions/mbeddr.arduino.build/models/mbeddr/arduino/build/build.mps b/solutions/mbeddr.arduino.build/models/mbeddr/arduino/build/build.mps
index 6f76a5e..3982e4b 100644
--- a/solutions/mbeddr.arduino.build/models/mbeddr/arduino/build/build.mps
+++ b/solutions/mbeddr.arduino.build/models/mbeddr/arduino/build/build.mps
@@ -744,7 +744,7 @@
       </node>
     </node>
     <node concept="2sgV4H" id="3FxUZ7LXIC" role="1l3spa">
-      <ref role="1l3spb" to="xsd6:5qO$P$PtiTw" resolve="com.mbeddr.allInOne" />
+      <ref role="1l3spb" to="p6ld:4i9pOwKTFVe" resolve="mbeddr" />
       <node concept="398BVA" id="3FxUZ7LXKu" role="2JcizS">
         <ref role="398BVh" node="6RmoJr9fU4_" resolve="mbeddr.artifacts" />
       </node>
@@ -804,15 +804,12 @@
     <node concept="398rNT" id="3$3J06WftAg" role="1l3spd">
       <property role="TrG5h" value="mbeddr.github.core.home" />
       <node concept="55IIr" id="3$3J06WftAh" role="398pKh">
-        <node concept="2Ry0Ak" id="3$3J06WftAi" role="iGT6I">
+        <node concept="2Ry0Ak" id="5u54i_o0AL5" role="iGT6I">
           <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="1zgurskwH3Z" role="2Ry0An">
+          <node concept="2Ry0Ak" id="5u54i_o0ANw" role="2Ry0An">
             <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="1zgurskwH43" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="2Q0Qr$5O8t6" role="2Ry0An">
-                <property role="2Ry0Am" value="mbeddr.core" />
-              </node>
+            <node concept="2Ry0Ak" id="5u54i_o0AQ6" role="2Ry0An">
+              <property role="2Ry0Am" value="mbeddr.core-34" />
             </node>
           </node>
         </node>
@@ -820,13 +817,19 @@
     </node>
     <node concept="398rNT" id="3$3J06WftFk" role="1l3spd">
       <property role="TrG5h" value="artifacts.root" />
+      <node concept="398BVA" id="5u54i_o0ARG" role="398pKh">
+        <ref role="398BVh" node="3$3J06WftAg" resolve="mbeddr.github.core.home" />
+        <node concept="2Ry0Ak" id="5u54i_o0AU7" role="iGT6I">
+          <property role="2Ry0Am" value="artifacts" />
+        </node>
+      </node>
     </node>
     <node concept="398rNT" id="6RmoJr9fU4_" role="1l3spd">
       <property role="TrG5h" value="mbeddr.artifacts" />
       <node concept="398BVA" id="6RmoJr9fVf4" role="398pKh">
         <ref role="398BVh" node="3$3J06WftFk" resolve="artifacts.root" />
-        <node concept="2Ry0Ak" id="6RmoJr9fVf6" role="iGT6I">
-          <property role="2Ry0Am" value="com.mbeddr.allInOne" />
+        <node concept="2Ry0Ak" id="5u54i_o0AVK" role="iGT6I">
+          <property role="2Ry0Am" value="mbeddr" />
         </node>
       </node>
     </node>

From 19bf638d04160fa460a15956198335eee79d1f41 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Sat, 4 Feb 2017 14:21:16 +0100
Subject: [PATCH 47/48] build: add project lib generation

---
 .mps/libraries.xml                            | 30 +++++++++-------
 build.gradle                                  | 35 ++-----------------
 projectlibraries.properties                   |  4 ++-
 .../mbeddr.arduino.build.msd                  |  2 --
 .../models/mbeddr/arduino/build/build.mps     |  1 -
 5 files changed, 23 insertions(+), 49 deletions(-)

diff --git a/.mps/libraries.xml b/.mps/libraries.xml
index f74c916..f1c8052 100644
--- a/.mps/libraries.xml
+++ b/.mps/libraries.xml
@@ -1,26 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectLibraryManager">
-    <option name="libraries">
+<project version='4'>
+  <component name='ProjectLibraryManager'>
+    <option name='libraries'>
       <map>
-        <entry key="mbeddr">
+        <entry key='mbeddr.scripts'>
           <value>
             <Library>
-              <option name="name" value="mbeddr" />
-              <option name="path" value="${mbeddr.github.core.home}/code/languages" />
+              <option name='name' value='mbeddr.scripts' />
+              <option name='path' value='$PROJECT_DIR$/gradle/build/artifacts/com.mbeddr.allScripts.build' />
             </Library>
           </value>
         </entry>
-        <entry key="sl-all">
+        <entry key='mbeddr.platform'>
           <value>
             <Library>
-              <option name="name" value="sl-all" />
-              <option name="path" value="${mbeddr.github.core.home}/code/plugins" />
+              <option name='name' value='mbeddr.platform' />
+              <option name='path' value='$PROJECT_DIR$/gradle/build/artifacts/com.mbeddr.platform' />
+            </Library>
+          </value>
+        </entry>
+        <entry key='mbeddr'>
+          <value>
+            <Library>
+              <option name='name' value='mbeddr' />
+              <option name='path' value='$PROJECT_DIR$/gradle/build/artifacts/mbeddr' />
             </Library>
           </value>
         </entry>
       </map>
     </option>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 5640fa2..be15383 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,6 @@ if (project.hasProperty('projectVersion')) {
 // Dependency versions
 ext.mpsVersion = '3.4.3'
 ext.mbeddrVersion = '1.0.+'
-ext.iets3Version = '0.1.+'
 
 // Default repository credentials
 if (!project.hasProperty('nexusUsername')) {
@@ -99,36 +98,6 @@ task resolveMpsArtifacts(type: Copy) {
     doFirst { delete artifactsDir }
 }
 
-task resolveProjectLibraries {
-    description "Downloads dependencies, unzips them, unzips the zips inside, and puts them into $projectLibrariesDir"
-    dependsOn resolveMpsArtifacts
-    File inputDir = resolveMpsArtifacts.destinationDir
-    File outputDir = projectLibrariesDir
-    inputs.dir inputDir
-    outputs.dir projectLibrariesDir
-
-    doFirst { delete projectLibrariesDir }
-    doLast {
-        fileTree(inputDir).visit new EmptyFileVisitor() {
-            @Override
-            void visitFile(FileVisitDetails f) {
-                def outputName = f.relativePath.getFile(outputDir)
-                if (f.name.endsWith('.zip')) {
-                    copy {
-                        from zipTree(f.file)
-                        into outputName
-                    }
-                } else {
-                    copy {
-                        from f.file
-                        into outputName.parent
-                    }
-                }
-            }
-        }
-    }
-}
-
 task generateLibrariesXml {
     def defaultsFile = file('projectlibraries.properties')
     def overridesFile = file('projectlibraries.overrides.properties')
@@ -172,8 +141,8 @@ task generateLibrariesXml {
 
 task setup {
     // We resolve MPS not for the users to use it but for the distribution packaging script to be able to refer to it.
-    dependsOn resolveMps
-    dependsOn resolveProjectLibraries, generateLibrariesXml
+    dependsOn resolveMps, resolveMpsArtifacts
+    dependsOn generateLibrariesXml
     description 'Set up MPS project libraries'
 }
 
diff --git a/projectlibraries.properties b/projectlibraries.properties
index 38b0239..62e6333 100644
--- a/projectlibraries.properties
+++ b/projectlibraries.properties
@@ -1,2 +1,4 @@
 # To override values defined in this file create projectlibraries.overrides.properties and put overridden values there.
-mbeddr=${martian.home}/gradle/build/project-libraries/com.mbeddr.platform.distribution
+mbeddr=$PROJECT_DIR$/gradle/build/artifacts/mbeddr
+mbeddr.platform=$PROJECT_DIR$/gradle/build/artifacts/com.mbeddr.platform
+mbeddr.scripts=$PROJECT_DIR$/gradle/build/artifacts/com.mbeddr.allScripts.build
diff --git a/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd b/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd
index 784dd88..bbbe076 100755
--- a/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd
+++ b/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd
@@ -11,7 +11,6 @@
     <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
     <dependency reexport="false">7ac0dfb8-7d5f-4573-ab80-81af2106ce03(com.mbeddr.build)</dependency>
     <dependency reexport="false">3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)</dependency>
-    <dependency reexport="false">cbbb9e79-84e5-4c2e-b1a2-11a381c7baf9(com.mbeddr.allInOne)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
@@ -23,7 +22,6 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
-    <module reference="cbbb9e79-84e5-4c2e-b1a2-11a381c7baf9(com.mbeddr.allInOne)" version="0" />
     <module reference="7ac0dfb8-7d5f-4573-ab80-81af2106ce03(com.mbeddr.build)" version="0" />
     <module reference="3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)" version="0" />
     <module reference="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.slisson.mps.all.build)" version="0" />
diff --git a/solutions/mbeddr.arduino.build/models/mbeddr/arduino/build/build.mps b/solutions/mbeddr.arduino.build/models/mbeddr/arduino/build/build.mps
index 3982e4b..e5a04f7 100644
--- a/solutions/mbeddr.arduino.build/models/mbeddr/arduino/build/build.mps
+++ b/solutions/mbeddr.arduino.build/models/mbeddr/arduino/build/build.mps
@@ -10,7 +10,6 @@
     <import index="90a9" ref="r:fb24ac52-5985-4947-bba9-25be6fd32c1a(de.slisson.mps.all.build)" />
     <import index="p6ld" ref="r:0764bd79-eef9-46f0-a6fe-739a07a30bb2(com.mbeddr.build.build)" />
     <import index="al5i" ref="r:742f344d-4dc4-4862-992c-4bc94b094870(com.mbeddr.mpsutil.dev.build)" />
-    <import index="xsd6" ref="r:ca2b582e-fdcb-4767-9d74-cf61b47911f2(com.mbeddr.allInOne)" />
   </imports>
   <registry>
     <language id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build">

From 95c1191945d538b58a34535f1f9db1186a92dfd0 Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Fri, 21 Jul 2017 14:03:42 +0200
Subject: [PATCH 48/48] update to latest mbeddr

---
 build.gradle         |  2 +-
 build/allScripts.xml | 21 +++++++++------------
 build/build.xml      | 25 ++++++++++++++-----------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/build.gradle b/build.gradle
index be15383..281d153 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ if (project.hasProperty('projectVersion')) {
 
 // Dependency versions
 ext.mpsVersion = '3.4.3'
-ext.mbeddrVersion = '1.0.+'
+ext.mbeddrVersion = 'maintenance-mps34.1.0.17905.d048a69'
 
 // Default repository credentials
 if (!project.hasProperty('nexusUsername')) {
diff --git a/build/allScripts.xml b/build/allScripts.xml
index 04c4094..5625dd0 100644
--- a/build/allScripts.xml
+++ b/build/allScripts.xml
@@ -39,10 +39,7 @@
   
   <target name="buildDependents" />
   
-  <target name="fetchDependencies">
-    <mkdir dir="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip" />
-    <unzip src="http://github.com/$%7Bartifacts.com.mbeddr.allScripts.build%7D/com.mbeddr.allScripts.zip" dest="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip" />
-  </target>
+  <target name="fetchDependencies" />
   
   <target name="build" depends="assemble" />
   
@@ -64,6 +61,10 @@
   <target name="generate" depends="declare-mps-tasks, fetchDependencies">
     <echo message="generating" />
     <generate strictMode="true" parallelMode="true" parallelThreads="4" useInplaceTransform="true" hideWarnings="false" createStaticRefs="true" fork="true" targetJavaVersion="1.8">
+      <library file="${artifacts.com.mbeddr.allScripts.build}/mbeddr.allScripts/languages/com.mbeddr.allInOne.jar" />
+      <library file="${artifacts.com.mbeddr.allScripts.build}/mbeddr.allScripts/languages/com.mbeddr.build.jar" />
+      <library file="${artifacts.com.mbeddr.allScripts.build}/mbeddr.allScripts/languages/de.slisson.mps.all.build.jar" />
+      <library file="${artifacts.com.mbeddr.allScripts.build}/mbeddr.allScripts/languages/mbeddr-platform/com.mbeddr.platform.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -131,10 +132,6 @@
       <library file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.workflow.preset.jar" />
       <library file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.ide.build.jar" />
       <library file="${artifacts.mps}/plugins/mps-core/languages/util/jetbrains.mps.core.properties.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip/mbeddr.allScripts/languages/com.mbeddr.allInOne.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip/mbeddr.allScripts/languages/com.mbeddr.build.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip/mbeddr.allScripts/languages/de.slisson.mps.all.build.jar" />
-      <library file="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip/mbeddr.allScripts/languages/mbeddr-platform/com.mbeddr.platform.jar" />
       <chunk>
         <module file="${mbeddr.arduino}/solutions/mbeddr.arduino.build/mbeddr.arduino.build.msd" />
       </chunk>
@@ -163,10 +160,10 @@
         <path location="${mbeddr.arduino}/solutions/mbeddr.arduino.build/source_gen" />
       </src>
       <classpath>
-        <fileset file="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip/mbeddr.allScripts/languages/com.mbeddr.allInOne.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip/mbeddr.allScripts/languages/com.mbeddr.build.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip/mbeddr.allScripts/languages/mbeddr-platform/com.mbeddr.platform.jar" />
-        <fileset file="${build.tmp}/deps/com.mbeddr.allScripts.build/com.mbeddr.allScripts.zip/mbeddr.allScripts/languages/de.slisson.mps.all.build.jar" />
+        <fileset file="${artifacts.com.mbeddr.allScripts.build}/mbeddr.allScripts/languages/com.mbeddr.allInOne.jar" />
+        <fileset file="${artifacts.com.mbeddr.allScripts.build}/mbeddr.allScripts/languages/com.mbeddr.build.jar" />
+        <fileset file="${artifacts.com.mbeddr.allScripts.build}/mbeddr.allScripts/languages/mbeddr-platform/com.mbeddr.platform.jar" />
+        <fileset file="${artifacts.com.mbeddr.allScripts.build}/mbeddr.allScripts/languages/de.slisson.mps.all.build.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/mbeddr.arduino.build">
diff --git a/build/build.xml b/build/build.xml
index aaa8eb7..f106cce 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -496,7 +496,10 @@
   <target name="generate" depends="declare-mps-tasks, fetchDependencies">
     <echo message="generating" />
     <generate strictMode="true" parallelMode="true" parallelThreads="4" useInplaceTransform="true" hideWarnings="false" createStaticRefs="true" fork="true" targetJavaVersion="1.8">
+      <plugin path="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.common" />
       <plugin path="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.filepicker" />
+      <plugin path="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.grammarcells" />
+      <plugin path="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.smodule" />
       <plugin path="${artifacts.com.mbeddr.platform}/de-itemis-mps-selection" />
       <plugin path="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout" />
       <plugin path="${artifacts.com.mbeddr.platform}/de.itemis.mps.editor.diagram" />
@@ -529,7 +532,11 @@
       <plugin path="${artifacts.mps}/plugins/mps-execution-languages" />
       <plugin path="${artifacts.mps}/plugins/mps-make" />
       <plugin path="${artifacts.mps}/plugins/mps-testing" />
+      <library file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.common/languages/group.common/com.mbeddr.mpsutil.common.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.editor.querylist/languages/group.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
       <library file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.filepicker/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.grammarcells/languages/group.grammarcells/com.mbeddr.mpsutil.grammarcells.runtime.jar" />
+      <library file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.grammarcells/languages/group.grammarcells/com.mbeddr.mpsutil.grammarcells.runtimelang.jar" />
       <library file="${artifacts.com.mbeddr.platform}/de-itemis-mps-selection/languages/de.itemis.mps.selection/de.itemis.mps.selection.runtime.jar" />
       <library file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.jar" />
       <library file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
@@ -547,7 +554,6 @@
       <library file="${artifacts.com.mbeddr.platform}/de.slisson.mps.conditionalEditor/languages/de.slisson.mps.conditionalEditor/de.slisson.mps.conditionalEditor.runtime.jar" />
       <library file="${artifacts.com.mbeddr.platform}/de.slisson.mps.hacks/languages/de.slisson.mps.hacks/de.slisson.mps.hacks.editor.jar" />
       <library file="${artifacts.com.mbeddr.platform}/de.slisson.mps.hacks/languages/de.slisson.mps.hacks/de.slisson.mps.reflection.runtime.jar" />
-      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.baseLanguage/com.mbeddr.mpsutil.common.jar" />
       <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.jar" />
       <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
       <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
@@ -558,10 +564,7 @@
       <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/com.mbeddr.mpsutil.dataflow.jar" />
       <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dataflow/com.mbeddr.mpsutil.dataflow.runtime.jar" />
       <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
-      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
       <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.gen-support/com.mbeddr.mpsutil.genutil.jar" />
-      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells/com.mbeddr.mpsutil.grammarcells.runtime.jar" />
-      <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells/com.mbeddr.mpsutil.grammarcells.runtimelang.jar" />
       <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/com.mbeddr.mpsutil.httpsupport.rt.jar" />
       <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.infrastructure-support/com.mbeddr.mpsutil.nodeaccess.jar" />
       <library file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.infrastructure-support/com.mbeddr.mpsutil.serializer.xml.jar" />
@@ -817,7 +820,7 @@
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
-        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.editor.querylist/languages/group.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.filepicker/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.rt.jar" />
@@ -932,7 +935,7 @@
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
-        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.editor.querylist/languages/group.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.filepicker/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.rt.jar" />
@@ -1101,7 +1104,7 @@
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
-        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.editor.querylist/languages/group.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.filepicker/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
@@ -1267,7 +1270,7 @@
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
-        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.editor.querylist/languages/group.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.filepicker/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
@@ -1455,7 +1458,7 @@
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
-        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.editor.querylist/languages/group.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.filepicker/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/com.mbeddr.mpsutil.jung.jar" />
@@ -1540,7 +1543,7 @@
         <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
-        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.editor.querylist/languages/group.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.rt.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.runtime.jar" />
@@ -1607,7 +1610,7 @@
         <fileset file="${artifacts.mbeddr}/mbeddr.core/languages/com.mbeddr.core/com.mbeddr.core.expressions.runtime.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.rt.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.breadcrumb/com.mbeddr.mpsutil.breadcrumb.runtime.jar" />
-        <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
+        <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.mpsutil.editor.querylist/languages/group.editor.querylist/com.mbeddr.mpsutil.editor.querylist.runtime.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor-support/com.mbeddr.mpsutil.editor.utils.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.rt.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/mbeddr.mpsutil/languages/com.mbeddr.mpsutil.margincell_review/com.mbeddr.mpsutil.margincell.runtime.jar" />