diff --git a/crud.iml b/crud-jpa-tutorial.iml
similarity index 73%
rename from crud.iml
rename to crud-jpa-tutorial.iml
index 109baf3..7b53f8b 100644
--- a/crud.iml
+++ b/crud-jpa-tutorial.iml
@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
+    <facet type="AspectJ" name="AspectJ">
+      <configuration />
+    </facet>
+    <facet type="Spring" name="Spring">
+      <configuration>
+        <fileset id="fileset" name="ApplicationContext" removed="false">
+          <file>file://$MODULE_DIR$/applicationContext.xml</file>
+          <file>file://$MODULE_DIR$/src/main/java/com/example/crud/ApplicationConfiguration.java</file>
+          <file>file://$MODULE_DIR$/src/main/java/com/example/crud/CacheConfiguration.java</file>
+          <file>file://$MODULE_DIR$/src/main/java/com/example/crud/EhCacheConfiguration.java</file>
+          <file>file://$MODULE_DIR$/src/main/java/com/example/crud/metrics/MetricsConfiguration.java</file>
+          <file>file://$MODULE_DIR$/src/main/java/com/example/crud/metrics/SpringConfiguringClass.java</file>
+        </fileset>
+      </configuration>
+    </facet>
     <facet type="jpa" name="JPA">
       <configuration>
         <setting name="validation-enabled" value="true" />
@@ -12,30 +27,6 @@
         <deploymentDescriptor name="persistence.xml" url="file://$MODULE_DIR$/src/main/resources/META-INF/persistence.xml" />
       </configuration>
     </facet>
-    <facet type="Spring" name="Spring">
-      <configuration>
-        <fileset id="fileset" name="Spring Application Context" removed="false">
-          <file>file://$MODULE_DIR$/src/main/java/com/example/crud/CacheConfiguration.java</file>
-          <file>file://$MODULE_DIR$/src/main/java/com/example/crud/EhCacheConfiguration.java</file>
-          <file>file://$MODULE_DIR$/src/main/java/com/example/crud/metrics/MetricsConfiguration.java</file>
-          <file>file://$MODULE_DIR$/src/main/java/com/example/crud/metrics/SpringConfiguringClass.java</file>
-          <file>file://$MODULE_DIR$/applicationContext.xml</file>
-        </fileset>
-        <fileset id="fileset2" name="Spring Application Context (2)" removed="false">
-          <file>file://$MODULE_DIR$/src/main/java/com/example/crud/ApplicationConfiguration.java</file>
-        </fileset>
-        <fileset id="fileset3" name="Spring Application Context (3)" removed="false">
-          <file>file://$MODULE_DIR$/src/main/java/com/example/crud/ApplicationConfiguration.java</file>
-          <file>file://$MODULE_DIR$/src/main/java/com/example/crud/CacheConfiguration.java</file>
-          <file>file://$MODULE_DIR$/src/main/java/com/example/crud/EhCacheConfiguration.java</file>
-          <file>file://$MODULE_DIR$/src/main/java/com/example/crud/metrics/MetricsConfiguration.java</file>
-          <file>file://$MODULE_DIR$/src/main/java/com/example/crud/metrics/SpringConfiguringClass.java</file>
-        </fileset>
-      </configuration>
-    </facet>
-    <facet type="AspectJ" name="AspectJ">
-      <configuration />
-    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
@@ -48,32 +39,27 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.datanucleus:datanucleus-core:5.1.0-m3" level="project" />
-    <orderEntry type="library" name="Maven: org.datanucleus:datanucleus-api-jpa:5.1.0-m3" level="project" />
-    <orderEntry type="library" name="Maven: org.datanucleus:javax.persistence:2.2.0-m3" level="project" />
+    <orderEntry type="library" name="Maven: org.datanucleus:datanucleus-core:5.1.0-release" level="project" />
+    <orderEntry type="library" name="Maven: org.datanucleus:datanucleus-api-jpa:5.1.0-release" level="project" />
+    <orderEntry type="library" name="Maven: org.datanucleus:javax.persistence:2.2.0-release" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-access:1.2.3" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.8.0-alpha2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.8.0-alpha2" level="project" />
-    <orderEntry type="library" name="Maven: org.datanucleus:datanucleus-mongodb:5.1.0-m3" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:3.4.2" level="project" />
-    <orderEntry type="module-library">
-      <library name="Maven: org.datanucleus:datanucleus-cassandra:5.1.0-m4-SNAPSHOT">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/datanucleus-cassandra-5.1.0-m4-SNAPSHOT.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="Maven: com.datastax.cassandra:cassandra-driver-core:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.0.44.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.0.44.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.0.44.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.0.44.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.0.44.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.datanucleus:datanucleus-mongodb:5.1.0-release" level="project" />
+    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mongodb:bson:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:3.6.3" level="project" />
+    <orderEntry type="library" name="Maven: org.datanucleus:datanucleus-cassandra:5.1.0-release" level="project" />
+    <orderEntry type="library" name="Maven: com.datastax.cassandra:cassandra-driver-core:3.4.0" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.0.47.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.0.47.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.0.47.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.0.47.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.0.47.Final" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:19.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.jnr:jnr-ffi:2.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.github.jnr:jffi:1.2.10" level="project" />
@@ -86,40 +72,41 @@
     <orderEntry type="library" name="Maven: com.github.jnr:jnr-x86asm:1.0.2" level="project" />
     <orderEntry type="library" name="Maven: com.github.jnr:jnr-posix:3.0.27" level="project" />
     <orderEntry type="library" name="Maven: com.github.jnr:jnr-constants:0.9.0" level="project" />
