diff --git a/build.xml b/build.xml
index c3472d13..48c5c010 100644
--- a/build.xml
+++ b/build.xml
@@ -104,12 +104,11 @@
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
         </dependencies>
         <library jar="../lib/memreactor-core-0.1.jar" />
-        <library jar="../lib/dexx-collections-0.2.jar" />
-        <library jar="../lib/google-collections-1.0.jar" />
-        <library jar="../lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <library jar="../lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <library jar="../lib/unification-lib-1.0.2.jar" />
         <library jar="../lib/memreactor-api-0.1.jar" />
+        <library jar="../lib/kotlin-stdlib-1.0.5.jar" />
+        <library jar="../lib/kotlin-runtime-1.0.5.jar" />
+        <library jar="../lib/collection-0.6.jar" />
         <sources jar="jetbrains.mps.logic.reactor-src.jar" descriptor="jetbrains.mps.logic.reactor.msd" />
       </module>
     </echoxml>
@@ -658,12 +657,11 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -713,12 +711,11 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -761,12 +758,11 @@
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -800,12 +796,11 @@
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -850,12 +845,11 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -918,12 +912,11 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -981,12 +974,11 @@
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1044,12 +1036,11 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1100,12 +1091,11 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -1198,12 +1188,11 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1257,12 +1246,11 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1319,12 +1307,11 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1365,12 +1352,11 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
diff --git a/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd b/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
index 7cf97cd2..0052c135 100644
--- a/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
+++ b/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
@@ -12,12 +12,11 @@
   </models>
   <stubModelEntries>
     <stubModelEntry path="${module}/lib/memreactor-core-0.1.jar" />
-    <stubModelEntry path="${module}/lib/dexx-collections-0.2.jar" />
-    <stubModelEntry path="${module}/lib/google-collections-1.0.jar" />
-    <stubModelEntry path="${module}/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-    <stubModelEntry path="${module}/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
     <stubModelEntry path="${module}/lib/unification-lib-1.0.2.jar" />
     <stubModelEntry path="${module}/lib/memreactor-api-0.1.jar" />
+    <stubModelEntry path="${module}/lib/kotlin-stdlib-1.0.5.jar" />
+    <stubModelEntry path="${module}/lib/kotlin-runtime-1.0.5.jar" />
+    <stubModelEntry path="${module}/lib/collection-0.6.jar" />
   </stubModelEntries>
   <sourcePath />
   <dependencies>
diff --git a/test.xml b/test.xml
index 8452b44b..88d42882 100644
--- a/test.xml
+++ b/test.xml
@@ -678,12 +678,11 @@
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
         </dependencies>
         <library jar="lib/memreactor-core-0.1.jar" />
-        <library jar="lib/dexx-collections-0.2.jar" />
-        <library jar="lib/google-collections-1.0.jar" />
-        <library jar="lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <library jar="lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <library jar="lib/unification-lib-1.0.2.jar" />
         <library jar="lib/memreactor-api-0.1.jar" />
+        <library jar="lib/kotlin-stdlib-1.0.5.jar" />
+        <library jar="lib/kotlin-runtime-1.0.5.jar" />
+        <library jar="lib/collection-0.6.jar" />
         <sources jar="jetbrains.mps.logic.reactor-src.jar" descriptor="jetbrains.mps.logic.reactor.msd" />
       </module>
     </echoxml>
@@ -947,12 +946,11 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1002,12 +1000,11 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1050,12 +1047,11 @@
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1089,12 +1085,11 @@
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -1135,12 +1130,11 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
@@ -1205,12 +1199,11 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
@@ -1274,12 +1267,11 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1342,12 +1334,11 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1405,12 +1396,11 @@
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1468,12 +1458,11 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1524,12 +1513,11 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -1618,12 +1606,11 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
@@ -1679,12 +1666,11 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1725,12 +1711,11 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1877,12 +1862,11 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1992,12 +1976,11 @@
         <fileset file="${artifacts.mps}/lib/mps-test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.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" />
@@ -2073,12 +2056,11 @@
         <fileset file="${artifacts.mps}/lib/mps-test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.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" />
@@ -2154,12 +2136,11 @@
         <fileset file="${artifacts.mps}/lib/mps-test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-api-0.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.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" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps
