diff --git a/pom.xml b/pom.xml
index da8cae4dc32584e10eb4827871bb5a416b460145..36768550ba09b07aae2f9b6ad5117ef6629dcfbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,9 +47,9 @@
         <spring-data-jpa.version>1.10.11.RELEASE</spring-data-jpa.version>
         <spring-boot-starter-actuator.version>1.4.7.RELEASE</spring-boot-starter-actuator.version>
         <aspectjweaver.version>1.8.9</aspectjweaver.version>
-        <woken-messages.version>2.9.6</woken-messages.version>
+        <woken-messages.version>3.0.1</woken-messages.version>
         <javax-inject.version>1</javax-inject.version>
-        <akka.version>2.5.20</akka.version>
+        <akka.version>2.5.21</akka.version>
         <spring-context.version>4.3.4.RELEASE</spring-context.version>
         <protobuf-java.version>3.1.0</protobuf-java.version>
 
diff --git a/src/main/java/eu/hbp/mip/StartupTasks.java b/src/main/java/eu/hbp/mip/StartupTasks.java
index fa58eaf924ef9826e7eadb6ac182b85acc2a9341..acbf8f0c9d1ccd557c0ffe4e118d841eab8f2b03 100644
--- a/src/main/java/eu/hbp/mip/StartupTasks.java
+++ b/src/main/java/eu/hbp/mip/StartupTasks.java
@@ -47,7 +47,7 @@ public class StartupTasks implements ApplicationListener<ApplicationReadyEvent>
         for (int i = 0; i < 5; i++) {
             try {
                 for (Dataset dataset : datasetsApi.fetchDatasets()) {
-                    final String code = dataset.dataset().code();
+                    final String code = dataset.id().code();
                     Variable v = variableRepository.findOne(code);
                     if (v == null) {
                         LOGGER.info("Store additional variable {}", code);
diff --git a/src/main/java/eu/hbp/mip/controllers/DatasetsApi.java b/src/main/java/eu/hbp/mip/controllers/DatasetsApi.java
index 99d5b8497cd9fad5b2843b1621293e26d5f6dfe8..7798b0ab9069dedb526cc24d7e2e5849b19987c8 100644
--- a/src/main/java/eu/hbp/mip/controllers/DatasetsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/DatasetsApi.java
@@ -49,7 +49,7 @@ public class DatasetsApi extends WokenClientController {
             for (Dataset d: fetchDatasets()) {
                 DatasetDescription dataset = new DatasetDescription();
                 LOGGER.info("Dataset {}", d);
-                dataset.setCode(d.dataset().code());
+                dataset.setCode(d.id().code());
                 dataset.setLabel(d.label());
                 dataset.setDescription(d.description());
                 dataset.setAnonymisationLevel(d.anonymisationLevel().toString());
diff --git a/src/main/java/eu/hbp/mip/controllers/MiningApi.java b/src/main/java/eu/hbp/mip/controllers/MiningApi.java
index 21720df3028c9f4893555ee50bcaf59af91ce6be..bf89261eb14fab25a0adf5bf7dd3e07ff43235e6 100644
--- a/src/main/java/eu/hbp/mip/controllers/MiningApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/MiningApi.java
@@ -2,11 +2,9 @@ package eu.hbp.mip.controllers;
 
 import com.google.gson.Gson;
 import eu.hbp.mip.akka.WokenClientController;
-import eu.hbp.mip.configuration.SecurityConfiguration;
 import eu.hbp.mip.model.Mining;
 import eu.hbp.mip.model.User;
 import eu.hbp.mip.model.UserInfo;
-import eu.hbp.mip.utils.HTTPUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -22,7 +20,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import scala.Option;
 
-import java.io.IOException;
 import java.sql.Date;
 
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
@@ -61,7 +58,7 @@ public class MiningApi extends WokenClientController {
                     return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("{\"error\":\"" + result.error().get() + "\"}");
                 } else {
                     Mining mining = new Mining(
-                        unwrap(result.jobId()),
+                        result.jobId(),
                         result.node(),
                         unwrap(result.algorithm()),
                         result.type().mime(),