-    <orderEntry type="library" name="Maven: com.datastax.cassandra:cassandra-driver-extras:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.datastax.cassandra:cassandra-driver-mapping:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
-    <orderEntry type="library" name="Maven: org.datanucleus:datanucleus-cache:5.1.0-m1" level="project" />
-    <orderEntry type="library" name="Maven: javax.cache:cache-api:1.0.0-PFD" level="project" />
+    <orderEntry type="library" name="Maven: com.datastax.cassandra:cassandra-driver-extras:3.4.0" level="project" />
+    <orderEntry type="library" name="Maven: com.datastax.cassandra:cassandra-driver-mapping:3.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.datanucleus:datanucleus-cache:5.1.1" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:2.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.cache:cache-api:1.1.0" level="project" />
     <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
     <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-jgroupsreplication:1.7" level="project" />
     <orderEntry type="library" name="Maven: org.jgroups:jgroups:3.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.0.RC2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.0.RC2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.0.RC2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.0.RC2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.0.RC2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.0.RC2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.0.0.RC2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.6.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.8.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:unknown" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.0.0.RC2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.0.RC2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.0.RC2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.0.0.M2" level="project" />
-    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.0.0.M2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.0.RC2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.0.0.RC2" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.0.BETA-5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.1.0.M1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.0.M1" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.9.0.RC1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.0.M1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.9" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.16" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.20" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Maven: io.dropwizard.metrics:metrics-core:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: io.dropwizard.metrics:metrics-logback:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: io.dropwizard.metrics:metrics-logback:4.1.0-rc0" level="project" />
     <orderEntry type="library" name="Maven: io.dropwizard.metrics:metrics-jvm:3.2.2" level="project" />
     <orderEntry type="library" name="Maven: io.dropwizard.metrics:metrics-healthchecks:3.2.2" level="project" />
     <orderEntry type="library" name="Maven: io.dropwizard.metrics:metrics-graphite:3.2.2" level="project" />
@@ -127,9 +114,8 @@
     <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache:2.8.3" level="project" />
     <orderEntry type="library" name="Maven: com.ryantenney.metrics:metrics-spring:3.1.3" level="project" />
     <orderEntry type="library" name="Maven: io.dropwizard.metrics:metrics-annotation:3.1.2" level="project" />
-    <orderEntry type="library" name="Maven: io.riemann:metrics3-riemann-reporter:0.4.5" level="project" />
-    <orderEntry type="library" name="Maven: com.codahale.metrics:metrics-core:3.0.1" level="project" />
-    <orderEntry type="library" name="Maven: io.riemann:riemann-java-client:0.4.5" level="project" />
+    <orderEntry type="library" name="Maven: io.riemann:metrics3-riemann-reporter:0.4.6" level="project" />
+    <orderEntry type="library" name="Maven: io.riemann:riemann-java-client:0.4.6" level="project" />
     <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:2.6.1" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty:3.6.1.Final" level="project" />
     <orderEntry type="library" name="Maven: defunkt:logback-riemann-appender:0.4.0" level="project" />
diff --git a/pom.xml b/pom.xml
index abbc60e..6f03916 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,8 +17,8 @@
         <org.datanucleus.version>5.1.0-release</org.datanucleus.version>
         <aspectj.version>1.8.10</aspectj.version>
         <metrics.version>3.2.2</metrics.version>
-        <spring.version>5.0.2.RELEASE</spring.version>
-        <spring-data-releasetrain.version>Kay-SR2</spring-data-releasetrain.version>
+        <spring.version>5.0.5.RELEASE</spring.version>
+        <spring-data.version>1.4.6.RELEASE</spring-data.version>
     </properties>
 
     <repositories>