index c12d6514..c2ff26f1 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps
@@ -458,90 +458,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="7BVjoXzUxVD" role="3bR37C">
-          <node concept="1BurEX" id="7BVjoXzUxVE" role="1SiIV1">
-            <node concept="55IIr" id="7BVjoXzUxVz" role="1BurEY">
-              <node concept="2Ry0Ak" id="7BVjoXzUxV$" role="iGT6I">
-                <property role="2Ry0Am" value="logic" />
-                <node concept="2Ry0Ak" id="7BVjoXzUxV_" role="2Ry0An">
-                  <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="7BVjoXzUxVA" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
-                    <node concept="2Ry0Ak" id="7BVjoXzUxVB" role="2Ry0An">
-                      <property role="2Ry0Am" value="lib" />
-                      <node concept="2Ry0Ak" id="7BVjoXzUxVC" role="2Ry0An">
-                        <property role="2Ry0Am" value="dexx-collections-0.2.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxVL" role="3bR37C">
-          <node concept="1BurEX" id="7BVjoXzUxVM" role="1SiIV1">
-            <node concept="55IIr" id="7BVjoXzUxVF" role="1BurEY">
-              <node concept="2Ry0Ak" id="7BVjoXzUxVG" role="iGT6I">
-                <property role="2Ry0Am" value="logic" />
-                <node concept="2Ry0Ak" id="7BVjoXzUxVH" role="2Ry0An">
-                  <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="7BVjoXzUxVI" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
-                    <node concept="2Ry0Ak" id="7BVjoXzUxVJ" role="2Ry0An">
-                      <property role="2Ry0Am" value="lib" />
-                      <node concept="2Ry0Ak" id="7BVjoXzUxVK" role="2Ry0An">
-                        <property role="2Ry0Am" value="google-collections-1.0.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxVT" role="3bR37C">
-          <node concept="1BurEX" id="7BVjoXzUxVU" role="1SiIV1">
-            <node concept="55IIr" id="7BVjoXzUxVN" role="1BurEY">
-              <node concept="2Ry0Ak" id="7BVjoXzUxVO" role="iGT6I">
-                <property role="2Ry0Am" value="logic" />
-                <node concept="2Ry0Ak" id="7BVjoXzUxVP" role="2Ry0An">
-                  <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="7BVjoXzUxVQ" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
-                    <node concept="2Ry0Ak" id="7BVjoXzUxVR" role="2Ry0An">
-                      <property role="2Ry0Am" value="lib" />
-                      <node concept="2Ry0Ak" id="7BVjoXzUxVS" role="2Ry0An">
-                        <property role="2Ry0Am" value="kotlin-runtime-1.0.0-rc-1050.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxW1" role="3bR37C">
-          <node concept="1BurEX" id="7BVjoXzUxW2" role="1SiIV1">
-            <node concept="55IIr" id="7BVjoXzUxVV" role="1BurEY">
-              <node concept="2Ry0Ak" id="7BVjoXzUxVW" role="iGT6I">
-                <property role="2Ry0Am" value="logic" />
-                <node concept="2Ry0Ak" id="7BVjoXzUxVX" role="2Ry0An">
-                  <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="7BVjoXzUxVY" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
-                    <node concept="2Ry0Ak" id="7BVjoXzUxVZ" role="2Ry0An">
-                      <property role="2Ry0Am" value="lib" />
-                      <node concept="2Ry0Ak" id="7BVjoXzUxW0" role="2Ry0An">
-                        <property role="2Ry0Am" value="kotlin-stdlib-1.0.0-rc-1050.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1SiIV0" id="1xxR4J9fX3K" role="3bR37C">
           <node concept="1BurEX" id="1xxR4J9fX3L" role="1SiIV1">
             <node concept="55IIr" id="1xxR4J9fX3E" role="1BurEY">
