diff --git a/.gitignore b/.gitignore
index de42cf8..2a93b06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ out
 test-run
 .DS_Store
 test-home
-dataSources
\ No newline at end of file
+dataSources
+.idea
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index abd835d..a0e2704 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [0.6.0] - Unreleased
+## [0.7.0] - 2018-10-30
+
+### Dependencies
+- CUBA 6.10.x
+
+## [0.6.0] - 2018-09-16
 
 ### Added
 - new UniquePolicy option: Abort. Will abort the complete import process immediately (#122)
diff --git a/README.md b/README.md
index c77aff8..cddbdc6 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,7 @@ Table of Contents
 
 | Platform Version | Add-on Version |
 | ---------------- | -------------- |
+| 6.10.x           | 0.7.x          |
 | 6.9.x            | 0.5.x - 0.6.x  |
 | 6.8.x            | 0.1.x - 0.4.x  |
 
diff --git a/build.gradle b/build.gradle
index ad66ede..9ae464c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,8 @@
 buildscript {
-    ext.cubaVersion = '6.9.5'
+    ext.cubaVersion = '6.10.2'
     repositories {
 
+        mavenLocal()
         maven {
             url 'https://repo.cuba-platform.com/content/groups/work'
             credentials {
@@ -46,8 +47,8 @@ apply(plugin: 'cuba')
 cuba {
     artifact {
         group = 'de.diedavids.cuba.dataimport'
-        version = "0.6.1"
-        isSnapshot = true
+        version = "0.7.0"
+        isSnapshot = false
     }
     tomcat {
         dir = "$project.rootDir/deploy/tomcat"
@@ -99,7 +100,7 @@ subprojects {
 
 dependencies {
     appComponent("com.haulmont.cuba:cuba-global:$cubaVersion")
-    appComponent("de.balvi.cuba.declarativecontrollers:declarativecontrollers-global:0.6.0")
+    appComponent("de.balvi.cuba.declarativecontrollers:declarativecontrollers-global:0.7.0")
 
 }
 
@@ -204,7 +205,15 @@ configure([globalModule, coreModule, guiModule, webModule]) {
 }
 
 configure(globalModule) {
-    task enhance(type: CubaEnhancing)
+    entitiesEnhancing {
+        main { enabled = true }
+        test {
+            enabled = true
+            persistenceConfig = 'dataimport-test-persistence.xml'
+        }
+
+    }
+
 
     dependencies {
         compile('org.apache.poi:poi-ooxml:3.17')
@@ -223,7 +232,14 @@ configure(globalModule) {
 
 configure(coreModule) {
 
-    task enhanceTestModel(type: CubaTestEnhancing)
+    entitiesEnhancing {
+        main { enabled = true }
+        test {
+            enabled = true
+            persistenceConfig = 'dataimport-test-persistence.xml'
+        }
+
+    }
 
     configurations {
         jdbc