diff --git a/pom.xml b/pom.xml
index 9700cf49a3326b1456e7392dac1c5a98a56d6d65..3c9d3ce3011d7fe0bd2f2a81a21da9fa7a9c398d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
         <asciidoctor.maven.plugin.version>1.5.5</asciidoctor.maven.plugin.version>
         <asciidoctorj.pdf.version>1.5.0-alpha.15</asciidoctorj.pdf.version>
         <asciidoctorj.version>1.5.5</asciidoctorj.version>
-        <spring-data-commons.version>1.13.17.RELEASE</spring-data-commons.version>
+        <spring-data-commons.version>1.12.3.RELEASE</spring-data-commons.version>
         <angularjs.version>1.5.7</angularjs.version>
         <jquery.version>3.0.0</jquery.version>
         <bootstrap.version>3.3.7</bootstrap.version>
@@ -47,7 +47,7 @@
         <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.3</woken-messages.version>
+        <woken-messages.version>2.9.4</woken-messages.version>
         <javax-inject.version>1</javax-inject.version>
         <akka.version>2.5.19</akka.version>
         <spring-context.version>4.3.4.RELEASE</spring-context.version>
@@ -236,6 +236,16 @@
             <artifactId>protobuf-java</artifactId>
             <version>${protobuf-java.version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>2.0.1.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.4.0-b180830.0438</version>
+        </dependency>
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
@@ -249,12 +259,6 @@
             <version>${scala.release.version}</version>
             <scope>compile</scope>
         </dependency>
-
-        <dependency>
-            <groupId>com.bugsnag</groupId>
-            <version>[3.0,4.0)</version>
-            <artifactId>bugsnag-spring</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/eu/hbp/mip/MIPApplication.java b/src/main/java/eu/hbp/mip/MIPApplication.java
index 6717b3b982d2f19ef02f8a4b893f0a75877385a7..df70ba78a5ba397676f1ad1533895e86a67c4f89 100644
--- a/src/main/java/eu/hbp/mip/MIPApplication.java
+++ b/src/main/java/eu/hbp/mip/MIPApplication.java
@@ -4,7 +4,6 @@
 
 package eu.hbp.mip;
 
-import eu.hbp.mip.configuration.*;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
diff --git a/src/main/java/eu/hbp/mip/configuration/BugsnagConfiguration.java b/src/main/java/eu/hbp/mip/configuration/BugsnagConfiguration.java
deleted file mode 100644
index d97fa780978dd561036d5cb645e5cb528c72e07b..0000000000000000000000000000000000000000
--- a/src/main/java/eu/hbp/mip/configuration/BugsnagConfiguration.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package eu.hbp.mip.configuration;
-
-import ch.chuv.lren.mip.portal.Reporting;
-import com.bugsnag.Bugsnag;
-import com.bugsnag.BugsnagSpringConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-@Configuration
-@Import(BugsnagSpringConfiguration.class)
-public class BugsnagConfiguration {
-    static {
-        new Reporting().init();
-    }
-
-    @Bean
-    public Bugsnag bugsnag() {
-        return new Bugsnag(System.getenv("BUGSNAG_KEY"));
-    }
-}
diff --git a/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java b/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
index 9b4d490e4def2afa350ebaa85d92003ff89ad9bf..9d346ecf94bc02660077f11739f074832cfe9fda 100644
--- a/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.orm.jpa.EntityScan;
 import org.springframework.context.annotation.*;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -26,7 +27,7 @@ import javax.sql.DataSource;
 @Configuration
 @EnableJpaRepositories("eu.hbp.mip.repositories")
 @EnableTransactionManagement
-//@EntityScan(basePackages = "eu.hbp.mip.model")
+@EntityScan(basePackages = "eu.hbp.mip.model")
 public class PersistenceConfiguration {
 
     @Value("#{'${spring.featuresDatasource.main-table:features}'}")
@@ -70,7 +71,7 @@ public class PersistenceConfiguration {
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(portalDataSource());
-        em.setPackagesToScan("eu.hbp.mip.model");
+        //em.setPackagesToScan("eu.hbp.mip.model");
         em.setPersistenceUnitName("portal");
         JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         em.setJpaVendorAdapter(vendorAdapter);