@@ -584,6 +500,69 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4ZcizIaeAbD" role="3bR37C">
+          <node concept="1BurEX" id="4ZcizIaeAbE" role="1SiIV1">
+            <node concept="55IIr" id="4ZcizIaeAbz" role="1BurEY">
+              <node concept="2Ry0Ak" id="4ZcizIaeAb$" role="iGT6I">
+                <property role="2Ry0Am" value="logic" />
+                <node concept="2Ry0Ak" id="4ZcizIaeAb_" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="4ZcizIaeAbA" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
+                    <node concept="2Ry0Ak" id="4ZcizIaeAbB" role="2Ry0An">
+                      <property role="2Ry0Am" value="lib" />
+                      <node concept="2Ry0Ak" id="4ZcizIaeAbC" role="2Ry0An">
+                        <property role="2Ry0Am" value="kotlin-stdlib-1.0.5.jar" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4ZcizIaeAbL" role="3bR37C">
+          <node concept="1BurEX" id="4ZcizIaeAbM" role="1SiIV1">
+            <node concept="55IIr" id="4ZcizIaeAbF" role="1BurEY">
+              <node concept="2Ry0Ak" id="4ZcizIaeAbG" role="iGT6I">
+                <property role="2Ry0Am" value="logic" />
+                <node concept="2Ry0Ak" id="4ZcizIaeAbH" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="4ZcizIaeAbI" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
+                    <node concept="2Ry0Ak" id="4ZcizIaeAbJ" role="2Ry0An">
+                      <property role="2Ry0Am" value="lib" />
+                      <node concept="2Ry0Ak" id="4ZcizIaeAbK" role="2Ry0An">
+                        <property role="2Ry0Am" value="kotlin-runtime-1.0.5.jar" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4ZcizIamBM8" role="3bR37C">
+          <node concept="1BurEX" id="4ZcizIamBM9" role="1SiIV1">
+            <node concept="55IIr" id="4ZcizIamBM2" role="1BurEY">
+              <node concept="2Ry0Ak" id="4ZcizIamBM3" role="iGT6I">
+                <property role="2Ry0Am" value="logic" />
+                <node concept="2Ry0Ak" id="4ZcizIamBM4" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="4ZcizIamBM5" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
+                    <node concept="2Ry0Ak" id="4ZcizIamBM6" role="2Ry0An">
+                      <property role="2Ry0Am" value="lib" />
+                      <node concept="2Ry0Ak" id="4ZcizIamBM7" role="2Ry0An">
+                        <property role="2Ry0Am" value="collection-0.6.jar" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7BVjoXzUx6$" role="3989C9">
@@ -1661,94 +1640,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="46o4wsH3mLq" role="3bR37C">
-          <node concept="1BurEX" id="46o4wsH3mLr" role="1SiIV1">
-            <node concept="398BVA" id="46o4wsH3mLe" role="1BurEY">
-              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
-              <node concept="2Ry0Ak" id="46o4wsH3mLf" role="iGT6I">
-                <property role="2Ry0Am" value="logic" />
-                <node concept="2Ry0Ak" id="46o4wsH3mLg" role="2Ry0An">
-                  <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="46o4wsH3mLh" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
-                    <node concept="2Ry0Ak" id="46o4wsH3mLi" role="2Ry0An">
-                      <property role="2Ry0Am" value="lib" />
-                      <node concept="2Ry0Ak" id="46o4wsH3mLj" role="2Ry0An">
-                        <property role="2Ry0Am" value="dexx-collections-0.2.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="46o4wsH3mLC" role="3bR37C">
-          <node concept="1BurEX" id="46o4wsH3mLD" role="1SiIV1">
-            <node concept="398BVA" id="46o4wsH3mLs" role="1BurEY">
-              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
-              <node concept="2Ry0Ak" id="46o4wsH3mLt" role="iGT6I">
-                <property role="2Ry0Am" value="logic" />
-                <node concept="2Ry0Ak" id="46o4wsH3mLu" role="2Ry0An">
-                  <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="46o4wsH3mLv" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
-                    <node concept="2Ry0Ak" id="46o4wsH3mLw" role="2Ry0An">
-                      <property role="2Ry0Am" value="lib" />
-                      <node concept="2Ry0Ak" id="46o4wsH3mLx" role="2Ry0An">
-                        <property role="2Ry0Am" value="google-collections-1.0.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="46o4wsH3mLQ" role="3bR37C">
-          <node concept="1BurEX" id="46o4wsH3mLR" role="1SiIV1">
-            <node concept="398BVA" id="46o4wsH3mLE" role="1BurEY">
-              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
-              <node concept="2Ry0Ak" id="46o4wsH3mLF" role="iGT6I">
-                <property role="2Ry0Am" value="logic" />
-                <node concept="2Ry0Ak" id="46o4wsH3mLG" role="2Ry0An">
-                  <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="46o4wsH3mLH" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
-                    <node concept="2Ry0Ak" id="46o4wsH3mLI" role="2Ry0An">
-                      <property role="2Ry0Am" value="lib" />
-                      <node concept="2Ry0Ak" id="46o4wsH3mLJ" role="2Ry0An">
-                        <property role="2Ry0Am" value="kotlin-runtime-1.0.0-rc-1050.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="46o4wsH3mM4" role="3bR37C">
-          <node concept="1BurEX" id="46o4wsH3mM5" role="1SiIV1">
-            <node concept="398BVA" id="46o4wsH3mLS" role="1BurEY">
-              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
-              <node concept="2Ry0Ak" id="46o4wsH3mLT" role="iGT6I">
-                <property role="2Ry0Am" value="logic" />
-                <node concept="2Ry0Ak" id="46o4wsH3mLU" role="2Ry0An">
-                  <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="46o4wsH3mLV" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
-                    <node concept="2Ry0Ak" id="46o4wsH3mLW" role="2Ry0An">
-                      <property role="2Ry0Am" value="lib" />
-                      <node concept="2Ry0Ak" id="46o4wsH3mLX" role="2Ry0An">
-                        <property role="2Ry0Am" value="kotlin-stdlib-1.0.0-rc-1050.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1SiIV0" id="46o4wsH3mMi" role="3bR37C">
           <node concept="1BurEX" id="46o4wsH3mMj" role="1SiIV1">
             <node concept="398BVA" id="46o4wsH3mM6" role="1BurEY">