@@ -46,15 +46,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-framework-bom</artifactId>
-                <version>5.0.0.RC2</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework.data</groupId>
-                <artifactId>spring-data-releasetrain</artifactId>
-				<version>${spring-data-releasetrain.version}</version>
+                <version>${spring.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -77,7 +69,7 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>javax.persistence</artifactId>
-            <version>2.2.0-m3</version>
+            <version>2.2.0-release</version>
         </dependency>
 
         <dependency>
@@ -95,7 +87,7 @@
             <artifactId>jcl-over-slf4j</artifactId>
             <version>1.8.0-alpha2</version>
         </dependency>
-        <dependency>
+p        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>log4j-over-slf4j</artifactId>
             <version>1.8.0-alpha2</version>
@@ -110,7 +102,7 @@
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongo-java-driver</artifactId>
-            <version>3.4.2</version>
+            <version>3.6.3</version>
         </dependency>
 
         <!-- Cassandra -->
@@ -123,31 +115,31 @@
         <dependency>
             <groupId>com.datastax.cassandra</groupId>
             <artifactId>cassandra-driver-core</artifactId>
-            <version>3.2.0</version>
+            <version>3.4.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.datastax.cassandra</groupId>
             <artifactId>cassandra-driver-extras</artifactId>
-            <version>3.2.0</version>
+            <version>3.4.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.datastax.cassandra</groupId>
             <artifactId>cassandra-driver-mapping</artifactId>
-            <version>3.2.0</version>
+            <version>3.4.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.hdrhistogram</groupId>
             <artifactId>HdrHistogram</artifactId>
-            <version>2.1.9</version>
+            <version>2.1.10</version>
         </dependency>
 
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-cache</artifactId>
-            <version>5.1.0-m1</version>
+            <version>5.1.1</version>
             <!--
             <exclusions>
                 <exclusion>
@@ -181,7 +173,7 @@
         <dependency>
             <groupId>javax.cache</groupId>
             <artifactId>cache-api</artifactId>
-            <version>1.0.0-PFD</version>
+            <version>1.1.0</version>
         </dependency>
 
         <!--
@@ -227,13 +219,13 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-jpa</artifactId>
-            <version>2.0.5.RELEASE</version>
+            <version>2.1.0.M1</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-keyvalue</artifactId>
-            <version>2.0.5.RELEASE</version>
+            <version>2.1.0.M1</version>
         </dependency>
 
         <dependency>
@@ -251,7 +243,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
-            <version>5.0.0.M2</version>
+            <version>5.0.4.RELEASE</version>
         </dependency>
 
         <dependency>
@@ -271,7 +263,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.16</version>
+            <version>1.16.20</version>
         </dependency>
 
         <dependency>
@@ -299,7 +291,7 @@
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-logback</artifactId>
-            <version>3.2.2</version>
+            <version>4.1.0-rc0</version>
         </dependency>
 
         <dependency>
@@ -337,7 +329,7 @@
         <dependency>
             <groupId>io.riemann</groupId>
             <artifactId>metrics3-riemann-reporter</artifactId>
-            <version>0.4.5</version>
+            <version>0.4.6</version>
         </dependency>
 
         <dependency>
@@ -453,6 +445,7 @@
             <plugin>
                 <groupId>org.datanucleus</groupId>
                 <artifactId>datanucleus-maven-plugin</artifactId>
+                <version>5.0.0-release</version>
                 <configuration>
                     <api>JPA</api>
                     <persistenceUnitName>crud</persistenceUnitName>
diff --git a/src/main/java/com/example/crud/ApplicationConfiguration.java b/src/main/java/com/example/crud/ApplicationConfiguration.java
index 359caaf..366ff5a 100644
--- a/src/main/java/com/example/crud/ApplicationConfiguration.java
+++ b/src/main/java/com/example/crud/ApplicationConfiguration.java
@@ -37,13 +37,13 @@ class ApplicationConfiguration {
     @PostConstruct
     private void enhanceModelObjectBytecode() {
         DataNucleusEnhancer enhancer = new DataNucleusEnhancer("JPA", null);
-        enhancer.setVerbose(true);
-        enhancer.addClasses(AbstractEntity.class.getName());
-        enhancer.addClasses(AbstractAuditableEntity.class.getName());
-        enhancer.addClasses(Product.class.getName());
-        enhancer.addPersistenceUnit("crud");
-        enhancer.addPersistenceUnit("mongo");
-        enhancer.enhance();
+        enhancer.setVerbose(true)
+                .addClasses(AbstractEntity.class.getName())
+                .addClasses(AbstractAuditableEntity.class.getName())
+                .addClasses(Product.class.getName())
+                .addPersistenceUnit("crud")
+                .addPersistenceUnit("mongo")
+                .enhance();
     }
 
     @Bean
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index ff4b3fc..fdbe885 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -16,6 +16,7 @@
     </persistence-unit>
 
     <persistence-unit name="crud" transaction-type="RESOURCE_LOCAL">
+        <class>com.example.crud.entities.AbstractEntity/class>
         <class>com.example.crud.entities.Inventory</class>
         <class>com.example.crud.entities.Product</class>
         <class>com.example.crud.entities.Book</class>