diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
index 239aa50648..7dfa08ee8f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
@@ -1063,7 +1063,7 @@
                         <ref role="2Gs0qQ" node="7LqGxA8CNoB" resolve="module" />
                       </node>
                       <node concept="37vLTw" id="7LqGxA8GccU" role="37wK5m">
-                        <ref role="3cqZAo" node="7LqGxA8Fasb" resolve="bufferMultimap" />
+                        <ref role="3cqZAo" node="7LqGxA8Fasb" resolve="owner2childen" />
                       </node>
                     </node>
                   </node>
@@ -1072,7 +1072,7 @@
               <node concept="3clFbC" id="7LqGxA8FYae" role="3clFbw">
                 <node concept="10Nm6u" id="7LqGxA8FYE4" role="3uHU7w" />
                 <node concept="37vLTw" id="7LqGxA8FX_R" role="3uHU7B">
-                  <ref role="3cqZAo" node="7LqGxA8Fasb" resolve="bufferMultimap" />
+                  <ref role="3cqZAo" node="7LqGxA8Fasb" resolve="owner2childen" />
                 </node>
               </node>
             </node>
@@ -1156,7 +1156,7 @@
                               <node concept="3clFbF" id="7LqGxA8Fdip" role="3cqZAp">
                                 <node concept="2OqwBi" id="7LqGxA8FdSO" role="3clFbG">
                                   <node concept="37vLTw" id="7LqGxA8Fdio" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7LqGxA8Fasb" resolve="bufferMultimap" />
+                                    <ref role="3cqZAo" node="7LqGxA8Fasb" resolve="owner2childen" />
                                   </node>
                                   <node concept="liA8E" id="7LqGxA8FeHR" role="2OqNvi">
                                     <ref role="37wK5l" to="3o3z:~Multimap.put(java.lang.Object,java.lang.Object)" resolve="put" />
@@ -1223,7 +1223,7 @@
               </node>
             </node>
             <node concept="2YIFZM" id="6aYyEt1Fp7E" role="33vP2m">
-              <ref role="37wK5l" node="7LqGxA8Bhbr" resolve="getLogicalChildrenCache" />
+              <ref role="37wK5l" node="7LqGxA8Bhbr" resolve="logicalChildrenCache" />
               <ref role="1Pybhc" node="44INz$MLbE3" resolve="LogicalChildOwnerUtil" />
               <node concept="37vLTw" id="6aYyEt1Fp7F" role="37wK5m">
                 <ref role="3cqZAo" node="6aYyEt1Fmor" resolve="module" />
diff --git a/subprojects/com.mbeddr/build.gradle b/subprojects/com.mbeddr/build.gradle
index fffe957f70..b8111a8f9d 100755
--- a/subprojects/com.mbeddr/build.gradle
+++ b/subprojects/com.mbeddr/build.gradle
@@ -1,10 +1,16 @@
 import de.itemis.mps.gradle.tasks.MpsMigrate
 import de.itemis.mps.gradle.tasks.Remigrate
+import de.itemis.mps.gradle.downloadJBR.DownloadJbrForPlatform
 
 plugins {
     id 'de.itemis.mps.gradle.common'
 }
 
+apply plugin: 'download-jbr'
+
+downloadJbr {
+    jbrVersion = '17.0.8.1-b1000.32'
+}
 // path variables
 // If mpsHomeDir is set explicitly, skip the MPS resolution step and use the explicit path (which may be relative from
 // the root directory).
@@ -191,7 +197,9 @@ List<File> projectDirectoriesInDependencyOrder = projectsInDependencyOrder.colle
 }
 
 tasks.register('migrate', MpsMigrate) {
-    dependsOn(':com.mbeddr:platform:generate_platform_languages')
+    dependsOn(':com.mbeddr:platform:generate_platform_languages', 'downloadJbr')
+    javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }
+
     mpsHome = mpsHomeDir
     projectDirectories.from(projectDirectoriesInDependencyOrder)
 
@@ -203,7 +211,9 @@ tasks.register('migrate', MpsMigrate) {
 }
 
 tasks.register('remigrate', Remigrate) {
-    dependsOn(':com.mbeddr:platform:generate_platform_languages')
+    dependsOn(':com.mbeddr:platform:generate_platform_languages', 'downloadJbr')
+    javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }
+
     mpsHome = mpsHomeDir
     projectDirectories.from(projectDirectoriesInDependencyOrder)