@@ -1793,6 +1684,72 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4ZcizIaeAma" role="3bR37C">
+          <node concept="1BurEX" id="4ZcizIaeAmb" role="1SiIV1">
+            <node concept="398BVA" id="4ZcizIaeAlY" role="1BurEY">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
+              <node concept="2Ry0Ak" id="4ZcizIaeAlZ" role="iGT6I">
+                <property role="2Ry0Am" value="logic" />
+                <node concept="2Ry0Ak" id="4ZcizIaeAm0" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="4ZcizIaeAm1" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
+                    <node concept="2Ry0Ak" id="4ZcizIaeAm2" role="2Ry0An">
+                      <property role="2Ry0Am" value="lib" />
+                      <node concept="2Ry0Ak" id="4ZcizIaeAm3" role="2Ry0An">
+                        <property role="2Ry0Am" value="kotlin-stdlib-1.0.5.jar" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4ZcizIaeAmo" role="3bR37C">
+          <node concept="1BurEX" id="4ZcizIaeAmp" role="1SiIV1">
+            <node concept="398BVA" id="4ZcizIaeAmc" role="1BurEY">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
+              <node concept="2Ry0Ak" id="4ZcizIaeAmd" role="iGT6I">
+                <property role="2Ry0Am" value="logic" />
+                <node concept="2Ry0Ak" id="4ZcizIaeAme" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="4ZcizIaeAmf" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
+                    <node concept="2Ry0Ak" id="4ZcizIaeAmg" role="2Ry0An">
+                      <property role="2Ry0Am" value="lib" />
+                      <node concept="2Ry0Ak" id="4ZcizIaeAmh" role="2Ry0An">
+                        <property role="2Ry0Am" value="kotlin-runtime-1.0.5.jar" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4ZcizIamBUD" role="3bR37C">
+          <node concept="1BurEX" id="4ZcizIamBUE" role="1SiIV1">
+            <node concept="398BVA" id="4ZcizIamBUt" role="1BurEY">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
+              <node concept="2Ry0Ak" id="4ZcizIamBUu" role="iGT6I">
+                <property role="2Ry0Am" value="logic" />
+                <node concept="2Ry0Ak" id="4ZcizIamBUv" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="4ZcizIamBUw" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
+                    <node concept="2Ry0Ak" id="4ZcizIamBUx" role="2Ry0An">
+                      <property role="2Ry0Am" value="lib" />
+                      <node concept="2Ry0Ak" id="4ZcizIamBUy" role="2Ry0An">
+                        <property role="2Ry0Am" value="collection-0.6.jar" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7Ant4WkHLpc" role="3989C9">