diff --git a/.gitignore b/.gitignore
index ac58a36..283edf3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,17 +9,6 @@
 /build
 /captures
 .externalNativeBuild
-/app
-/appbase
-/commonsapp
-/modelapp
-/netapp
-/promise
-/promisecommons
-/promisemodel
-/promisenet
-/promisepref
-/promiseui
-/uiapp
+/node_modules
 
 
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 681f41a..0d15693 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,23 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ecfc06b..a018472 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,10 +11,10 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/androidpromisedatabase" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/commons" />
             <option value="$PROJECT_DIR$/compiler" />
+            <option value="$PROJECT_DIR$/database" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/README.md b/README.md
index b7968b1..cf98613 100644
--- a/README.md
+++ b/README.md
@@ -1,195 +1,257 @@
-# Android Promise Database [![](https://jitpack.io/v/android-promise/database.svg)](https://jitpack.io/#android-promise/database)
- Manage SqLite databases in android with ease
 
+[![-----------------------------------------------------](https://raw.githubusercontent.com/andreasbm/readme/master/assets/lines/colored.png)](#android-promise-database-httpsjitpackiovandroid-promisedatabasesvghttpsjitpackioandroid-promisedatabase)
+
+# ➤ Android Promise Database [![](https://jitpack.io/v/android-promise/database.svg)](https://jitpack.io/#android-promise/database)
+ Manage SqLite databases in android with ease by It mapping Pojo and data classes to the SQlite tables, In most of database interactions, most queries are generated at runtime.
+
+
+[![-----------------------------------------------------](https://raw.githubusercontent.com/andreasbm/readme/master/assets/lines/colored.png)](#table-of-contents)
+
+# ➤ Table of Contents
+
+***[Entity](***Entity)***<br>
+***[Database](###Database)***<br>
+***[TypeConverter](###TypeConverter)***<br>
+***[Relations](###Relations)***<br>
+***[Initialization](###Initialization)***<br>
+***[Migrations](###Migrations)***<br>
+**[Setup](##Setup)**<br>
+**[Next Steps, Credits, Feedback, License](#next-steps)**<br>
+
+
+[![-----------------------------------------------------](https://raw.githubusercontent.com/andreasbm/readme/master/assets/lines/colored.png)](#sample)
+
+### Entity
+Pojo classes to be persisted are annotated with `@Entity`
+
+The classes can either implement `Identifiable<Integer>` or extend from `ActiveRecord`
+
+**This classes must hava a no args constructor or no constructors at all**
 
-## Making your Record Class
-Annotate the entity class with Entity, the class can either implement Identifiable<Integer> or extend from ActiveRecord and override parcelable functionality.
-A sample:
-### Person Class
 > Optionally add the table name in the annotation
 
-```java
+```kotlin
 
+@SuppressLint("ParcelCreator")
 @Entity
-public class Person extends ActiveRecord<Person> {
-  // Indexed column
-  @Index
-  private String name;
-  private int age;
-  private boolean aged;
-  private float height;
-  private double marks;
-  private String email;
-  private String phoneNumber;
-  // denote a person has many dogs
-  @HasMany(entity = Dog.class)
-  private List<Dog> dogs;
-
-  public Person() {
-  }
-
-  @NotNull
-  @Override
-  public Person getEntity() {
-    return this;
-  }
-  // include parcelable implementation if extending from ActiveRecord
-  // include getters and setters for persistable fields
+class Photo: ActiveRecord<Photo>() {
+	var albumId: Int? = null
+	var title: String? = null
+	var url: String? = null
+	var thumbnailUrl: String? = null
+
+  // denotes a photo has one post
+	@HasOne var post: Post? = null
+
+	override fun getEntity(): Photo {
+		return this
+	}  
 }
 ```
-> A MUST include correct getter and setter signatures for Java file or generated code will not compile,
-> if entity is a kt file, DO NOT include any getter and setters, BOOLEAN fields MUST NOT start with `is`
 
-## Making your database
-The database expects a list of entities to be registered with it
-```kotlin
+> Include correct getter and setter signatures for Java file or generated code will not compile, including fields convertable via type converter and fields marked as relation
 
+> BOOLEAN fields MUST NOT start with `is`
+
+> Kotlin data classes are not supported yet 
+
+### Database
+Database classe is annotated with `@DatabaseEntity` and contain a list
+of persistable entity classes
+
+*The class must be abstract and extend from `PromiseDatabase`*
+> **There can only be one database class in a module**
+```kotlin
 @DatabaseEntity(
     persistableEntities = [
-      Person::class,
-      Dog::class,
-      Sales::class
+      PostComment::class,
+      Photo::class,
+      Post::class,
+      Todo::class,
+      Like::class
     ]
 )
-/**
- *
- */
-abstract class AppDatabase : PromiseDatabase {
-
-
-  /**
-   *
-   */
-  private val personsTable: FastTable<Person> by lazy { tableOf(Person::class.java) }
-
-  /**
-   *
-   */
-  private val dogsTable: FastTable<Dog> by lazy { tableOf(Dog::class.java) }
-
-  /**
-   *
-   */
-  fun listAllPersons() = personsTable.findAll()
-
-  fun listAllPersonsWithEmail(): List<Person> {
-    val cursor = personsTable.query(personsTable.queryBuilder().whereAnd(Criteria.notIsNull(PersonsTable.emailColumn)))
-    val persons = ArrayList<Person>()
-    while (cursor.moveToNext()) {
-      persons.add(personsTable.deserialize(cursor))
-    }
-    cursor.close()
-
-    return persons
+abstract class AppDatabase(fastDatabase: FastDatabase)
+  : PromiseDatabase(fastDatabase) {
+
+  init {
+    fastDatabase.accept(object : Visitor<FastDatabase, Unit> {
+      override fun visit(t: FastDatabase) {
+        t.setErrorHandler {
+          LogUtil.e(TAG, "database error: ${it.path}")
+        }
+        t.fallBackToDestructiveMigration()
+      }
+    })
   }
 
-  /**
-   *
-   */
-  fun listAllDogs() = dogsTable.findAll()
-
-//  /**
-//   *
-//   */
-//  @OneToMany(parent = Person::class, child = Dog::class)
-//  @FindAll
-//  abstract fun getPersonsWithDogs(array: Array<Column<*>>?): List<Person>
-//
-//  /**
-//   *
-//   */
-//  @OneToOne(parent = Dog::class, child = Person::class)
-//  @FindAll
-//  abstract fun getDogsWithPersons(array: Array<Column<*>>?): List<Dog>
+  companion object {
+    val TAG: String = LogUtil.makeTag(AppDatabase::class.java)
+  }
+}
+```
+*Rebuild your project to generate database implementation*
 
+### TypeConverter
+A type converter is a utility that helps to convert fields not directly persistable to be persistable by converting to and from String,
+For instance the Post entity has named uId with a type
+```kotlin
+data class ID(val id: String)
+```
+To make the uId field persistable, provide a type converter
+```kotlin
+@TypeConverter
+class AppTypeConverter {
+  fun toUniqueId(data: String): ID = ID(data)
+  fun toString(data: ID?): String = data?.id ?: ""
 }
 ```
-> Database class MUST be abstract even if it has no abstract methods to override
-> Database class MUST implement PromiseDatabase
+A type converter must be annotated with `@TypeConverter` and contain *non static* methods that converts between the non persistable type to a string and vice verser
+Methods in a type converter should have only one parameter and must return
 
+*Type converter is not for fields that are relations*
 
-## Consuming your database
-The compiler generates a database class for creating your database implementation and accesing tables.
-If using Dagger, initialize it from a module
-```kotlin
- ...
- 
-@Module
-object DatabaseDependencies {
-
-  @Provides
-  @Singleton
-  @JvmStatic
-  fun providesAppDatabase(): AppDatabase {
-    return AppDatabase_Impl.createDatabase("name")
+**There can only be one type converter in one module**
+
+> Without a type converter provision, the compiler will not generate columns for non persistable fields
+
+
+### Relations
+
+#### HasOne Relation
+Denotes one entity has one other entity, a sample
+```java
+@Entity
+public class Todo extends ActiveRecord<Todo> {
+  // other fields
+	...
+  // denotes this todo has one photo
+  @HasOne
+  private Photo photo;
+}
+```
+To utilize the relation, the compiler will generate a class called `TodoRelationsDao` with convenient methods, a snippet of generated code below
+```java
+public final class TodoRelationsDao {
+  private TodoesTable todoesTable;
+  private PhotosTable photosTable;
+  private TodoRelationsDao(TodoesTable todoesTable, PhotosTable photosTable) {
+    this.todoesTable = todoesTable;
+    this.photosTable = photosTable;
   }
+  public IdentifiableList<? extends Todo> paginateWithPhotos(int skip, int limit) {
+    IdentifiableList<? extends Todo> todoes = todoesTable.find().paginateDescending(skip, limit);
+    return populateWithPhotos(todoes);
+  }
+  ...
+  // other convenient methods
+  ...
+  public Photo getPhoto(Todo todo) {
+    return photosTable.findById(todo.getPhoto().getId());
+  }
+}
+```
 
-  // tables obtained are Singleton, no need to annotate with Singleton
-  @Provides
-  @JvmStatic
-  fun providesPersonsTable(appDatabase: AppDatabase): PersonsTable {
-    return appDatabase.databaseInstance.obtain<PersonsTable>(PersonsTable::class.java)
+> Instances of RelationDaos are retrieved from the generated database class
+
+
+#### HasMany Relation
+Denotes one entity has many entities of same type and the other entity has one entity of this type, a sample a post has many post comments and a post comment has one post
+```java
+@Entity
+public class Post extends ActiveRecord<Post> {
+  // other fields
+	...
+	@HasMany
+  private List<PostComment> comments;
+}
+```
+```java
+@SuppressLint("ParcelCreator")
+@Entity
+public class PostComment extends ActiveRecord<PostComment> {
+  // other fields
+	...
+	@HasOne
+  private Post post;
+}
+```
+**Both relations must exist at the same time**
+To utilize the relation, the compiler will generate a class called `PostRelationsDao` with convenient methods, a snippet of generated code below
+```java
+public final class PostRelationsDao {
+  private PostsTable postsTable;
+  private PostCommentsTable postCommentsTable;
+  private PhotosTable photosTable;
+  private PostRelationsDao(PostsTable postsTable, PostCommentsTable postCommentsTable,
+      PhotosTable photosTable) {
+    this.postsTable = postsTable;
+    this.postCommentsTable = postCommentsTable;
+    this.photosTable = photosTable;
+  }
+  public IdentifiableList<? extends Post> listWithComments() {
+    IdentifiableList<? extends Post> posts = postsTable.findAll();
+    posts.forEach(new Consumer<Post>() {
+      @Override
+      public void accept(Post post) {
+        post.setComments(new IdentifiableList<>(getComments(post)));
+      }
+    });
+    return posts;
   }
+  ...
+  // more convenience methods
 }
-...
 ```
-> All the crud functionality exist on the table
 
-## Migrations
+> Instances of RelationDaos are retrieved from the generated database class
+
+### Initialization
+The compiler generates a database class, *In this case the case the generated java file will be named `AppDatabaseIimpl`* ,
+
+for creating your database implementation and accesing tables
+and relation daos, sampled code from generated database file below
+
+
+### Migrations
+
+#### Migrations For Entities
 Adding an entity to be persisted to the database from version 1 to version 2 of the database
 Annotate it with AddedEntity
-##### Sales Entity
 ```java
-
 @Entity
 // register it for migration from version 1 of database to version 2
 @AddedEntity(fromVersion = 1, toVersion = 2)
 public class Sales extends ActiveRecord<Sales> {
-
   private String salesId;
   private double salePrice;
-
   @Text(columnName = "descrip", nullable = false)
   private String description;
-
   @Index
   private String pickupDate;
   // other fields follow
-
   public Sales() {
   }
 }
   // getters and setters and parcelable implementation
 ```
-And then add the new entity to the database 
-
+And then add the new entity to the database and upgrade database version to 2
 ```kotlin
-...
-
 @DatabaseEntity(
-    /**
-     *
-     */
     persistableEntities = [
-      Person::class,
+      /// other entities
       Sales::class
     ],
     version = 2
 )
-/**
- *
- */
-abstract class AppDatabase : PromiseDatabase {
-  ...
-  // 
-  ...
-}
-
-...
+abstract class AppDatabase(fastDatabase: FastDatabase) : PromiseDatabase(fastDatabas) 
 ```
-> Finally upgrade the version of the database to 2
-Adding columns to an existing entity, annotate the new field with Migrate, a migration will be generated by the compiler >
-##### Sales Entity
+
+#### Migrations For Columns
+The compiler generates this migrations on the fly otherwise you may still do it manually by
+annotating the added field with `@Migrate` and include fromVersion and toVersion
+If a field is to pass multiple migrations, annotate it with `@Migrations` and add the migrate annotations in the 
+migrations annotation
 ```java
 ...
   // added new field
@@ -198,10 +260,12 @@ Adding columns to an existing entity, annotate the new field with Migrate, a mig
 ...
 ```
 
-## Setup
-##### build.gradle
-```
+[![-----------------------------------------------------](https://raw.githubusercontent.com/andreasbm/readme/master/assets/lines/colored.png)](#setup)
 
+## ➤ Setup
+##### Project level build.gradle
+Add jitpack repository
+```gradle
 allprojects {
     repositories {
         ...
@@ -209,8 +273,22 @@ allprojects {
     }
 }
 
+```
+##### Module level build.gradle
+Compile with java 8, add rxJava dependency of using rx DML functions in the tables
+```gradle
 android {
     ...
+    defaultConfig {
+        ...
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [
+                        "promise.database.projectDir": "$projectDir".toString()
+                ]
+            }
+        }
+    }
     compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
@@ -219,24 +297,23 @@ android {
 
 dependencies {
      ...
-     implementation 'com.github.android-promise.database:androidpromisedatabase:1.0.2-beta6'
-     kapt 'com.github.android-promise.database:androidpromisedatabasecompiler:1.0.2-beta6'
+     implementation 'com.github.android-promise.database:database:1.0.3'
+     kapt 'com.github.android-promise.database:compiler:1.0.3'
      implementation 'com.github.android-promise:commons:1.1-alpha03'
 }
 ```
-### Initialization
-Initialize Promise in your main application file, entry point
 
-##### App.java
+> The projectDir specifies where object tree file will be stored
+
+##### Initialization
+Initialize Promise in your main application class
 ```java
 public class App extends Application {
   @Override
   public void onCreate() {
     super.onCreate();
-    // 10 is the number of threads allowed to run in the background
-    AndroidPromise.init(this, 10, BuildConfig.DEBUG);
+    AndroidPromise.init(this, BuildConfig.DEBUG);
   }
-
   @Override
   public void onTerminate() {
     super.onTerminate();
@@ -245,23 +322,30 @@ public class App extends Application {
 }
 ```
 
-## New features on the way
+[![-----------------------------------------------------](https://raw.githubusercontent.com/andreasbm/readme/master/assets/lines/colored.png)](#new-features-on-the-way)
+
+## ➤ New features on the way
 watch this repo to stay updated 
 
-# Developed By
-* Peter Vincent - <dev4vin@gmail.com>
-# Donations
+[![-----------------------------------------------------](https://raw.githubusercontent.com/andreasbm/readme/master/assets/lines/colored.png)](#developed-by)
+
+# ➤ Developed By
+* Peter Vincent - [Portfolio](https://dev4vin.github.io/info)
+
+[![-----------------------------------------------------](https://raw.githubusercontent.com/andreasbm/readme/master/assets/lines/colored.png)](#donations)
+
+# ➤ Donations
 If you'd like to support this library development, you could buy me coffee here:
 * [![Become a Patreon]("https://c6.patreon.com/becomePatronButton.bundle.js")](https://www.patreon.com/bePatron?u=31932751)
 
-Thank you very much in advance!
-
 #### Pull requests / Issues / Improvement requests
 Feel free to contribute and ask!<br/>
 
-# License
+[![-----------------------------------------------------](https://raw.githubusercontent.com/andreasbm/readme/master/assets/lines/colored.png)](#license)
+
+# ➤ License
 
-    Copyright 2018 Peter Vincent
+    Copyright 2018 Android Promise Database
 
     Licensed under the Apache License, Version 2.0 Android Promise;
     you may not use this file except in compliance with the License.
diff --git a/app/.classpath b/app/.classpath
new file mode 100644
index 0000000..eb19361
--- /dev/null
+++ b/app/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>
diff --git a/app/.gitignore b/app/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/app/.project b/app/.project
new file mode 100644
index 0000000..ac485d7
--- /dev/null
+++ b/app/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>app</name>
+	<comment>Project app created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/app/.settings/org.eclipse.buildship.core.prefs b/app/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 0000000..b1886ad
--- /dev/null
+++ b/app/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=..
+eclipse.preferences.version=1
diff --git a/app/build.gradle b/app/build.gradle
new file mode 100644
index 0000000..1010df4
--- /dev/null
+++ b/app/build.gradle
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-android-extensions'
+
+kapt {
+    correctErrorTypes true
+}
+
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.2"
+
+    defaultConfig {
+        applicationId "promise.dbapp"
+        minSdkVersion 21
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [
+                        "promise.database.projectDir": "$projectDir".toString()
+                ]
+            }
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+
+    implementation "com.android.support:recyclerview-v7:$supportLibVersion"
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'com.google.android.material:material:1.2.1'
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+
+    implementation 'com.github.android-promise:commons:1.1-beta02'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.17'
+    implementation project(path: ':database')
+    kapt project(path: ':compiler')
+
+    implementation 'com.google.dagger:dagger:2.27'
+    kapt 'com.google.dagger:dagger-compiler:2.27'
+
+    implementation 'com.google.dagger:dagger-android:2.27'
+    implementation 'com.google.dagger:dagger-android-support:2.27'
+    // if you use the support libraries
+    kapt 'com.google.dagger:dagger-android-processor:2.27'
+}
diff --git a/app/deps.txt b/app/deps.txt
new file mode 100644
index 0000000..d4fc7f3
--- /dev/null
+++ b/app/deps.txt
@@ -0,0 +1,6 @@
+//    implementation 'com.google.dagger:dagger:2.27'
+//    kapt 'com.google.dagger:dagger-compiler:2.27'
+//
+//    implementation 'com.google.dagger:dagger-android:2.27'
+//    implementation 'com.google.dagger:dagger-android-support:2.27' // if you use the support libraries
+//    kapt 'com.google.dagger:dagger-android-processor:2.27'
\ No newline at end of file
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
new file mode 100644
index 0000000..2a1d497
--- /dev/null
+++ b/app/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class tableName to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file tableName.
+#-renamesourcefileattribute SourceFile
diff --git a/app/schemas/promise.base.AppDatabase/2.yml b/app/schemas/promise.base.AppDatabase/2.yml
new file mode 100644
index 0000000..e5ed15b
--- /dev/null
+++ b/app/schemas/promise.base.AppDatabase/2.yml
@@ -0,0 +1,114 @@
+---
+dbVersion: 2
+tableMetaData:
+- tableName: "likes"
+  fields:
+  - fieldName: "uId"
+    columnName: "uId"
+    nullable: true
+  - fieldName: "post"
+    columnName: "post"
+    nullable: true
+  - fieldName: "type"
+    columnName: "type"
+    nullable: true
+  migrations: []
+- tableName: "postComments"
+  fields:
+  - fieldName: "name"
+    columnName: "name"
+    nullable: true
+  - fieldName: "uId"
+    columnName: "uId"
+    nullable: true
+  - fieldName: "body"
+    columnName: "body"
+    nullable: true
+  - fieldName: "email"
+    columnName: "email"
+    nullable: true
+  - fieldName: "postCommentId"
+    columnName: "postCommentId"
+    nullable: true
+  - fieldName: "post"
+    columnName: "post"
+    nullable: true
+  migrations: []
+- tableName: "posts"
+  fields:
+  - fieldName: "uId"
+    columnName: "uId"
+    nullable: true
+  - fieldName: "title"
+    columnName: "ttl"
+    nullable: true
+  - fieldName: "body"
+    columnName: "body"
+    nullable: true
+  - fieldName: "userId"
+    columnName: "userId"
+    nullable: true
+  - fieldName: "numberOfViews"
+    columnName: "numberOfViews"
+    nullable: true
+  - fieldName: "publishedDate"
+    columnName: "publishedDate"
+    nullable: true
+  migrations: []
+- tableName: "todoes"
+  fields:
+  - fieldName: "uid"
+    columnName: "uid"
+    nullable: true
+  - fieldName: "completed"
+    columnName: "completed"
+    nullable: true
+  - fieldName: "title"
+    columnName: "title"
+    nullable: true
+  - fieldName: "timeStarted"
+    columnName: "timeStarted"
+    nullable: true
+  - fieldName: "timeFinished"
+    columnName: "timeFinished"
+    nullable: true
+  - fieldName: "description"
+    columnName: "description"
+    nullable: true
+  - fieldName: "photo"
+    columnName: "photo"
+    nullable: true
+  migrations: []
+- tableName: "photos"
+  fields:
+  - fieldName: "albumId"
+    columnName: "albumId"
+    nullable: true
+  - fieldName: "title"
+    columnName: "title"
+    nullable: true
+  - fieldName: "url"
+    columnName: "url"
+    nullable: true
+  - fieldName: "thumbnailUrl"
+    columnName: "thumbnailUrl"
+    nullable: true
+  - fieldName: "photoPost"
+    columnName: "photoPost"
+    nullable: true
+  migrations: []
+- tableName: "users"
+  fields:
+  - fieldName: "email"
+    columnName: "email"
+    nullable: true
+  - fieldName: "likedinProfileUrl"
+    columnName: "likedinProfileUrl"
+    nullable: true
+  - fieldName: "photoUrl"
+    columnName: "photoUrl"
+    nullable: true
+  - fieldName: "names"
+    columnName: "names"
+    nullable: true
+  migrations: []
diff --git a/app/src/androidTest/java/promise/dbapp/ExampleInstrumentedTest.kt b/app/src/androidTest/java/promise/dbapp/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000..96cce7b
--- /dev/null
+++ b/app/src/androidTest/java/promise/dbapp/ExampleInstrumentedTest.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.dbapp
+
+import androidx.test.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+  @Test
+  fun useAppContext() {
+    // Context of the app under test.
+    val appContext = InstrumentationRegistry.getTargetContext()
+    assertEquals("promise.dbapp", appContext.packageName)
+  }
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..5b5531a
--- /dev/null
+++ b/app/src/main/AndroidManifest.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017, Peter Vincent
+  ~ Licensed under the Apache License, Version 2.0, Android Promise.
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="promise.dbapp">
+
+    <application
+        android:name=".App"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme"
+        tools:ignore="AllowBackup,GoogleAppIndexingWarning">
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/promise/base/AppDatabase.kt b/app/src/main/java/promise/base/AppDatabase.kt
new file mode 100644
index 0000000..cc7b808
--- /dev/null
+++ b/app/src/main/java/promise/base/AppDatabase.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.base
+
+import promise.base.comment.Like
+import promise.base.comment.PostComment
+import promise.base.photo.Photo
+import promise.base.post.Post
+import promise.base.session.User
+import promise.base.todo.Todo
+import promise.commons.data.log.LogUtil
+import promise.database.DatabaseEntity
+import promise.db.FastDatabase
+import promise.db.PromiseDatabase
+import promise.utils.Visitor
+
+@DatabaseEntity(
+    persistableEntities = [
+      PostComment::class,
+      Photo::class,
+      Post::class,
+      Todo::class,
+      Like::class,
+      User::class
+    ],
+    version = 2
+)
+abstract class AppDatabase(fastDatabase: FastDatabase)
+  : PromiseDatabase(fastDatabase) {
+
+  init {
+    fastDatabase.setErrorHandler {
+      LogUtil.e(TAG, "database error: ${it.path}")
+    }
+    fastDatabase.fallBackToDestructiveMigration()
+  }
+
+  //abstract fun getPostCommentsDao(): PostCommentDao
+
+  companion object {
+    val TAG: String = LogUtil.makeTag(AppDatabase::class.java)
+  }
+}
diff --git a/app/src/main/java/promise/base/AppTypeConverter.kt b/app/src/main/java/promise/base/AppTypeConverter.kt
new file mode 100644
index 0000000..174812a
--- /dev/null
+++ b/app/src/main/java/promise/base/AppTypeConverter.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.base
+
+import promise.database.TypeConverter
+import java.util.*
+
+@TypeConverter
+class AppTypeConverter {
+
+  fun dateToString(date: Date?): String = (date ?: Date()).time.toString()
+
+  fun stringToDate(data: String): Date = Date(data.toLong())
+
+  fun toUniqueId(data: String): ID = ID().apply { id = data }
+
+  fun toString(data: ID?): String = data?.id ?: ""
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/promise/base/ID.kt b/app/src/main/java/promise/base/ID.kt
new file mode 100644
index 0000000..5ac2388
--- /dev/null
+++ b/app/src/main/java/promise/base/ID.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.base
+
+import android.os.Parcel
+import android.os.Parcelable
+
+class ID() : Parcelable {
+   var id: String? = ""
+
+  constructor(parcel: Parcel) : this() {
+    id = parcel.readString()
+  }
+
+  override fun writeToParcel(parcel: Parcel, flags: Int) {
+    parcel.writeString(id)
+  }
+
+  override fun describeContents(): Int = 0
+
+  companion object CREATOR : Parcelable.Creator<ID> {
+    override fun createFromParcel(parcel: Parcel): ID = ID(parcel)
+    override fun newArray(size: Int): Array<ID?> = arrayOfNulls(size)
+  }
+}
diff --git a/app/src/main/java/promise/base/comment/Like.java b/app/src/main/java/promise/base/comment/Like.java
new file mode 100644
index 0000000..cf1ff9a
--- /dev/null
+++ b/app/src/main/java/promise/base/comment/Like.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.base.comment;
+
+import android.annotation.SuppressLint;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import androidx.annotation.NonNull;
+
+import promise.base.ID;
+import promise.base.post.Post;
+import promise.commons.model.Identifiable;
+import promise.database.Entity;
+import promise.database.HasOne;
+import promise.database.PrimaryKeyAutoIncrement;
+
+@Entity
+public class Like implements Identifiable<Integer>, Parcelable {
+  private ID uId;
+
+  @HasOne
+  private Post post;
+
+  @PrimaryKeyAutoIncrement
+  private int id;
+
+  private String type;
+
+  public String getType() {
+    return type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  @NonNull
+  @Override
+  public String toString() {
+    return "Like{" +
+        "uId=" + uId +
+        ", post=" + post +
+        ", id=" + id +
+        ", type='" + type + '\'' +
+        '}';
+  }
+
+  public ID getUId() {
+    return uId;
+  }
+
+  public void setUId(ID uId) {
+    this.uId = uId;
+  }
+
+  public Post getPost() {
+    return post;
+  }
+
+  public void setPost(Post post) {
+    this.post = post;
+  }
+
+  @Override
+  public Integer getId() {
+    return id;
+  }
+
+  @Override
+  public void setId(Integer integer) {
+    this.id = integer;
+  }
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeParcelable(this.uId, flags);
+    dest.writeParcelable(this.post, flags);
+    dest.writeInt(this.id);
+    dest.writeString(this.type);
+  }
+
+  public Like() {
+  }
+
+  protected Like(Parcel in) {
+    this.uId = in.readParcelable(ID.class.getClassLoader());
+    this.post = in.readParcelable(Post.class.getClassLoader());
+    this.id = in.readInt();
+    this.type = in.readString();
+  }
+
+  public static final Parcelable.Creator<Like> CREATOR = new Parcelable.Creator<Like>() {
+    @Override
+    public Like createFromParcel(Parcel source) {
+      return new Like(source);
+    }
+
+    @Override
+    public Like[] newArray(int size) {
+      return new Like[size];
+    }
+  };
+}
diff --git a/app/src/main/java/promise/base/comment/PostComment.java b/app/src/main/java/promise/base/comment/PostComment.java
new file mode 100644
index 0000000..e019ef2
--- /dev/null
+++ b/app/src/main/java/promise/base/comment/PostComment.java
@@ -0,0 +1,136 @@
+package promise.base.comment;
+
+import android.annotation.SuppressLint;
+import android.os.Parcel;
+
+import androidx.annotation.NonNull;
+
+import org.jetbrains.annotations.NotNull;
+
+import promise.base.ID;
+import promise.base.post.Post;
+import promise.database.Entity;
+import promise.database.HasOne;
+import promise.db.ActiveRecord;
+
+@Entity(
+    generateRelations = false
+)
+public class PostComment extends ActiveRecord<PostComment> {
+  private String name;
+  private ID uId;
+  private String body;
+  private String email;
+
+  private String postCommentId = "";
+
+  @HasOne
+  private Post post;
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getBody() {
+    return body;
+  }
+
+  public void setBody(String body) {
+    this.body = body;
+  }
+
+  public String getEmail() {
+    return email;
+  }
+
+  public void setEmail(String email) {
+    this.email = email;
+  }
+
+  public Post getPost() {
+    return post;
+  }
+
+  public void setPost(Post post) {
+    this.post = post;
+  }
+
+  public String getPostCommentId() {
+    return postCommentId;
+  }
+
+  public void setPostCommentId(String postCommentId) {
+    this.postCommentId = postCommentId;
+  }
+
+  @NonNull
+  @Override
+  public String toString() {
+    return
+        "Comment{" +
+            "name = '" + name + '\'' +
+            ",id = '" + uId + '\'' +
+            ",body = '" + body + '\'' +
+            ",email = '" + email + '\'' +
+            "}";
+  }
+
+  @NotNull
+  @Override
+  public PostComment getEntity() {
+    return this;
+  }
+
+  public ID getUId() {
+    return uId;
+  }
+
+  public void setUId(ID uId) {
+    this.uId = uId;
+  }
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    super.writeToParcel(dest, flags);
+    dest.writeString(this.name);
+    dest.writeParcelable(this.uId, flags);
+    dest.writeString(this.body);
+    dest.writeString(this.email);
+    dest.writeString(this.postCommentId);
+    dest.writeParcelable(this.post, flags);
+  }
+
+  public PostComment() {
+  }
+
+  protected PostComment(Parcel in) {
+    super(in);
+    this.name = in.readString();
+    this.uId = in.readParcelable(ID.class.getClassLoader());
+    this.body = in.readString();
+    this.email = in.readString();
+    this.postCommentId = in.readString();
+    this.post = in.readParcelable(Post.class.getClassLoader());
+  }
+
+  public static final Creator<PostComment> CREATOR = new Creator<PostComment>() {
+    @Override
+    public PostComment createFromParcel(Parcel source) {
+      return new PostComment(source);
+    }
+
+    @Override
+    public PostComment[] newArray(int size) {
+      return new PostComment[size];
+    }
+  };
+}
diff --git a/app/src/main/java/promise/base/comment/PostCommentDao.java b/app/src/main/java/promise/base/comment/PostCommentDao.java
new file mode 100644
index 0000000..d702236
--- /dev/null
+++ b/app/src/main/java/promise/base/comment/PostCommentDao.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.base.comment;
+
+import java.util.List;
+
+import promise.database.DAO;
+import promise.db.criteria.Criteria;
+
+@DAO
+public interface PostCommentDao {
+
+  List<PostCommentToReplyRelation> getPostComments(Criteria criteria);
+
+}
diff --git a/app/src/main/java/promise/base/comment/PostCommentToReplyRelation.java b/app/src/main/java/promise/base/comment/PostCommentToReplyRelation.java
new file mode 100644
index 0000000..307f599
--- /dev/null
+++ b/app/src/main/java/promise/base/comment/PostCommentToReplyRelation.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.base.comment;
+
+import java.util.List;
+
+import promise.database.Child;
+import promise.database.Parent;
+import promise.database.Relation;
+
+@Relation
+public class PostCommentToReplyRelation {
+
+  @Parent
+  private PostComment postComment;
+
+  @Child(fieldRelatedToParent = "postCommentId")
+  private List<PostComment> postCommentReplies;
+
+  public PostComment getPostComment() {
+    return postComment;
+  }
+
+  public void setPostComment(PostComment postComment) {
+    this.postComment = postComment;
+  }
+
+  public List<PostComment> getPostCommentReplies() {
+    return postCommentReplies;
+  }
+
+  public void setPostCommentReplies(List<PostComment> postCommentReplies) {
+    this.postCommentReplies = postCommentReplies;
+  }
+}
diff --git a/app/src/main/java/promise/base/photo/Photo.kt b/app/src/main/java/promise/base/photo/Photo.kt
new file mode 100644
index 0000000..2bc0e13
--- /dev/null
+++ b/app/src/main/java/promise/base/photo/Photo.kt
@@ -0,0 +1,47 @@
+package promise.base.photo
+
+import android.os.Parcel
+import android.os.Parcelable
+import promise.base.post.Post
+import promise.database.Entity
+import promise.database.HasOne
+import promise.db.ActiveRecord
+
+@Entity
+class Photo() : ActiveRecord<Photo>() {
+  var albumId: Int? = null
+  var title: String? = null
+  var url: String? = null
+  var thumbnailUrl: String? = null
+
+  @HasOne
+  var photoPost: Post? = null
+
+  constructor(parcel: Parcel) : this() {
+    albumId = parcel.readValue(Int::class.java.classLoader) as? Int
+    title = parcel.readString()
+    url = parcel.readString()
+    thumbnailUrl = parcel.readString()
+    photoPost = parcel.readParcelable(Post::class.java.classLoader)
+  }
+
+  override fun getEntity(): Photo = this
+
+  override fun writeToParcel(parcel: Parcel, flags: Int) {
+    super.writeToParcel(parcel, flags)
+    parcel.writeValue(albumId)
+    parcel.writeString(title)
+    parcel.writeString(url)
+    parcel.writeString(thumbnailUrl)
+    parcel.writeParcelable(photoPost, flags)
+  }
+
+  override fun describeContents(): Int = 0
+
+  companion object CREATOR : Parcelable.Creator<Photo> {
+    override fun createFromParcel(parcel: Parcel): Photo = Photo(parcel)
+    override fun newArray(size: Int): Array<Photo?> = arrayOfNulls(size)
+  }
+
+}
+
diff --git a/app/src/main/java/promise/base/post/Post.java b/app/src/main/java/promise/base/post/Post.java
new file mode 100644
index 0000000..0ed763f
--- /dev/null
+++ b/app/src/main/java/promise/base/post/Post.java
@@ -0,0 +1,190 @@
+package promise.base.post;
+
+import android.annotation.SuppressLint;
+import android.os.Parcel;
+
+import androidx.annotation.NonNull;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import promise.base.ID;
+import promise.base.comment.Like;
+import promise.base.comment.PostComment;
+import promise.base.photo.Photo;
+import promise.database.ColumnInfo;
+import promise.database.Entity;
+import promise.database.HasMany;
+import promise.db.ActiveRecord;
+
+@Entity
+public class Post extends ActiveRecord<Post> {
+
+  @ColumnInfo(unique = true)
+  private ID uId;
+
+  @ColumnInfo(columnName = "ttl", length = 40, unique = true)
+  private String title;
+  private String body;
+  private int userId;
+
+  private int numberOfViews;
+  private Date publishedDate;
+  @HasMany
+  private List<PostComment> comments;
+
+  @HasMany
+  private List<Photo> photos;
+  @HasMany
+  private List<Like> likes;
+
+  public int getNumberOfViews() {
+    return numberOfViews;
+  }
+
+  public void setNumberOfViews(int numberOfViews) {
+    this.numberOfViews = numberOfViews;
+  }
+
+  @NonNull
+  @Override
+  public String toString() {
+    return "Post{" +
+        "uId=" + uId +
+        ", title='" + title + '\'' +
+        ", body='" + body + '\'' +
+        ", userId=" + userId +
+        ", comments=" + comments +
+        ", photos=" + photos +
+        '}';
+  }
+
+  public String getTitle() {
+    return title;
+  }
+
+  public void setTitle(String title) {
+    this.title = title;
+  }
+
+  public String getBody() {
+    return body;
+  }
+
+  public void setBody(String body) {
+    this.body = body;
+  }
+
+  public int getUserId() {
+    return userId;
+  }
+
+  public void setUserId(int userId) {
+    this.userId = userId;
+  }
+
+  public ID getUId() {
+    return uId;
+  }
+
+  public void setUId(ID uId) {
+    this.uId = uId;
+  }
+
+  public ID getuId() {
+    return uId;
+  }
+
+  public void setuId(ID uId) {
+    this.uId = uId;
+  }
+
+  public List<PostComment> getComments() {
+    return comments;
+  }
+
+  public void setComments(List<PostComment> comments) {
+    this.comments = comments;
+  }
+
+  public List<Photo> getPhotos() {
+    return photos;
+  }
+
+  public void setPhotos(List<Photo> photos) {
+    this.photos = photos;
+  }
+
+  public List<Like> getLikes() {
+    return likes;
+  }
+
+  public void setLikes(List<Like> likes) {
+    this.likes = likes;
+  }
+
+  @NotNull
+  @Override
+  public Post getEntity() {
+    return this;
+  }
+
+  public Date getPublishedDate() {
+    return publishedDate;
+  }
+
+  public void setPublishedDate(Date publishedDate) {
+    this.publishedDate = publishedDate;
+  }
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    super.writeToParcel(dest, flags);
+    dest.writeParcelable(this.uId, flags);
+    dest.writeString(this.title);
+    dest.writeString(this.body);
+    dest.writeInt(this.userId);
+    dest.writeInt(this.numberOfViews);
+    dest.writeLong(this.publishedDate != null ? this.publishedDate.getTime() : -1);
+    dest.writeTypedList(this.comments);
+    dest.writeTypedList(this.photos);
+    dest.writeTypedList(this.likes);
+  }
+
+  public Post() {
+  }
+
+  protected Post(Parcel in) {
+    super(in);
+    this.uId = in.readParcelable(ID.class.getClassLoader());
+    this.title = in.readString();
+    this.body = in.readString();
+    this.userId = in.readInt();
+    this.numberOfViews = in.readInt();
+    long tmpPublishedDate = in.readLong();
+    this.publishedDate = tmpPublishedDate == -1 ? null : new Date(tmpPublishedDate);
+    this.comments = in.createTypedArrayList(PostComment.CREATOR);
+    this.photos = in.createTypedArrayList(Photo.CREATOR);
+    this.likes = in.createTypedArrayList(Like.CREATOR);
+  }
+
+  public static final Creator<Post> CREATOR = new Creator<Post>() {
+    @Override
+    public Post createFromParcel(Parcel source) {
+      return new Post(source);
+    }
+
+    @Override
+    public Post[] newArray(int size) {
+      return new Post[size];
+    }
+  };
+}
diff --git a/app/src/main/java/promise/base/post/PostRepository.kt b/app/src/main/java/promise/base/post/PostRepository.kt
new file mode 100644
index 0000000..0bb2aef
--- /dev/null
+++ b/app/src/main/java/promise/base/post/PostRepository.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.base.post
+
+import promise.base.ID
+import promise.base.comment.PostComment
+import promise.model.IdentifiableList
+import javax.inject.Inject
+import javax.inject.Singleton
+
+interface PostRepository {
+
+  fun savePost(post: Post)
+
+  fun getPosts(): List<Post>
+
+  fun deletePosts()
+}
+
+@Singleton
+class PostRepositoryImpl
+@Inject
+constructor(
+    private var postRelationsDao: PostRelationsDao,
+    private var postsTable: PostsTable) : PostRepository {
+  init {
+    val posts = IdentifiableList(promise.commons.model.List.generate(5) {
+      Post().apply {
+        uId = ID().apply {
+          id = it.toString()
+        }
+        title = "post".plus(it)
+        body = "body".plus(it)
+        userId = it
+        comments = promise.commons.model.List.generate(4) {
+          PostComment().apply {
+            name = "nm".repeat(it)
+            uId = ID().apply {
+              id = (it + 1).toString()
+            }
+            body = "hbytcvbcrxgfvbtrxt"
+            email = "ejmail;jgfccghcfcvhbhcgvb"
+          }
+        }
+      }
+    })
+
+    postRelationsDao.saveWithComments(posts)
+  }
+
+  override fun savePost(post: Post) {
+    postsTable.save(post)
+  }
+
+  override fun getPosts(): List<Post> = postRelationsDao.listWithComments()
+
+  override fun deletePosts() {
+    val persons = getPosts()
+    persons.forEach {
+      postRelationsDao.deleteComments(it)
+      it.delete()
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/promise/base/session/User.kt b/app/src/main/java/promise/base/session/User.kt
new file mode 100644
index 0000000..85e97cc
--- /dev/null
+++ b/app/src/main/java/promise/base/session/User.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.base.session
+
+import android.annotation.SuppressLint
+import promise.database.AddedEntity
+import promise.database.Entity
+import promise.db.ActiveRecord
+
+@SuppressLint("ParcelCreator")
+@Entity
+@AddedEntity(fromVersion = 1, toVersion = 2)
+class User: ActiveRecord<User>() {
+
+  var email: String = ""
+  var likedinProfileUrl = ""
+  var photoUrl = ""
+  var names = ""
+  override fun getEntity(): User = this
+}
\ No newline at end of file
diff --git a/app/src/main/java/promise/base/todo/Todo.java b/app/src/main/java/promise/base/todo/Todo.java
new file mode 100644
index 0000000..5886ae4
--- /dev/null
+++ b/app/src/main/java/promise/base/todo/Todo.java
@@ -0,0 +1,97 @@
+package promise.base.todo;
+
+import android.annotation.SuppressLint;
+
+import org.jetbrains.annotations.NotNull;
+
+import promise.base.photo.Photo;
+import promise.database.Entity;
+import promise.database.HasOne;
+import promise.db.ActiveRecord;
+
+@SuppressLint("ParcelCreator")
+@Entity
+public class Todo extends ActiveRecord<Todo> {
+  private int uid;
+  private boolean completed;
+
+  private String title;
+
+  private long timeStarted;
+  private long timeFinished;
+  private String description;
+  @HasOne
+  private Photo photo;
+
+  public long getTimeFinished() {
+    return timeFinished;
+  }
+
+  public void setTimeFinished(long timeFinished) {
+    this.timeFinished = timeFinished;
+  }
+
+  public long getTimeStarted() {
+    return timeStarted;
+  }
+
+  public void setTimeStarted(long timeStarted) {
+    this.timeStarted = timeStarted;
+  }
+
+  public int getUid() {
+    return uid;
+  }
+
+  public void setUid(int uid) {
+    this.uid = uid;
+  }
+
+  public Photo getPhoto() {
+    return photo;
+  }
+
+  public void setPhoto(Photo photo) {
+    this.photo = photo;
+  }
+
+  public boolean isCompleted() {
+    return completed;
+  }
+
+  public void setCompleted(boolean completed) {
+    this.completed = completed;
+  }
+
+  public String getTitle() {
+    return title;
+  }
+
+  public void setTitle(String title) {
+    this.title = title;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  @Override
+  public String toString() {
+    return
+        "Todo{" +
+            "id = '" + uid + '\'' +
+            ",completed = '" + completed + '\'' +
+            ",title = '" + title + '\'' +
+            "}";
+  }
+
+  @NotNull
+  @Override
+  public Todo getEntity() {
+    return this;
+  }
+}
diff --git a/app/src/main/java/promise/dbapp/ActivityBuildersModule.kt b/app/src/main/java/promise/dbapp/ActivityBuildersModule.kt
new file mode 100644
index 0000000..fd9ece4
--- /dev/null
+++ b/app/src/main/java/promise/dbapp/ActivityBuildersModule.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.dbapp
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class ActivityBuildersModule {
+  @ContributesAndroidInjector(
+      modules = [
+        ReposModule::class
+      ]
+  )
+  abstract fun contributeMainActivity(): MainActivity
+}
\ No newline at end of file
diff --git a/app/src/main/java/promise/dbapp/App.kt b/app/src/main/java/promise/dbapp/App.kt
new file mode 100644
index 0000000..1ec7fb2
--- /dev/null
+++ b/app/src/main/java/promise/dbapp/App.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.dbapp
+
+import dagger.android.AndroidInjector
+import dagger.android.support.DaggerApplication
+import promise.commons.AndroidPromise
+
+class App : DaggerApplication() {
+  override fun onCreate() {
+    super.onCreate()
+    AndroidPromise.init(this, BuildConfig.DEBUG)
+  }
+
+  override fun applicationInjector(): AndroidInjector<out DaggerApplication> =
+      DaggerAppComponent.factory().create(this)
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/promise/dbapp/AppComponent.kt b/app/src/main/java/promise/dbapp/AppComponent.kt
new file mode 100644
index 0000000..181ff15
--- /dev/null
+++ b/app/src/main/java/promise/dbapp/AppComponent.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.dbapp
+
+import dagger.BindsInstance
+import dagger.Component
+import dagger.android.AndroidInjector
+import dagger.android.support.AndroidSupportInjectionModule
+import javax.inject.Singleton
+
+@Component(
+    modules = [
+      AndroidSupportInjectionModule::class,
+      ActivityBuildersModule::class,
+      DatabaseDependencies::class
+    ]
+)
+@Singleton
+interface AppComponent : AndroidInjector<App> {
+
+  @Component.Factory
+  interface Builder {
+    fun create(@BindsInstance app: App): AppComponent
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/promise/dbapp/DatabaseDependencies.kt b/app/src/main/java/promise/dbapp/DatabaseDependencies.kt
new file mode 100644
index 0000000..3c8492f
--- /dev/null
+++ b/app/src/main/java/promise/dbapp/DatabaseDependencies.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.dbapp
+
+import dagger.Module
+import dagger.Provides
+import promise.base.AppDatabaseImpl
+import promise.base.post.PostRelationsDao
+import promise.base.post.PostsTable
+import javax.inject.Singleton
+
+@Module
+object DatabaseDependencies {
+
+  @Provides
+  @Singleton
+  @JvmStatic
+  fun provideAppDatabase(): AppDatabaseImpl = AppDatabaseImpl.createDatabase("blog_db")
+
+  @Provides
+  @JvmStatic
+  fun providePostRelationsDao(appDatabase: AppDatabaseImpl): PostRelationsDao =
+      appDatabase.postRelationsDao
+
+  @Provides
+  @JvmStatic
+  fun providePostTable(appDatabase: AppDatabaseImpl): PostsTable =
+      appDatabase.postsTable
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/promise/dbapp/MainActivity.kt b/app/src/main/java/promise/dbapp/MainActivity.kt
new file mode 100644
index 0000000..f6f418e
--- /dev/null
+++ b/app/src/main/java/promise/dbapp/MainActivity.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.dbapp
+
+import android.os.Bundle
+import com.google.android.material.snackbar.Snackbar
+import dagger.android.support.DaggerAppCompatActivity
+import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.android.synthetic.main.content_main.*
+import promise.base.post.PostRepository
+import javax.inject.Inject
+
+class MainActivity : DaggerAppCompatActivity() {
+
+  @Inject
+  lateinit var postRepository: PostRepository
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_main)
+    setSupportActionBar(toolbar)
+
+    fab.setOnClickListener { view ->
+      Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+          .setAction("Action", null).show()
+    }
+  }
+
+  override fun onPostCreate(savedInstanceState: Bundle?) {
+    super.onPostCreate(savedInstanceState)
+    showInfo()
+    clear_button.setOnClickListener {
+      deleteInfo()
+      showInfo()
+    }
+  }
+
+  private fun showInfo() {
+    val persons = postRepository.getPosts()
+    complex_values_textview.text = persons.toString()
+  }
+
+  private fun deleteInfo() {
+    postRepository.deletePosts()
+  }
+
+}
diff --git a/app/src/main/java/promise/dbapp/ReposModule.kt b/app/src/main/java/promise/dbapp/ReposModule.kt
new file mode 100644
index 0000000..f2eb78a
--- /dev/null
+++ b/app/src/main/java/promise/dbapp/ReposModule.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.dbapp
+
+import dagger.Binds
+import dagger.Module
+import promise.base.post.PostRepository
+import promise.base.post.PostRepositoryImpl
+
+@Module
+abstract class ReposModule {
+
+  @Binds
+  abstract fun bindPostsRepository(postRepositoryImpl: PostRepositoryImpl): PostRepository
+}
\ No newline at end of file
diff --git a/app/src/main/java/promise/dbapp/test/PostCommentsDaoImpl.java b/app/src/main/java/promise/dbapp/test/PostCommentsDaoImpl.java
new file mode 100644
index 0000000..2c4ea97
--- /dev/null
+++ b/app/src/main/java/promise/dbapp/test/PostCommentsDaoImpl.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.dbapp.test;
+
+import android.database.Cursor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import promise.base.comment.PostComment;
+import promise.base.comment.PostCommentDao;
+import promise.base.comment.PostCommentToReplyRelation;
+import promise.base.comment.PostCommentsTable;
+import promise.db.PromiseDatabase;
+import promise.db.criteria.Criteria;
+import promise.model.IdentifiableList;
+
+public class PostCommentsDaoImpl
+    implements PostCommentDao {
+
+  private PromiseDatabase promiseDatabase;
+
+  public PostCommentsDaoImpl(PromiseDatabase fastDatabase) {
+    this.promiseDatabase = fastDatabase;
+  }
+
+  private PostCommentToReplyRelation getPostCommentToReplyRelation(PostComment postComment) {
+    return new PostCommentToReplyRelation() {{
+      setPostComment(postComment);
+      setPostCommentReplies(new ArrayList<>(
+          promiseDatabase.tableOf(PostComment.class).findAll(
+              PostCommentsTable.postCommentIdColumn.with(
+                  postComment.getId().toString()))));
+    }};
+  }
+
+  @Override
+  public List<PostCommentToReplyRelation> getPostComments(Criteria andCriteria) {
+    Cursor cursor = promiseDatabase.getDatabaseInstance().query(
+        promiseDatabase.tableOf(PostComment.class).queryBuilder()
+            .whereAnd(andCriteria));
+    return getPostCommentToReplyRelationCollection(cursor);
+  }
+
+  private List<PostCommentToReplyRelation> getPostCommentToReplyRelationCollection(Cursor cursor) {
+    IdentifiableList<? extends PostComment> postComments = promiseDatabase.tableOf(PostComment.class).collection(cursor);
+    return postComments.map(this::getPostCommentToReplyRelation);
+  }
+}
diff --git a/app/src/main/java/promise/dbapp/test/TestUtils.java b/app/src/main/java/promise/dbapp/test/TestUtils.java
new file mode 100644
index 0000000..1de702e
--- /dev/null
+++ b/app/src/main/java/promise/dbapp/test/TestUtils.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.dbapp.test;
+
+
+public class TestUtils {
+
+}
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000..9413e02
--- /dev/null
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,47 @@
+<!--
+  ~ Copyright 2017, Peter Vincent
+  ~ Licensed under the Apache License, Version 2.0, Android Promise.
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..bb0d62d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017, Peter Vincent
+  ~ Licensed under the Apache License, Version 2.0, Android Promise.
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#008577"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..ee61dd8
--- /dev/null
+++ b/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017, Peter Vincent
+  ~ Licensed under the Apache License, Version 2.0, Android Promise.
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <include layout="@layout/content_main" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        app:srcCompat="@android:drawable/ic_dialog_email" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/complex_layout.xml b/app/src/main/res/layout/complex_layout.xml
new file mode 100644
index 0000000..10606a7
--- /dev/null
+++ b/app/src/main/res/layout/complex_layout.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017, Peter Vincent
+  ~ Licensed under the Apache License, Version 2.0, Android Promise.
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
new file mode 100644
index 0000000..5234446
--- /dev/null
+++ b/app/src/main/res/layout/content_main.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017, Peter Vincent
+  ~ Licensed under the Apache License, Version 2.0, Android Promise.
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context=".MainActivity"
+    tools:showIn="@layout/activity_main">
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/complex_values_textview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Hello World!" />
+
+        <Button
+            android:id="@+id/clear_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Clear" />
+    </androidx.appcompat.widget.LinearLayoutCompat>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
new file mode 100644
index 0000000..6138539
--- /dev/null
+++ b/app/src/main/res/menu/menu_main.xml
@@ -0,0 +1,23 @@
+<!--
+  ~ Copyright 2017, Peter Vincent
+  ~ Licensed under the Apache License, Version 2.0, Android Promise.
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="promise.dbapp.MainActivity">
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:title="@string/action_settings"
+        app:showAsAction="never" />
+</menu>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..f801df8
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017, Peter Vincent
+  ~ Licensed under the Apache License, Version 2.0, Android Promise.
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..f801df8
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017, Peter Vincent
+  ~ Licensed under the Apache License, Version 2.0, Android Promise.
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..898f3ed
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..dffca36
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..64ba76f
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..dae5e08
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..e5ed465
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..14ed0af
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..b0907ca
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..d8ae031
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..2c18de9
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..beed3cd
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..f7cdf4d
--- /dev/null
+++ b/app/src/main/res/values/colors.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017, Peter Vincent
+  ~ Licensed under the Apache License, Version 2.0, Android Promise.
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <color name="colorPrimary">#008577</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#D81B60</color>
+</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..55ab9c8
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Copyright 2017, Peter Vincent
+  ~ Licensed under the Apache License, Version 2.0, Android Promise.
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <dimen name="fab_margin">16dp</dimen>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..cc69657
--- /dev/null
+++ b/app/src/main/res/values/strings.xml
@@ -0,0 +1,17 @@
+<!--
+  ~ Copyright 2017, Peter Vincent
+  ~ Licensed under the Apache License, Version 2.0, Android Promise.
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <string name="app_name">DBApp</string>
+    <string name="action_settings">Settings</string>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..53a7d87
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,33 @@
+<!--
+  ~ Copyright 2017, Peter Vincent
+  ~ Licensed under the Apache License, Version 2.0, Android Promise.
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
+</resources>
diff --git a/compiler/src/test/java/promise/db/ompiler/ExampleUnitTest.kt b/app/src/test/java/promise/dbapp/ExampleUnitTest.kt
similarity index 93%
rename from compiler/src/test/java/promise/db/ompiler/ExampleUnitTest.kt
rename to app/src/test/java/promise/dbapp/ExampleUnitTest.kt
index 4d0e01c..b68961f 100644
--- a/compiler/src/test/java/promise/db/ompiler/ExampleUnitTest.kt
+++ b/app/src/test/java/promise/dbapp/ExampleUnitTest.kt
@@ -11,12 +11,11 @@
  * limitations under the License.
  */
 
-package promise.db.ompiler
+package promise.dbapp
 
+import org.junit.Assert.assertEquals
 import org.junit.Test
 
-import org.junit.Assert.*
-
 /**
  * Example local unit test, which will execute on the development machine (host).
  *
diff --git a/blueprint.md b/blueprint.md
new file mode 100644
index 0000000..e49c2db
--- /dev/null
+++ b/blueprint.md
@@ -0,0 +1,523 @@
+# Android Promise Database [![](https://jitpack.io/v/android-promise/database.svg)](https://jitpack.io/#android-promise/database)
+ Manage SqLite databases in android with ease
+
+# Table of Contents
+
+**[Sample](##Sample)**<br>
+***[Entity](***Entity)***<br>
+***[Database](###Database)***<br>
+***[TypeConverter](###TypeConverter)***<br>
+***[Relations](###Relations)***<br>
+***[Initialization](###Initialization)***<br>
+***[Migrations](###Migrations)***<br>
+**[Setup](##Setup)**<br>
+**[Next Steps, Credits, Feedback, License](#next-steps)**<br>
+
+## Sample
+### Entity
+Pojo classes to be persisted are annotated with @Entity
+The classes can either implement Identifiable<Integer> or extend from ActiveRecord
+This classes must hava a no args constructor or no constructors at all
+
+> Optionally add the table name in the annotation
+
+#### Photo Class
+```kotlin
+
+@SuppressLint("ParcelCreator")
+@Entity
+class Photo: ActiveRecord<Photo>() {
+	var albumId: Int? = null
+	var title: String? = null
+	var url: String? = null
+	var thumbnailUrl: String? = null
+
+  // denotes a photo has one post
+	@HasOne var post: Post? = null
+
+	override fun getEntity(): Photo {
+		return this
+	}
+
+}
+  
+}
+```
+#### Todo Class
+```java
+
+@SuppressLint("ParcelCreator")
+@Entity
+public class Todo extends ActiveRecord<Todo> {
+	private int uid;
+	private boolean completed;
+	private String title;
+  private int userId;
+  
+  // denotes a todo item has one photo record
+	@HasOne
+  private Photo photo;
+  // include parcelable implementation if extending from ActiveRecord
+  
+}
+```
+#### Post Class
+```java
+
+@SuppressLint("ParcelCreator")
+@Entity
+public class Post extends ActiveRecord<Post> {
+	private ID uId;
+	private String title;
+	private String body;
+	private int userId;
+
+  // denotes a post has many post comments
+	@HasMany
+	private List<PostComment> comments;
+
+  // denotes a post has many photos
+	@HasMany
+	private List<Photo> photos;
+}
+```
+
+> Include correct getter and setter signatures for Java file or generated code will not compile, including fields convertable via type converter and fields marked as relation
+
+> BOOLEAN fields MUST NOT start with `is`
+
+### Database
+Database classe is annotated with @DatabaseEntity and contain a list
+of persistable entity classes
+The class must be abstract and extend from PromiseDatabase
+> **There can only be one database class in a module**
+```kotlin
+@DatabaseEntity(
+    persistableEntities = [
+      PostComment::class,
+      Photo::class,
+      Post::class,
+      Todo::class
+    ]
+)
+abstract class AppDatabase(fastDatabase: FastDatabase)
+  : PromiseDatabase(fastDatabase)
+```
+
+Rebuild your project to generate database implementation
+
+### TypeConverter
+A type converter is a utility that helps to convert fields not directly persistable to persistable,
+For instance the Post entity has named uId with a type
+```kotlin
+data class ID(val id: String)
+```
+To make the uId field persistable, we provide a type converter
+```kotlin
+@TypeConverter
+class AppTypeConverter {
+
+  fun toUniqueId(data: String): ID = ID(data)
+
+  fun toString(data: ID?): String = data?.id ?: ""
+
+}
+```
+A type converter must be annotated with @TypeConverter and contain non static methods that converts between the non persistable type to a string and vice verser
+Conversion methods in a type converter should have only one parameter and must return
+` Type converter is not for fields that are relations`
+**There can only be one type converter in one module**
+
+> Without a type converter provision, the compiler will not generate columns for non persistable fields
+
+### Relations
+
+#### HasOne Relation
+Denotes one entity has one other entity, a sample
+```java
+@Entity
+public class Todo extends ActiveRecord<Todo> {
+  // other fields
+	...
+
+  // denotes this todo has one photo
+  @HasOne
+  private Photo photo;
+}
+```
+To utilize the relation, the compiler will generate a class called TodoRelationsDao with convenient methods, a snippet of generated code below
+```java
+
+public final class TodoRelationsDao {
+  private TodoesTable todoesTable;
+
+  private PhotosTable photosTable;
+
+  private TodoRelationsDao(TodoesTable todoesTable, PhotosTable photosTable) {
+    this.todoesTable = todoesTable;
+    this.photosTable = photosTable;
+  }
+
+  public IdentifiableList<? extends Todo> paginateWithPhotos(int skip, int limit) {
+    IdentifiableList<? extends Todo> todoes = todoesTable.find().paginateDescending(skip, limit);
+    return populateWithPhotos(todoes);
+  }
+
+  ...
+  // other convenient methods
+  ...
+  
+  public Photo getPhoto(Todo todo) {
+    return photosTable.findById(todo.getPhoto().getId());
+  }
+
+}
+```
+Instances of RelationDaos are retrieved from the generated database class
+
+
+#### HasMany Relation
+Denotes one entity has many entities of same type and the other entity has one entity of this type, a sample a post has many post comments and a post comment has one post
+
+Post Entity
+```java
+
+@Entity
+public class Post extends ActiveRecord<Post> {
+  // other fields
+	...
+	@HasMany
+  private List<PostComment> comments;
+}
+
+```
+PostComment Entity
+```java
+@SuppressLint("ParcelCreator")
+@Entity
+public class PostComment extends ActiveRecord<PostComment> {
+  // other fields
+	...
+
+	@HasOne
+  private Post post;
+}
+```
+**Both relations must exist at the same time**
+To utilize the relation, the compiler will generate a class called PostRelationsDao with convenient methods, a snippet of generated code below
+```java
+
+public final class PostRelationsDao {
+  private PostsTable postsTable;
+
+  private PostCommentsTable postCommentsTable;
+
+  private PhotosTable photosTable;
+
+  private PostRelationsDao(PostsTable postsTable, PostCommentsTable postCommentsTable,
+      PhotosTable photosTable) {
+    this.postsTable = postsTable;
+    this.postCommentsTable = postCommentsTable;
+    this.photosTable = photosTable;
+  }
+
+  public IdentifiableList<? extends Post> paginateWithComments(int skip, int limit) {
+    IdentifiableList<? extends Post> posts = postsTable.find().paginateDescending(skip, limit);
+    posts.forEach(new Consumer<Post>() {
+      @Override
+      public void accept(Post post) {
+        post.setComments(new IdentifiableList<>(getComments(post)));
+      }
+    } );
+    return posts;
+  }
+
+  public IdentifiableList<? extends Post> listWithComments() {
+    IdentifiableList<? extends Post> posts = postsTable.findAll();
+    posts.forEach(new Consumer<Post>() {
+      @Override
+      public void accept(Post post) {
+        post.setComments(new IdentifiableList<>(getComments(post)));
+      }
+    } );
+    return posts;
+  }
+  ...
+  // more convenience methods
+}
+```
+Instances of RelationDaos are retrieved from the generated database class
+
+Snippet of RelationDao usage in main activity
+```kotlin
+...
+// generate 5 posts and each post 4 comments
+val posts = IdentifiableList(List.generate(5) {
+      Post().apply {
+        uId = ID(it.toString())
+        title = "post".plus(it)
+        body = "body".plus(it)
+        userId = it
+        comments = List.generate(4) {
+          PostComment().apply {
+            name = "nm".repeat(it)
+            uId = ID((it + 1).toString())
+            body = "hbytcvbcrxgfvbtrxt"
+            email = "ejmail;jgfccghcfcvhbhcgvb"
+          }
+        }
+      }
+    })
+
+  // save the posts
+   postRelationsDao.saveWithComments(posts)
+  // reading the posts
+   val posts1 = postRelationsDao.listWithComments()
+  // display the posts
+   complex_values_textview.text = posts1.toString()
+  // delete comments for each post and then delete the post
+   posts1.forEach {
+     postRelationsDao.deleteComments(it)
+     it.delete()
+   }
+ ...
+```
+
+
+### Initialization
+The compiler generates a database class for creating your database implementation and accesing tables
+and relation daos, sampled code from generated database file below
+
+```java
+ /**
+   * Creates the simplest database with name specified
+   * @Param name the name of the database
+   */
+  public static AppDatabaseImpl createDatabase(String name) {
+    if (initialized) throw new IllegalStateException("Database already created");
+    initialized = true;
+    return new AppDatabaseImpl(FastDatabase.createDatabase(AppDatabaseImpl.class, name, getMigration()));
+  }
+
+  /**
+   * Creates the simplest database with name specified with callback
+   * Callback can be used to pre populate database with records or
+   * set flags like foreign keys
+   * @Param name the name of the database
+   * @Param databaseCreationCallback callback
+   */
+  public static AppDatabaseImpl createDatabase(String name,
+      DatabaseCreationCallback databaseCreationCallback) {
+    if (initialized) throw new IllegalStateException("Database already created");
+    initialized = true;
+    return new AppDatabaseImpl(FastDatabase.createDatabase(AppDatabaseImpl.class, name, getMigration(), databaseCreationCallback));
+  }
+
+  /**
+   * Creates an in memory database, useful for tests
+   */
+  public static AppDatabaseImpl createInMemoryDatabase() {
+    if (initialized) throw new IllegalStateException("Database already created");
+    initialized = true;
+    return new AppDatabaseImpl(FastDatabase.createInMemoryDatabase(AppDatabaseImpl.class));
+  }
+
+  /**
+   * Creates an in memory database, useful for tests
+   * Callback can be used to pre populate database with records or
+   * set flags like foreign keys
+   * @Param databaseCreationCallback callback
+   */
+  public static AppDatabaseImpl createInMemoryDatabase(
+      DatabaseCreationCallback databaseCreationCallback) {
+    if (initialized) throw new IllegalStateException("Database already created");
+    initialized = true;
+    return new AppDatabaseImpl(FastDatabase.createInMemoryDatabase(AppDatabaseImpl.class, databaseCreationCallback));
+  }
+
+  /**
+   * Creates an in memory database, enables calling rx DML functions in the tables
+   */
+  public static AppDatabaseImpl createReactiveInMemoryDatabase() {
+    if (initialized) throw new IllegalStateException("Database already created");
+    initialized = true;
+    return new AppDatabaseImpl(FastDatabase.createInMemoryReactiveDatabase(AppDatabaseImpl.class));
+  }
+
+  /**
+   * Creates an in memory database, enables calling rx DML functions in the tables
+   * Callback can be used to pre populate database with records or
+   * set flags like foreign keys
+   * @Param databaseCreationCallback callback
+   */
+  public static AppDatabaseImpl createReactiveInMemoryDatabase(
+      DatabaseCreationCallback databaseCreationCallback) {
+    if (initialized) throw new IllegalStateException("Database already created");
+    initialized = true;
+    return new AppDatabaseImpl(FastDatabase.createInMemoryReactiveDatabase(AppDatabaseImpl.class, databaseCreationCallback));
+  }
+
+  /**
+   * Creates database, that enables calling rx DML functions in the tables
+   * @Param name name of the database 
+   */
+  public static AppDatabaseImpl createReactiveDatabase(String name) {
+    if (initialized) throw new IllegalStateException("Database already created");
+     initialized = true;
+    return new AppDatabaseImpl(FastDatabase.createReactiveDatabase(AppDatabaseImpl.class, name, getMigration()));
+  }
+
+  /**
+   * Creates database, that enables calling rx DML functions in the tables
+   * Callback can be used to pre populate database with records or
+   * set flags like foreign keys
+   * @Param name name of the database 
+   * @Param databaseCreationCallback callback
+   */
+  public static AppDatabaseImpl createReactiveDatabase(String name,
+      DatabaseCreationCallback databaseCreationCallback) {
+    if (initialized) throw new IllegalStateException("Database already created");
+     initialized = true;
+    return new AppDatabaseImpl(FastDatabase.createReactiveDatabase(AppDatabaseImpl.class, name, getMigration(), databaseCreationCallback));
+  }
+```
+
+
+### Migrations
+
+#### Migrations For Entities
+Adding an entity to be persisted to the database from version 1 to version 2 of the database
+Annotate it with AddedEntity
+##### Sales Entity
+```java
+
+@Entity
+// register it for migration from version 1 of database to version 2
+@AddedEntity(fromVersion = 1, toVersion = 2)
+public class Sales extends ActiveRecord<Sales> {
+
+  private String salesId;
+  private double salePrice;
+
+  @Text(columnName = "descrip", nullable = false)
+  private String description;
+
+  @Index
+  private String pickupDate;
+  // other fields follow
+
+  public Sales() {
+  }
+}
+  // getters and setters and parcelable implementation
+```
+And then add the new entity to the database and upgrade database version to 2
+
+```kotlin
+
+@DatabaseEntity(
+   
+    persistableEntities = [
+      /// other entities
+      Sales::class
+    ],
+    version = 2
+)
+
+abstract class AppDatabase(fastDatabase: FastDatabase) : PromiseDatabase(fastDatabas) 
+```
+
+Adding columns to an existing entity, annotate the new field with Migrate, a migration will be generated by the compiler >
+
+#### Migrations For Columns
+Annotate the added field with @Migrate and include fromVersion and toVersion
+If a field is to pass multiple migrations, annotate it with @Migrations and add the migrate annotations in the 
+migrations annotation
+##### Sales Entity
+```java
+...
+  // added new field
+  @Migrate(fromVersion = 2, toVersion = 3, action = MigrationOptions.CREATE)
+  private String status;
+...
+```
+
+## Setup
+##### Project level build.gradle
+Add jitpack repository
+```
+allprojects {
+    repositories {
+        ...
+        maven { url 'https://jitpack.io' }
+    }
+}
+
+```
+##### Module level build.gradle
+Compile with java 8, add rxJava dependency of using rx DML functions in the tables
+```
+android {
+    ...
+    compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_8
+            targetCompatibility JavaVersion.VERSION_1_8
+        }
+}
+
+dependencies {
+     ...
+     implementation 'com.github.android-promise.database:database:1.0.3-alpha5'
+     kapt 'com.github.android-promise.database:compiler:1.0.3-alpha5'
+     implementation 'com.github.android-promise:commons:1.1-alpha03'
+}
+```
+##### Initialization
+Initialize Promise in your main application class
+
+##### App.java
+```java
+public class App extends Application {
+  @Override
+  public void onCreate() {
+    super.onCreate();
+    AndroidPromise.init(this, BuildConfig.DEBUG);
+  }
+
+  @Override
+  public void onTerminate() {
+    super.onTerminate();
+    AndroidPromise.instance().terminate();
+  }
+}
+```
+
+## New features on the way
+watch this repo to stay updated 
+
+# Developed By
+* Peter Vincent - [Portfolio](https://dev4vin.github.io/info)
+
+# Donations
+If you'd like to support this library development, you could buy me coffee here:
+* [![Become a Patreon]("https://c6.patreon.com/becomePatronButton.bundle.js")](https://www.patreon.com/bePatron?u=31932751)
+
+#### Pull requests / Issues / Improvement requests
+Feel free to contribute and ask!<br/>
+
+# License
+
+    Copyright 2018 Android Promise Database
+
+    Licensed under the Apache License, Version 2.0 Android Promise;
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
diff --git a/build.gradle b/build.gradle
index 1047ed5..28fc2b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.4.10'
     ext.supportLibVersion = "28.0.0"
 
     repositories {
@@ -23,7 +23,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:3.6.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
@@ -45,6 +45,18 @@ allprojects {
 }
 
 subprojects { subProject ->
+//    apply plugin: 'checkstyle'
+//
+//    task checkstyle(type: Checkstyle) {
+//        description 'Runs Checkstyle inspection .'
+//        group = 'database'
+//        configFile rootProject.file('checkstyle.xml')
+//        ignoreFailures false
+//        showViolations true
+//        classpath = files()
+//        exclude '**/*.kt'
+//        source 'src/main/java'
+//    }
 
     configurations.all { configuration ->
         // Workaround for kapt bug with MPP dependencies
@@ -54,6 +66,11 @@ subprojects { subProject ->
             attributes.attribute(Usage.USAGE_ATTRIBUTE, subProject.objects.named(Usage.class, Usage.JAVA_RUNTIME))
         }
     }
+
+//     // check code style after project evaluation
+//    afterEvaluate {
+//        check.dependsOn('checkstyle')
+//    }
 }
 
 task clean(type: Delete) {
diff --git a/checkstyle.xml b/checkstyle.xml
new file mode 100644
index 0000000..5d58444
--- /dev/null
+++ b/checkstyle.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+  <module name="SuppressWarningsFilter"/>
+  <module name="NewlineAtEndOfFile"/>
+  <module name="FileLength"/>
+  <module name="FileTabCharacter"/>
+
+  <!-- Trailing spaces -->
+  <module name="RegexpSingleline">
+    <property name="format" value="\s+$"/>
+    <property name="message" value="Line has trailing spaces."/>
+  </module>
+
+  <!-- Space after 'for' and 'if' -->
+  <module name="RegexpSingleline">
+    <property name="format" value="^\s*(for|if)\b[^ ]"/>
+    <property name="message" value="Space needed before opening parenthesis."/>
+  </module>
+
+  <!-- For each spacing -->
+  <module name="RegexpSingleline">
+    <property name="format" value="^\s*for \(.*?([^ ]:|:[^ ])"/>
+    <property name="message" value="Space needed around ':' character."/>
+  </module>
+
+  <module name="TreeWalker">
+    <!-- Checks for Javadoc comments.                     -->
+    <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+    <!--module name="JavadocMethod"/-->
+    <!--module name="JavadocType"/-->
+    <!--module name="JavadocVariable"/-->
+    <module name="JavadocStyle">
+      <property name="checkFirstSentence" value="false"/>
+    </module>
+
+    <!-- See http://checkstyle.sf.net/config_naming.html -->
+    <!--<module name="ConstantName"/>-->
+    <!--<module name="PackageName"/>-->
+    <module name="LocalFinalVariableName"/>
+    <module name="LocalVariableName"/>
+    <module name="MemberName">
+      <property name="format" value="^[a-z]{2,}\S"/>
+    </module>
+    <module name="MethodName"/>
+    <module name="ParameterName"/>
+    <module name="StaticVariableName">
+      <property name="format" value="^[a-z]{2,}\S"/>
+    </module>
+    <module name="TypeName"/>
+
+    <!-- See http://checkstyle.sf.net/config_import.html -->
+    <module name="AvoidStarImport"/>
+    <module name="IllegalImport"/>
+    <!-- defaults to sun.* packages -->
+    <module name="RedundantImport"/>
+    <module name="UnusedImports">
+      <property name="processJavadoc" value="true"/>
+    </module>
+
+    <!-- Checks for Size Violations.                    -->
+    <!-- See http://checkstyle.sf.net/config_sizes.html -->
+    <module name="LineLength">
+      <property name="max" value="120"/>
+    </module>
+    <module name="MethodLength">
+      <property name="max" value="200"/>
+    </module>
+
+    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+    <!--<module name="NoWhitespaceAfter"/>-->
+    <!--<module name="NoWhitespaceBefore"/>-->
+    <!--<module name="EmptyForIteratorPad"/>-->
+    <module name="GenericWhitespace"/>
+    <module name="MethodParamPad"/>
+    <module name="OperatorWrap"/>
+    <module name="ParenPad"/>
+    <module name="TypecastParenPad"/>
+    <module name="WhitespaceAfter"/>
+    <module name="WhitespaceAround">
+      <property name="tokens"
+          value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN,
+          COLON, DIV, DIV_ASSIGN, DO_WHILE, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_CATCH,
+          LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
+          LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS,
+          MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL, SLIST,
+          SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND"/>
+    </module>
+
+    <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+    <module name="ModifierOrder"/>
+    <module name="RedundantModifier"/>
+
+    <!-- See http://checkstyle.sf.net/config_blocks.html -->
+    <!--module name="EmptyBlock"/-->
+    <!--<module name="NeedBraces"/>-->
+    <module name="AvoidNestedBlocks"/>
+    <module name="LeftCurly"/>
+    <module name="RightCurly"/>
+
+    <!-- Checks for common coding problems               -->
+    <!-- See http://checkstyle.sf.net/config_coding.html -->
+    <!--module name="AvoidInlineConditionals"/-->
+    <!--module name="HiddenField"/-->
+    <!--module name="InnerAssignment"/-->
+    <!--module name="MissingSwitchDefault"/-->
+    <!--<module name="RedundantThrows"/>-->
+    <!--<module name="EqualsAvoidNull"/>-->
+
+    <module name="CovariantEquals"/>
+    <module name="EmptyStatement"/>
+    <module name="EqualsHashCode"/>
+    <module name="IllegalInstantiation"/>
+    <module name="SimplifyBooleanExpression"/>
+    <module name="SimplifyBooleanReturn"/>
+    <module name="MagicNumber">
+      <property name="ignoreHashCodeMethod" value="true"/>
+    </module>
+
+    <!-- See http://checkstyle.sf.net/config_design.html -->
+    <!--module name="DesignForExtension"/-->
+    <!--<module name="FinalClass"/>-->
+    <!--module name="VisibilityModifier"/-->
+    <module name="HideUtilityClassConstructor"/>
+    <module name="InterfaceIsType"/>
+
+    <!-- See http://checkstyle.sf.net/config_misc.html -->
+    <!--module name="FinalParameters"/-->
+    <!--module name="TodoComment"/-->
+    <module name="UpperEll"/>
+    <module name="ArrayTypeStyle"/>
+
+    <!-- Make the @SuppressWarnings annotations available to Checkstyle -->
+    <module name="SuppressWarningsHolder"/>
+  </module>
+</module>
\ No newline at end of file
diff --git a/commons/bin/main/promise/db/ColumnInfo.kt b/commons/bin/main/promise/db/ColumnInfo.kt
index 55f314c..483a6cd 100644
--- a/commons/bin/main/promise/db/ColumnInfo.kt
+++ b/commons/bin/main/promise/db/ColumnInfo.kt
@@ -85,7 +85,6 @@ annotation class Migrate(val fromVersion: Int,
                          val action: MigrationOptions)
 
 
-
 @Target(AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.SOURCE)
 annotation class Migrations(val values: Array<Migrate>)
diff --git a/commons/bin/main/promise/db/EntityInfo.kt b/commons/bin/main/promise/db/EntityInfo.kt
index 03924dd..8b56d82 100644
--- a/commons/bin/main/promise/db/EntityInfo.kt
+++ b/commons/bin/main/promise/db/EntityInfo.kt
@@ -24,9 +24,9 @@ annotation class AddedEntity(val fromVersion: Int,
 @Retention(AnnotationRetention.SOURCE)
 annotation class Entity(val tableName: String = "",
                         /**
-                              * @return
-                              */
-                             val compoundIndices: Array<CompoundIndex> = []
+                         * @return
+                         */
+                        val compoundIndices: Array<CompoundIndex> = []
 ) {
   /**
    *
@@ -45,6 +45,7 @@ annotation class Entity(val tableName: String = "",
    */
 
 }
+
 @Target(AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.SOURCE)
 annotation class Index
diff --git a/commons/build.gradle b/commons/build.gradle
index ecc89a1..35e2feb 100644
--- a/commons/build.gradle
+++ b/commons/build.gradle
@@ -13,12 +13,9 @@
 
 apply plugin: 'java-library'
 apply plugin: 'kotlin'
-
 apply plugin: 'maven'
 
-
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
diff --git a/commons/src/main/java/promise/database/AddedEntity.kt b/commons/src/main/java/promise/database/AddedEntity.kt
new file mode 100644
index 0000000..d7f001f
--- /dev/null
+++ b/commons/src/main/java/promise/database/AddedEntity.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.SOURCE)
+annotation class AddedEntity(val fromVersion: Int,
+                             val toVersion: Int)
\ No newline at end of file
diff --git a/commons/src/main/java/promise/database/Child.kt b/commons/src/main/java/promise/database/Child.kt
new file mode 100644
index 0000000..79bed57
--- /dev/null
+++ b/commons/src/main/java/promise/database/Child.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database
+
+@Target(AnnotationTarget.FIELD)
+@Retention(AnnotationRetention.SOURCE)
+annotation class Child(val fieldRelatedToParent: String,
+                       val parentRelatedField: String = "id")
\ No newline at end of file
diff --git a/commons/src/main/java/promise/database/ColumnInfo.kt b/commons/src/main/java/promise/database/ColumnInfo.kt
new file mode 100644
index 0000000..e2cb79b
--- /dev/null
+++ b/commons/src/main/java/promise/database/ColumnInfo.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database
+
+@Target(AnnotationTarget.FIELD)
+@Retention(AnnotationRetention.SOURCE)
+annotation class ColumnInfo(
+    val columnName: String = "",
+    val nullable: Boolean = true,
+    val unique: Boolean = false,
+    val default: Int = 0,
+    val length: Int = 0
+)
\ No newline at end of file
diff --git a/commons/src/main/java/promise/database/DAO.kt b/commons/src/main/java/promise/database/DAO.kt
new file mode 100644
index 0000000..8da85ee
--- /dev/null
+++ b/commons/src/main/java/promise/database/DAO.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.SOURCE)
+annotation class DAO
\ No newline at end of file
diff --git a/commons/src/main/java/promise/db/DatabaseEntity.java b/commons/src/main/java/promise/database/DatabaseEntity.java
similarity index 97%
rename from commons/src/main/java/promise/db/DatabaseEntity.java
rename to commons/src/main/java/promise/database/DatabaseEntity.java
index bad0ffb..7b9d8d0 100644
--- a/commons/src/main/java/promise/db/DatabaseEntity.java
+++ b/commons/src/main/java/promise/database/DatabaseEntity.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package promise.db;
+package promise.database;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -22,6 +22,8 @@
 @Retention(RetentionPolicy.SOURCE)
 public @interface DatabaseEntity {
   int version() default 1;
+
   boolean generateCrudStubs() default false;
+
   Class<?>[] persistableEntities();
 }
diff --git a/commons/src/main/java/promise/database/Embedded.kt b/commons/src/main/java/promise/database/Embedded.kt
new file mode 100644
index 0000000..713fc20
--- /dev/null
+++ b/commons/src/main/java/promise/database/Embedded.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database
+
+@Target(AnnotationTarget.FIELD)
+@Retention(AnnotationRetention.SOURCE)
+annotation class Embedded(val prefix: String = "")
\ No newline at end of file
diff --git a/commons/src/main/java/promise/database/Entity.kt b/commons/src/main/java/promise/database/Entity.kt
new file mode 100644
index 0000000..e59aa3a
--- /dev/null
+++ b/commons/src/main/java/promise/database/Entity.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.SOURCE)
+annotation class Entity(val tableName: String = "",
+                        val compoundIndices: Array<CompoundIndex> = [],
+                        val generateRelations: Boolean = true
+) {
+  @Target(AnnotationTarget.FIELD)
+  @Retention(AnnotationRetention.SOURCE)
+  annotation class CompoundIndex(
+      val columns: Array<String>,
+      val unique: Boolean = false)
+}
\ No newline at end of file
diff --git a/commons/src/main/java/promise/database/ForeignKey.kt b/commons/src/main/java/promise/database/ForeignKey.kt
new file mode 100644
index 0000000..9621ab7
--- /dev/null
+++ b/commons/src/main/java/promise/database/ForeignKey.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database
+
+import kotlin.reflect.KClass
+
+@Target(AnnotationTarget.FIELD)
+@Retention(AnnotationRetention.SOURCE)
+annotation class ForeignKey(
+    val referencedEntity: KClass<*>,
+    val referencedEntityColumnName: String = "id")
\ No newline at end of file
diff --git a/commons/src/main/java/promise/database/HasMany.kt b/commons/src/main/java/promise/database/HasMany.kt
new file mode 100644
index 0000000..6ec4eee
--- /dev/null
+++ b/commons/src/main/java/promise/database/HasMany.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database
+
+
+@Target(AnnotationTarget.FIELD)
+@Retention(AnnotationRetention.SOURCE)
+annotation class HasMany
+
+
+
diff --git a/commons/src/main/java/promise/database/HasOne.kt b/commons/src/main/java/promise/database/HasOne.kt
new file mode 100644
index 0000000..c829538
--- /dev/null
+++ b/commons/src/main/java/promise/database/HasOne.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database
+
+@Target(AnnotationTarget.FIELD)
+@Retention(AnnotationRetention.SOURCE)
+annotation class HasOne
\ No newline at end of file
diff --git a/commons/src/main/java/promise/database/Ignore.kt b/commons/src/main/java/promise/database/Ignore.kt
new file mode 100644
index 0000000..40a0f7d
--- /dev/null
+++ b/commons/src/main/java/promise/database/Ignore.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database
+
+@Target(AnnotationTarget.FIELD)
+@Retention(AnnotationRetention.SOURCE)
+annotation class Ignore
\ No newline at end of file
diff --git a/commons/src/main/java/promise/database/Index.kt b/commons/src/main/java/promise/database/Index.kt
new file mode 100644
index 0000000..a29c72b
--- /dev/null
+++ b/commons/src/main/java/promise/database/Index.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database
+
+@Target(AnnotationTarget.FIELD)
+@Retention(AnnotationRetention.SOURCE)
+annotation class Index
\ No newline at end of file
diff --git a/commons/src/main/java/promise/database/Migrate.kt b/commons/src/main/java/promise/database/Migrate.kt
new file mode 100644
index 0000000..b6eaa33
--- /dev/null
+++ b/commons/src/main/java/promise/database/Migrate.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database
+
+@Target(AnnotationTarget.FIELD)
+@Retention(AnnotationRetention.SOURCE)
+annotation class Migrate(val fromVersion: Int,
+                         val toVersion: Int,
+                         val action: MigrationOptions)
\ No newline at end of file
diff --git a/commons/src/main/java/promise/database/MigrationOptions.kt b/commons/src/main/java/promise/database/MigrationOptions.kt
new file mode 100644
index 0000000..14fb1e2
--- /dev/null
+++ b/commons/src/main/java/promise/database/MigrationOptions.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database
+
+enum class MigrationOptions {
+  CREATE, DROP, CREATE_INDEX, RENAME_COLUMN
+}
\ No newline at end of file
diff --git a/commons/src/main/java/promise/database/Migrations.kt b/commons/src/main/java/promise/database/Migrations.kt
new file mode 100644
index 0000000..1384049
--- /dev/null
+++ b/commons/src/main/java/promise/database/Migrations.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database
+
+@Target(AnnotationTarget.FIELD)
+@Retention(AnnotationRetention.SOURCE)
+annotation class Migrations(val values: Array<Migrate>)
\ No newline at end of file
diff --git a/commons/src/main/java/promise/database/Parent.kt b/commons/src/main/java/promise/database/Parent.kt
new file mode 100644
index 0000000..efb32bb
--- /dev/null
+++ b/commons/src/main/java/promise/database/Parent.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database
+
+@Target(AnnotationTarget.FIELD)
+@Retention(AnnotationRetention.SOURCE)
+annotation class Parent
\ No newline at end of file
diff --git a/commons/src/main/java/promise/database/PrimaryKey.kt b/commons/src/main/java/promise/database/PrimaryKey.kt
new file mode 100644
index 0000000..9bed0fe
--- /dev/null
+++ b/commons/src/main/java/promise/database/PrimaryKey.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database
+
+@Target(AnnotationTarget.FIELD)
+@Retention(AnnotationRetention.SOURCE)
+annotation class PrimaryKey(val name: String = "")
\ No newline at end of file
diff --git a/commons/src/main/java/promise/database/PrimaryKeyAutoIncrement.kt b/commons/src/main/java/promise/database/PrimaryKeyAutoIncrement.kt
new file mode 100644
index 0000000..a600933
--- /dev/null
+++ b/commons/src/main/java/promise/database/PrimaryKeyAutoIncrement.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database
+
+@Target(AnnotationTarget.FIELD)
+@Retention(AnnotationRetention.SOURCE)
+annotation class PrimaryKeyAutoIncrement
\ No newline at end of file
diff --git a/commons/src/main/java/promise/db/Query.kt b/commons/src/main/java/promise/database/Query.kt
similarity index 90%
rename from commons/src/main/java/promise/db/Query.kt
rename to commons/src/main/java/promise/database/Query.kt
index 46ca108..82ad690 100644
--- a/commons/src/main/java/promise/db/Query.kt
+++ b/commons/src/main/java/promise/database/Query.kt
@@ -11,8 +11,8 @@
  * limitations under the License.
  */
 
-package promise.db
+package promise.database
 
 @Target(AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.SOURCE)
-annotation class Query(val value: String)
\ No newline at end of file
+annotation class Query(val where: String)
\ No newline at end of file
diff --git a/commons/src/main/java/promise/database/Relation.kt b/commons/src/main/java/promise/database/Relation.kt
new file mode 100644
index 0000000..a9bc2a2
--- /dev/null
+++ b/commons/src/main/java/promise/database/Relation.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.SOURCE)
+annotation class Relation
\ No newline at end of file
diff --git a/commons/src/main/java/promise/database/Table.kt b/commons/src/main/java/promise/database/Table.kt
new file mode 100644
index 0000000..67f1615
--- /dev/null
+++ b/commons/src/main/java/promise/database/Table.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package promise.database
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class Table(val tableName: String,
+                       val indices: Array<Index> = [],
+                       val compoundIndexes: Array<CompoundIndex> = [],
+                       val foreignKeys: Array<ForeignKey> = []) {
+  @Target(AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CLASS)
+  @Retention(AnnotationRetention.RUNTIME)
+  annotation class Index(val columnName: String)
+
+  @Target(AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CLASS)
+  @Retention(AnnotationRetention.RUNTIME)
+  annotation class CompoundIndex(val unique: Boolean = false,
+                                 val indexes: Array<Index> = [])
+
+  @Target(AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CLASS)
+  @Retention(AnnotationRetention.RUNTIME)
+  annotation class ForeignKey(val columnName: String,
+                              val referencedTableName: String,
+                              val referencedColumnName: String)
+}
\ No newline at end of file
diff --git a/commons/src/main/java/promise/database/TypeConverter.kt b/commons/src/main/java/promise/database/TypeConverter.kt
new file mode 100644
index 0000000..f95672e
--- /dev/null
+++ b/commons/src/main/java/promise/database/TypeConverter.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package promise.database
+
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.SOURCE)
+annotation class TypeConverter
+
+
+
diff --git a/commons/src/main/java/promise/db/ColumnInfo.kt b/commons/src/main/java/promise/db/ColumnInfo.kt
deleted file mode 100644
index 8d69f50..0000000
--- a/commons/src/main/java/promise/db/ColumnInfo.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2017, Peter Vincent
- * Licensed under the Apache License, Version 2.0, Android Promise.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package promise.db
-
-
-@Target(AnnotationTarget.FIELD)
-@Retention(AnnotationRetention.SOURCE)
-annotation class VarChar(val columnName: String = "",
-                         val length: Int,
-                         val nullable: Boolean = true,
-                         val unique: Boolean = false,
-                         val index: Boolean = false)
-
-@Target(AnnotationTarget.FIELD)
-@Retention(AnnotationRetention.SOURCE)
-annotation class Text(val columnName: String = "",
-                      val nullable: Boolean = true,
-                      val unique: Boolean = false,
-                      val index: Boolean = false)
-
-@Target(AnnotationTarget.FIELD)
-@Retention(AnnotationRetention.SOURCE)
-annotation class Number(val columnName: String = "",
-                        val default: Int = 0,
-                        val nullable: Boolean = true,
-                        val unique: Boolean = false,
-                        val index: Boolean = false)
-
-@Target(AnnotationTarget.FIELD)
-@Retention(AnnotationRetention.SOURCE)
-annotation class PrimaryKey(val name: String = "")
-
-@Target(AnnotationTarget.FIELD)
-@Retention(AnnotationRetention.SOURCE)
-annotation class Embedded(val prefix: String = "")
-
-@Target(AnnotationTarget.FIELD)
-@Retention(AnnotationRetention.SOURCE)
-annotation class Ignore
-
-@Target(AnnotationTarget.FIELD)
-@Retention(AnnotationRetention.SOURCE)
-annotation class PrimaryKeyAutoIncrement
-
-
-enum class MigrationOptions {
-  CREATE, DROP, CREATE_INDEX
-}
-
-@Target(AnnotationTarget.FIELD)
-@Retention(AnnotationRetention.SOURCE)
-annotation class Migrate(val fromVersion: Int,
-                         val toVersion: Int,
-                         val action: MigrationOptions)
-
-
-
-@Target(AnnotationTarget.FIELD)
-@Retention(AnnotationRetention.SOURCE)
-annotation class Migrations(val values: Array<Migrate>)
-
diff --git a/commons/src/main/java/promise/db/EntityInfo.kt b/commons/src/main/java/promise/db/EntityInfo.kt
deleted file mode 100644
index 224b916..0000000
--- a/commons/src/main/java/promise/db/EntityInfo.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2017, Peter Vincent
- * Licensed under the Apache License, Version 2.0, Android Promise.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package promise.db
-
-import kotlin.reflect.KClass
-
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.SOURCE)
-annotation class AddedEntity(val fromVersion: Int,
-                             val toVersion: Int)
-
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.SOURCE)
-annotation class Entity(val tableName: String = "",
-                        /**
-                              * @return
-                              */
-                             val compoundIndices: Array<CompoundIndex> = []
-) {
-  /**
-   *
-   */
-  @Target(AnnotationTarget.FIELD)
-  @Retention(AnnotationRetention.SOURCE)
-  annotation class CompoundIndex(
-      val columns: Array<String>,
-      /**
-       * @return
-       */
-      val unique: Boolean = false)
-
-  /**
-   *
-   */
-
-}
-@Target(AnnotationTarget.FIELD)
-@Retention(AnnotationRetention.SOURCE)
-annotation class Index
-
-@Target(AnnotationTarget.FIELD)
-@Retention(AnnotationRetention.SOURCE)
-annotation class ForeignKey(
-    /**
-     * @return
-     */
-    val referencedEntity: KClass<*>,
-    /**
-     * @return
-     */
-    val referencedEntityColumnName: String = "id")
-
-
-@Target(AnnotationTarget.FIELD)
-@Retention(AnnotationRetention.SOURCE)
-annotation class HasOne(val entity: KClass<*>)
-
-@Target(AnnotationTarget.FIELD)
-@Retention(AnnotationRetention.SOURCE)
-annotation class HasMany(val entity: KClass<*>)
-
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.SOURCE)
-annotation class OneToMany(val parent: KClass<*>, val child: KClass<*>)
-
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.SOURCE)
-annotation class OneToOne(val parent: KClass<*>, val child: KClass<*>)
-
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.SOURCE)
-annotation class FindAll
-
-
diff --git a/commons/src/main/java/promise/db/Table.java b/commons/src/main/java/promise/db/Table.java
deleted file mode 100644
index 3dd1f02..0000000
--- a/commons/src/main/java/promise/db/Table.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2017, Peter Vincent
- * Licensed under the Apache License, Version 2.0, Android Promise.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package promise.db;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- *
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Table {
-  /**
-   * @return
-   */
-  String tableName();
-
-  /**
-   * @return
-   */
-  Index[] indices() default {};
-  CompoundIndex[] compoundIndexes() default {};
-
-  /**
-   * @return
-   */
-  ForeignKey[] foreignKeys() default {};
-
-  /**
-   *
-   */
-  @Target(ElementType.TYPE)
-  @Retention(RetentionPolicy.RUNTIME)
-  @interface Index {
-    /**
-     * @return
-     */
-    String columnName();
-    ;
-  }
-
-  /**
-   *
-   */
-  @Target(ElementType.TYPE)
-  @Retention(RetentionPolicy.RUNTIME)
-  @interface CompoundIndex {
-    boolean unique() default false;
-    Index[] indexes() default {};
-  }
-
-  /**
-   *
-   */
-  @Target(ElementType.TYPE)
-  @Retention(RetentionPolicy.RUNTIME)
-  @interface ForeignKey {
-    /**
-     * @return
-     */
-    String columnName();
-
-    /**
-     * @return
-     */
-    String referencedTableName();
-
-    /**
-     * @return
-     */
-    String referencedColumnName();
-  }
-
-}
diff --git a/compiler/bin/main/promise/db/ompiler/DatabaseCompanionPropsGenerator.kt b/compiler/bin/main/promise/db/ompiler/DatabaseCompanionPropsGenerator.kt
index 2d2f0f6..a5702cc 100644
--- a/compiler/bin/main/promise/db/ompiler/DatabaseCompanionPropsGenerator.kt
+++ b/compiler/bin/main/promise/db/ompiler/DatabaseCompanionPropsGenerator.kt
@@ -45,15 +45,15 @@ class DatabaseCompanionPropsGenerator(
 
     /**
      * private static Migration getMigration() {
-            return new Migration() {
-              @Override
-              public void onMigrate(@NotNull FastDatabase database, @NotNull SQLiteDatabase sqLiteDatabase, int oldVersion, int newVersion) {
-                if (oldVersion == 2 && newVersion == 3) {
-                  database.add(sqLiteDatabase, database.obtain(PersonFastTable.class));
-                }
-              }
-            };
-          }
+    return new Migration() {
+    @Override
+    public void onMigrate(@NotNull FastDatabase database, @NotNull SQLiteDatabase sqLiteDatabase, int oldVersion, int newVersion) {
+    if (oldVersion == 2 && newVersion == 3) {
+    database.add(sqLiteDatabase, database.obtain(PersonFastTable.class));
+    }
+    }
+    };
+    }
      */
     var migrationInitialzer = """
       return new Migration() {
@@ -87,12 +87,12 @@ class DatabaseCompanionPropsGenerator(
     typeSpec.addMethod(migrationPropSpec)
     // adding db instance var
     // private static volatile FastDatabase instance = null;
-    typeSpec.addField(FieldSpec.builder(ClassName.get("promise.db", "FastDatabase"),"instance")
+    typeSpec.addField(FieldSpec.builder(ClassName.get("promise.db", "FastDatabase"), "instance")
         .initializer("null")
         .addModifiers(Modifier.PRIVATE)
         .build())
 
-    typeSpec.addField(FieldSpec.builder(Boolean::class.javaPrimitiveType,"initialized")
+    typeSpec.addField(FieldSpec.builder(Boolean::class.javaPrimitiveType, "initialized")
         .initializer("false")
         .addModifiers(Modifier.PRIVATE, Modifier.VOLATILE, Modifier.STATIC)
         .build())
@@ -107,7 +107,7 @@ class DatabaseCompanionPropsGenerator(
     //    }
     typeSpec.addMethod(MethodSpec.methodBuilder("createDatabase")
         .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
-        .addParameter(ClassName.get(String::class.java),"name")
+        .addParameter(ClassName.get(String::class.java), "name")
         .returns(ClassName.get(pack, className))
         .addCode(CodeBlock.of("""
           if (initialized) throw new IllegalStateException("Database already created");
@@ -119,8 +119,8 @@ class DatabaseCompanionPropsGenerator(
     // add with creation callback
     typeSpec.addMethod(MethodSpec.methodBuilder("createDatabase")
         .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
-        .addParameter(ClassName.get(String::class.java),"name")
-        .addParameter(ClassName.get("promise.db", "DatabaseCreationCallback"),"databaseCreationCallback")
+        .addParameter(ClassName.get(String::class.java), "name")
+        .addParameter(ClassName.get("promise.db", "DatabaseCreationCallback"), "databaseCreationCallback")
         .returns(ClassName.get(pack, className))
         .addCode(CodeBlock.of("""
           if (initialized) throw new IllegalStateException("Database already created");
@@ -147,7 +147,7 @@ class DatabaseCompanionPropsGenerator(
     // with in memory database
     typeSpec.addMethod(MethodSpec.methodBuilder("createInMemoryDatabase")
         .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
-        .addParameter(ClassName.get("promise.db", "DatabaseCreationCallback"),"databaseCreationCallback")
+        .addParameter(ClassName.get("promise.db", "DatabaseCreationCallback"), "databaseCreationCallback")
         .returns(ClassName.get(pack, className))
         .addCode(CodeBlock.of("""
           if (initialized) throw new IllegalStateException("Database already created");
@@ -174,7 +174,7 @@ class DatabaseCompanionPropsGenerator(
     // with callback
     typeSpec.addMethod(MethodSpec.methodBuilder("createReactiveInMemoryDatabase")
         .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
-        .addParameter(ClassName.get("promise.db", "DatabaseCreationCallback"),"databaseCreationCallback")
+        .addParameter(ClassName.get("promise.db", "DatabaseCreationCallback"), "databaseCreationCallback")
         .returns(ClassName.get(pack, className))
         .addCode(CodeBlock.of("""
           if (initialized) throw new IllegalStateException("Database already created");
@@ -192,7 +192,7 @@ class DatabaseCompanionPropsGenerator(
     //    }
     typeSpec.addMethod(MethodSpec.methodBuilder("createReactiveDatabase")
         .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
-        .addParameter(ClassName.get(String::class.java),"name")
+        .addParameter(ClassName.get(String::class.java), "name")
         .returns(ClassName.get(pack, className))
         .addCode(CodeBlock.of("""
           if (initialized) throw new IllegalStateException("Database already created");
@@ -204,8 +204,8 @@ class DatabaseCompanionPropsGenerator(
     // with creation callback
     typeSpec.addMethod(MethodSpec.methodBuilder("createReactiveDatabase")
         .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
-        .addParameter(ClassName.get(String::class.java),"name")
-        .addParameter(ClassName.get("promise.db", "DatabaseCreationCallback"),"databaseCreationCallback")
+        .addParameter(ClassName.get(String::class.java), "name")
+        .addParameter(ClassName.get("promise.db", "DatabaseCreationCallback"), "databaseCreationCallback")
         .returns(ClassName.get(pack, className))
         .addCode(CodeBlock.of("""
           if (initialized) throw new IllegalStateException("Database already created");
diff --git a/compiler/bin/main/promise/db/ompiler/DatabaseProcessor.kt b/compiler/bin/main/promise/db/ompiler/DatabaseProcessor.kt
index a5778f4..10b7850 100644
--- a/compiler/bin/main/promise/db/ompiler/DatabaseProcessor.kt
+++ b/compiler/bin/main/promise/db/ompiler/DatabaseProcessor.kt
@@ -66,7 +66,7 @@ class DatabaseProcessor(private val processingEnv: ProcessingEnvironment) {
         .addAnnotation(tableAnnotationSpec)
         .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
         .addMethod(MethodSpec.constructorBuilder()
-            .addParameter(ClassName.get("promise.db", "FastDatabase"),"instance")
+            .addParameter(ClassName.get("promise.db", "FastDatabase"), "instance")
             .addModifiers(Modifier.PRIVATE)
             .addStatement("super()")
             .addStatement("this.instance = instance")
@@ -140,7 +140,7 @@ class DatabaseProcessor(private val processingEnv: ProcessingEnvironment) {
             See the License for the specific language governing permissions and
             limitations under the License
             """.trimIndent()
-            )
+        )
         .build()
     //val kaptKotlinGeneratedDir = processingEnv.options[EntityProcessor.KAPT_JAVA_GENERATED_OPTION_NAME]!!
     file.writeTo(processingEnv.filer)
diff --git a/compiler/bin/main/promise/db/ompiler/DeserializerGenerator.kt b/compiler/bin/main/promise/db/ompiler/DeserializerGenerator.kt
index 0c4243f..bd7df96 100644
--- a/compiler/bin/main/promise/db/ompiler/DeserializerGenerator.kt
+++ b/compiler/bin/main/promise/db/ompiler/DeserializerGenerator.kt
@@ -48,7 +48,7 @@ class DeserializerGenerator(
     //fileSpec.addImport("android.database", "CursorIndexOutOfBoundsException")
 
     return MethodSpec.methodBuilder("deserialize")
-        .addParameter(ClassName.get("android.database", "Cursor"),"e")
+        .addParameter(ClassName.get("android.database", "Cursor"), "e")
         .addAnnotation(Override::class.java)
         .addModifiers(Modifier.PUBLIC)
         .returns(ClassName.get(typeDataTypePack, typeDataType))
diff --git a/compiler/bin/main/promise/db/ompiler/EntityProcessor.kt b/compiler/bin/main/promise/db/ompiler/EntityProcessor.kt
index ac8d399..b5e7e2c 100644
--- a/compiler/bin/main/promise/db/ompiler/EntityProcessor.kt
+++ b/compiler/bin/main/promise/db/ompiler/EntityProcessor.kt
@@ -68,7 +68,7 @@ class EntityProcessor : AbstractProcessor() {
 //            if (JavaUtils.implementsInterface(processingEnv, element as TypeElement, identifiableInterface.asType())) {
 //              processAnnotation(element)
 //            }
-             processAnnotation(element)
+            processAnnotation(element)
 //            else {
 //              processingEnv.messager.printMessage(Diagnostic.Kind.ERROR, "The Entity class ${element.simpleName} must implement Identifiable")
 //              return false
@@ -180,7 +180,7 @@ class EntityProcessor : AbstractProcessor() {
             See the License for the specific language governing permissions and
             limitations under the License
             """.trimIndent()
-            )
+        )
         .build()
         .writeTo(processingEnv.filer)
   }
diff --git a/compiler/bin/main/promise/db/ompiler/SerializerGenerator.kt b/compiler/bin/main/promise/db/ompiler/SerializerGenerator.kt
index 64a7be0..449207c 100644
--- a/compiler/bin/main/promise/db/ompiler/SerializerGenerator.kt
+++ b/compiler/bin/main/promise/db/ompiler/SerializerGenerator.kt
@@ -25,7 +25,7 @@ class SerializerGenerator(
     private val typeDataType: String,
     private val columns: List<Pair<Pair<String, TypeName>, String>>) : CodeBlockGenerator<MethodSpec> {
   init {
-   // fileSpec.addImport("android.content", "ContentValues")
+    // fileSpec.addImport("android.content", "ContentValues")
   }
 
   override fun generate(): MethodSpec {
@@ -43,7 +43,7 @@ class SerializerGenerator(
 
     return MethodSpec.methodBuilder("serialize")
         .addModifiers(Modifier.PUBLIC)
-        .addParameter(ClassName.get(typeDataTypePack, typeDataType),"t")
+        .addParameter(ClassName.get(typeDataTypePack, typeDataType), "t")
         .addAnnotation(Override::class.java)
         .returns(ClassName.get("android.content", "ContentValues"))
         .addCode(CodeBlock.of(stmt))
diff --git a/compiler/bin/main/promise/db/ompiler/TableColumnPropsGenerator.kt b/compiler/bin/main/promise/db/ompiler/TableColumnPropsGenerator.kt
index fdace1c..c32ad27 100644
--- a/compiler/bin/main/promise/db/ompiler/TableColumnPropsGenerator.kt
+++ b/compiler/bin/main/promise/db/ompiler/TableColumnPropsGenerator.kt
@@ -31,10 +31,10 @@ import kotlin.collections.ArrayList
 import kotlin.collections.HashMap
 
 class TableColumnPropsGenerator(
-                                private val classBuilder: TypeSpec.Builder,
-                                private val processingEnvironment: ProcessingEnvironment
-                                ,
-                                private val setElements: List<Element>) : CodeBlockGenerator<Map<Pair<Element, String>, FieldSpec>> {
+    private val classBuilder: TypeSpec.Builder,
+    private val processingEnvironment: ProcessingEnvironment
+    ,
+    private val setElements: List<Element>) : CodeBlockGenerator<Map<Pair<Element, String>, FieldSpec>> {
 
   var genColValues: ArrayList<Pair<Pair<String, TypeName>, String>> = ArrayList()
 
@@ -83,7 +83,7 @@ class TableColumnPropsGenerator(
         classTypeName.isSameAs(Integer::class.java) ||
         classTypeName.isSameAs(Float::class.java) ||
         classTypeName.isSameAs(Double::class.java) ||
-       classTypeName.isSameAs(Boolean::class.java)) {
+        classTypeName.isSameAs(Boolean::class.java)) {
       str += ".INTEGER"
       if (element.getAnnotation(PrimaryKey::class.java) != null) {
         str += ".PRIMARY_KEY()"
diff --git a/compiler/bin/main/promise/db/ompiler/Utils.kt b/compiler/bin/main/promise/db/ompiler/Utils.kt
index f3c4ba6..217f986 100644
--- a/compiler/bin/main/promise/db/ompiler/Utils.kt
+++ b/compiler/bin/main/promise/db/ompiler/Utils.kt
@@ -44,7 +44,7 @@ fun TypeName.isSameAs(javaClass: Class<*>): Boolean {
 
 fun TypeName.isSameAs2(processingEnvironment: ProcessingEnvironment, javaClass: Class<*>): Boolean {
   processingEnvironment.messager.printMessage(Diagnostic.Kind.OTHER, "comparing \n: elem typeName ${this}, javaClass: ${JavaUtils.wrap(javaClass).name}")
-  if (this.isPrimitive)  return this.box().toString() == JavaUtils.wrap(javaClass).name
+  if (this.isPrimitive) return this.box().toString() == JavaUtils.wrap(javaClass).name
   return this.toString() == JavaUtils.wrap(javaClass).name
 }
 
diff --git a/compiler/bin/main/promise/db/ompiler/migration/MigrationGenerator.kt b/compiler/bin/main/promise/db/ompiler/migration/MigrationGenerator.kt
index 22da0c2..7f3a5f3 100644
--- a/compiler/bin/main/promise/db/ompiler/migration/MigrationGenerator.kt
+++ b/compiler/bin/main/promise/db/ompiler/migration/MigrationGenerator.kt
@@ -60,6 +60,7 @@ class MigrationGenerator(
       codeBlock.add("}\n")
     }
   }
+
   private fun buildMigration(
       codeBlock: CodeBlock.Builder,
       column: String,
diff --git a/compiler/build.gradle b/compiler/build.gradle
index df1b268..364783a 100644
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@@ -16,61 +16,22 @@ import org.gradle.internal.jvm.Jvm
 apply plugin: 'java-library'
 apply plugin: 'kotlin'
 apply plugin: 'kotlin-kapt'
-
-
 apply plugin: 'maven'
 
-
-
-//android {
-//    compileSdkVersion 29
-//    buildToolsVersion "29.0.2"
-//
-//    defaultConfig {
-//        minSdkVersion 21
-//        targetSdkVersion 29
-//        versionCode 1
-//        versionName "1.0"
-//
-//        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-//        consumerProguardFiles 'consumer-rules.pro'
-//    }
-//
-//    buildTypes {
-//        release {
-//            minifyEnabled false
-//            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-//        }
-//
-//        debug {
-//
-//        }
-//    }
-//
-//
-//    compileOptions {
-//        sourceCompatibility = '1.8'
-//        targetCompatibility = '1.8'
-//    }
-//
-//}
-
 dependencies {
+    //compileOnly 'com.github.android-promise.database:commons:1.0.3-alpha7'
     compileOnly project(path: ':commons')
-    //compileOnly files(Jvm.current().getJre().homeDir.getAbsolutePath()+'/lib/rt.jar')
-    //compileOnly files("${System.properties['java.home']}/../lib/tools.jar")
     compileOnly files(Jvm.current().getToolsJar())
+    implementation 'com.google.auto.value:auto-value-annotations:1.7.4'
+    kapt 'com.google.auto.value:auto-value:1.7.4'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.0'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
-    implementation group: 'org.atteo', name: 'evo-inflector', version: '1.0.1'
-
+    implementation 'org.atteo:evo-inflector:1.0.1'
     implementation 'com.squareup:javapoet:1.13.0'
-    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.72"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:1.4.10"
     implementation 'com.google.auto:auto-common:0.10'
     compileOnly "com.google.auto.service:auto-service:1.0-rc4"
     kapt "com.google.auto.service:auto-service:1.0-rc4"
-
-    api "net.ltgt.gradle.incap:incap:0.2"
-    compileOnly "net.ltgt.gradle.incap:incap-processor:0.2"
     testImplementation 'junit:junit:4.13'
 }
diff --git a/compiler/gradle.properties b/compiler/gradle.properties
index 25239fe..efdd2fc 100644
--- a/compiler/gradle.properties
+++ b/compiler/gradle.properties
@@ -10,7 +10,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
 POM_NAME=Promise Database Compiler
 POM_ARTIFACT_ID=promise-db-compiler
 POM_PACKAGING=war
\ No newline at end of file
diff --git a/compiler/src/main/AndroidManifest.xml b/compiler/src/main/AndroidManifest.xml
index afb7daa..44905cb 100644
--- a/compiler/src/main/AndroidManifest.xml
+++ b/compiler/src/main/AndroidManifest.xml
@@ -11,5 +11,4 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="promise.db.ompiler" />
+<manifest package="promise.db.ompiler" />
diff --git a/compiler/src/main/java/promise/database/compiler/AnnotatedClassProcessor.kt b/compiler/src/main/java/promise/database/compiler/AnnotatedClassProcessor.kt
new file mode 100644
index 0000000..c04770a
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/AnnotatedClassProcessor.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler
+
+import com.squareup.javapoet.JavaFile
+import javax.annotation.processing.RoundEnvironment
+
+abstract class AnnotatedClassProcessor {
+  abstract fun process(environment: RoundEnvironment?): List<JavaFile.Builder?>?
+}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/db/ompiler/CodeBlockGenerator.kt b/compiler/src/main/java/promise/database/compiler/CodeGenerator.kt
similarity index 90%
rename from compiler/src/main/java/promise/db/ompiler/CodeBlockGenerator.kt
rename to compiler/src/main/java/promise/database/compiler/CodeGenerator.kt
index d99b4f6..ff743f5 100644
--- a/compiler/src/main/java/promise/db/ompiler/CodeBlockGenerator.kt
+++ b/compiler/src/main/java/promise/database/compiler/CodeGenerator.kt
@@ -11,10 +11,10 @@
  * limitations under the License.
  */
 
-package promise.db.ompiler
+package promise.database.compiler
 
 
-interface CodeBlockGenerator<out T> {
+interface CodeGenerator<out T> {
   @Throws(Exception::class)
   fun generate(): T
 }
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/database/compiler/DAOAnnotatedProcessor.kt b/compiler/src/main/java/promise/database/compiler/DAOAnnotatedProcessor.kt
new file mode 100644
index 0000000..dd88761
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/DAOAnnotatedProcessor.kt
@@ -0,0 +1,211 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler
+
+import com.google.auto.common.MoreElements
+import com.google.auto.common.MoreTypes
+import com.google.common.util.concurrent.MoreExecutors
+import com.squareup.javapoet.AnnotationSpec
+import com.squareup.javapoet.ClassName
+import com.squareup.javapoet.CodeBlock
+import com.squareup.javapoet.FieldSpec
+import com.squareup.javapoet.JavaFile
+import com.squareup.javapoet.MethodSpec
+import com.squareup.javapoet.ParameterSpec
+import com.squareup.javapoet.TypeSpec
+import org.jetbrains.annotations.NotNull
+import promise.database.Child
+import promise.database.DAO
+import promise.database.Parent
+import promise.database.Relation
+import promise.database.compiler.utils.JavaUtils
+import promise.database.compiler.utils.LogUtil
+import promise.database.compiler.utils.asTableClassName
+import promise.database.compiler.utils.asTypeElement
+import promise.database.compiler.utils.camelCase
+import promise.database.compiler.utils.toTypeName
+import javax.annotation.processing.ProcessingEnvironment
+import javax.annotation.processing.RoundEnvironment
+import javax.lang.model.element.Element
+import javax.lang.model.element.ElementKind
+import javax.lang.model.element.Modifier
+import javax.lang.model.element.TypeElement
+import javax.lang.model.element.TypeParameterElement
+import javax.lang.model.element.VariableElement
+import javax.lang.model.util.ElementFilter
+
+
+class DAOAnnotatedProcessor(private val processingEnv: ProcessingEnvironment) : AnnotatedClassProcessor() {
+  override fun process(environment: RoundEnvironment?): List<JavaFile.Builder?>? {
+    val javaFiles = ArrayList<JavaFile.Builder?>()
+    environment?.getElementsAnnotatedWith(DAO::class.java)
+        ?.forEach {
+          javaFiles.add(processAnnotation(it))
+        }
+    return javaFiles
+  }
+
+  private fun processAnnotation(element: Element): JavaFile.Builder {
+
+    val className = element.simpleName.toString()
+    val pack = processingEnv.elementUtils.getPackageOf(element).toString()
+
+    val fileName = className + "Impl"
+
+    val classBuilder = TypeSpec.classBuilder(fileName)
+        .addModifiers(Modifier.PUBLIC)
+        .addMethod(MethodSpec.constructorBuilder()
+            .addModifiers(Modifier.PUBLIC)
+            .addParameter(ClassName.get("promise.db", "PromiseDatabase")
+                .annotated(AnnotationSpec.builder(NotNull::class.java).build()),
+                "promiseDatabase")
+            .addStatement("this.promiseDatabase = promiseDatabase").build())
+
+    classBuilder.addField(FieldSpec.builder(ClassName.get("promise.db", "PromiseDatabase")
+        .annotated(AnnotationSpec.builder(NotNull::class.java).build()),
+        "promiseDatabase").build())
+
+    if (element.kind == ElementKind.INTERFACE) classBuilder.addSuperinterface(element.asType())
+    else if (element.kind == ElementKind.CLASS) classBuilder.superclass(element.asType())
+
+    val gen = """
+      
+  private PostCommentToReplyRelation getPostCommentToReplyRelation(PostComment postComment) {
+    return new PostCommentToReplyRelation() {{
+      setPostComment(postComment);
+      setPostCommentReplies(new ArrayList<>(
+          promiseDatabase.tableOf(PostComment.class).findAll(
+              PostCommentsTable.postCommentIdColumn.with(
+                  postComment.getId().toString()))));
+    }};
+  }
+
+  @Override
+  public List<PostCommentToReplyRelation> getPostComments(Criteria andCriteria) {
+    Cursor cursor = promiseDatabase.getDatabaseInstance().query(
+        promiseDatabase.tableOf(PostComment.class).queryBuilder()
+            .whereAnd(andCriteria));
+    return getPostCommentRepliesImpl(cursor);
+  }
+
+  private List<PostCommentToReplyRelation> getPostCommentRepliesImpl(Cursor cursor) {
+    IdentifiableList<? extends PostComment> postComments = promiseDatabase.tableOf(PostComment.class).collection(cursor);
+    return postComments.map(this::getPostCommentToReplyRelation);
+  }
+    """.trimIndent()
+    ElementFilter.methodsIn(element.enclosedElements).forEach { executableElement ->
+      classBuilder.addMethod(MethodSpec.overriding(executableElement)
+          .addCode("return null;").build())
+      var relationType: Element?
+//      val ssElement = executableElement.enclosingElement
+//      if (ssElement is TypeParameterElement) {
+//
+//      }
+//      if (JavaUtils.isCollectionType(processingEnv, ssElement)) {
+//        val typeMirrors =
+//            JavaUtils.getParameterizedTypeMirrors(ssElement)
+//        val typeMirror = typeMirrors[0]
+//        relationType = processingEnv.typeUtils.asElement(typeMirror)
+//        LogUtil.n(Exception("Return type is collection: ${relationType}"))
+//      } else {
+//        relationType = processingEnv.typeUtils.asElement(executableElement.returnType)
+//        LogUtil.n(Exception("Return type is : ${relationType}"))
+//        //generateGetRelationMethod(classBuilder, relationType)
+//      }
+
+      //if (relationType == null) throw IllegalStateException("Failed to determine relation class")
+
+//      classBuilder.addMethod(MethodSpec.methodBuilder("get${relationType.simpleName}Impl")
+//          .addParameter(ClassName.get("android.database", "Cursor"), "cursor")
+//          .addModifiers(Modifier.PRIVATE)
+//          .returns(processingEnv.typeUtils.asElement(executableElement.returnType).toTypeName())
+//          .addCode("return null;")
+//          .build())
+    }
+    return JavaFile.builder(pack, classBuilder.build())
+  }
+
+  private fun generateGetRelationMethod(classBuilder: TypeSpec.Builder,
+                                        relationType: Element) {
+    val gen = """
+  private PostCommentToReplyRelation getPostCommentToReplyRelation(PostComment postComment) {
+    return new PostCommentToReplyRelation() {{
+      setPostComment(postComment);
+      setPostCommentReplies(new ArrayList<>(
+          promiseDatabase.tableOf(PostComment.class).findAll(
+              PostCommentsTable.postCommentIdColumn.with(
+                  postComment.getId().toString()))));
+    }};
+  }
+  }
+    """.trimIndent()
+    if (relationType.getAnnotation(Relation::class.java) != null) {
+      val relationFields = ElementFilter.fieldsIn(relationType.enclosedElements);
+      val parentRelations = relationFields.filter {
+        it.getAnnotation(Parent::class.java) != null
+      }
+      if (parentRelations.isEmpty()) LogUtil.e(Exception("Relation classes must have a parent annotated field"), relationType)
+      if (parentRelations.size > 1) LogUtil.e(Exception("Relation classes can only have one field annotated with Parent"), relationType)
+      val parentRelation = parentRelations[0]
+
+      classBuilder.addMethod(MethodSpec.methodBuilder("get${relationType.simpleName}")
+          .addModifiers(Modifier.PRIVATE)
+          .returns(relationType.toTypeName())
+          .addParameter(ParameterSpec.builder(parentRelation.toTypeName(),
+              parentRelation.simpleName.toString().camelCase()).build())
+          .addCode(CodeBlock.builder()
+              .beginControlFlow("return new ${relationType.simpleName}() {")
+              .addStatement("set${parentRelation.simpleName}(${parentRelation.simpleName.toString().camelCase()})")
+              .add(getCodeBlockForChildElements(relationType).build())
+              .endControlFlow("}")
+              .build())
+          .build())
+
+      val parentTableClass = (parentRelation as TypeElement).asTableClassName(processingEnv)
+      classBuilder.addField(FieldSpec.builder(parentTableClass, parentTableClass.simpleName().camelCase())
+          .addModifiers(Modifier.PRIVATE)
+          .build())
+
+    } else LogUtil.e(Exception("Class must be annotated as Relation"), relationType)
+  }
+
+  private fun getCodeBlockForChildElements(element: Element): CodeBlock.Builder {
+    val codeBlock = CodeBlock.builder()
+    ElementFilter.fieldsIn(element.enclosedElements)
+        .filter {
+          it.getAnnotation(Parent::class.java) == null
+        }
+        .filter {
+          if (it.getAnnotation(Child::class.java) != null) true
+          else {
+            LogUtil.e(Exception("Field ${it.simpleName} must be annotated with Child"))
+            false
+          }
+        }.forEach {
+          val childAnnotation = it.getAnnotation(Child::class.java)
+          if (JavaUtils.isCollectionType(processingEnv, it)) {
+            val typeMirrors = JavaUtils.getParameterizedTypeMirrors(it)
+            if (typeMirrors != null && typeMirrors.isNotEmpty()) {
+              val relationType = processingEnv.typeUtils.asElement(typeMirrors[0])
+              val fieldToRelatedKey = childAnnotation.fieldRelatedToParent
+              val parentRelationKey = childAnnotation.parentRelatedField
+
+            }
+          } else {
+          }
+        }
+    return codeBlock
+  }
+
+}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/db/ompiler/DatabaseAbstractFuncsGenerator.kt b/compiler/src/main/java/promise/database/compiler/DatabaseAbstractMethodsGenerator.kt
similarity index 54%
rename from compiler/src/main/java/promise/db/ompiler/DatabaseAbstractFuncsGenerator.kt
rename to compiler/src/main/java/promise/database/compiler/DatabaseAbstractMethodsGenerator.kt
index 59980f8..2826ef2 100644
--- a/compiler/src/main/java/promise/db/ompiler/DatabaseAbstractFuncsGenerator.kt
+++ b/compiler/src/main/java/promise/database/compiler/DatabaseAbstractMethodsGenerator.kt
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package promise.db.ompiler
+package promise.database.compiler
 
 import com.squareup.javapoet.ClassName
 import com.squareup.javapoet.CodeBlock
@@ -20,6 +20,10 @@ import com.squareup.javapoet.ParameterizedTypeName
 import com.squareup.javapoet.TypeVariableName
 import com.squareup.javapoet.WildcardTypeName
 import org.jetbrains.annotations.NotNull
+import promise.database.DAO
+import promise.database.compiler.utils.JavaUtils
+import promise.database.compiler.utils.asTypeElement
+import promise.database.compiler.utils.getTableEntities
 import javax.annotation.processing.ProcessingEnvironment
 import javax.lang.model.element.Element
 import javax.lang.model.element.ExecutableElement
@@ -27,13 +31,10 @@ import javax.lang.model.element.Modifier
 import javax.lang.model.element.TypeElement
 import javax.lang.model.type.TypeKind
 import javax.lang.model.util.ElementFilter
-import javax.tools.Diagnostic
 
-
-class DatabaseAbstractFuncsGenerator(
+class DatabaseAbstractMethodsGenerator(
     private val element: TypeElement,
-    private val processingEnv: ProcessingEnvironment) : CodeBlockGenerator<List<MethodSpec>?> {
-
+    private val processingEnv: ProcessingEnvironment) : CodeGenerator<List<MethodSpec>?> {
 
   override fun generate(): List<MethodSpec>? {
     val enclosedElements: List<Element?> = element.enclosedElements
@@ -42,80 +43,57 @@ class DatabaseAbstractFuncsGenerator(
     val abstractFunctions = methods.filter {
       it.modifiers.contains(Modifier.ABSTRACT)
     }
-    //if (abstractFunctions.isNullOrEmpty()) return null
+
     val funSpecs = ArrayList<MethodSpec>()
 
     abstractFunctions.filter {
       it.parameters.isEmpty() && it.returnType.kind != TypeKind.VOID
     }.forEach { method ->
       val returnType = method.returnType
-      val methodName = method.simpleName
-
       val typeElement = returnType.asTypeElement(processingEnv)
-      val returnTypeName = method.returnType.toString()
-      val pack = processingEnv.elementUtils.getPackageOf(typeElement).toString()
-      processingEnv.messager.printMessage(Diagnostic.Kind.ERROR, "ReturnType: $pack $returnTypeName")
-      val className = ClassName.get(getPackage(element, returnTypeName), returnTypeName)
-      funSpecs.add(MethodSpec.methodBuilder(methodName.toString())
-          .addAnnotation(Override::class.java)
-          .addAnnotation(NotNull::class.java)
-          .addModifiers(Modifier.PUBLIC)
-          .returns(className)
-          .addCode(CodeBlock.builder()
-              .addStatement("return getDatabaseInstance().obtain(${className}.class)")
-              .build())
-          .build())
-
+      if (typeElement.getAnnotation(DAO::class.java) != null) {
+        val returnTypeName = typeElement.simpleName.toString()
+        val pack = processingEnv.elementUtils.getPackageOf(typeElement).toString()
+        val className = "${returnTypeName}Impl"
+        funSpecs.add(MethodSpec.overriding(method)
+            .addCode(JavaUtils.generateReturnDaoImplInstance(ClassName.get(pack, className)))
+            .build())
+      }
     }
 
     val codeBlock = CodeBlock.builder()
+        .beginControlFlow("return new Visitor<Class<? extends T>, FastTable<T>>()")
+        .add("@Override \n")
+        .beginControlFlow("public FastTable<T> visit(Class<? extends T> entityClass)")
     element.getTableEntities(processingEnv).forEach {
       JavaUtils.generateIfStatementObtainClassString(processingEnv, codeBlock, it)
     }
     codeBlock.addStatement("throw new IllegalArgumentException(entityClass.getCanonicalName() + \"not registered with this database\")")
+        .endControlFlow()
+        .add("};")
 
-    /**
-     * @Override
-    @NotNull
-    public <T extends Identifiable<Integer>> FastTable<T> getTable(Class<? extends T> entityClass) throws IllegalArgumentException {
-    if (entityClass == Person.class) return getDatabaseInstance().obtain(PersonFastTable.class);
-    if (entityClass == Exam.class) return getDatabaseInstance().obtain(ExamFastTable.class);
-    throw new IllegalArgumentException(entityClass.getCanonicalName() + "not registered with this database");
-    }
-     */
     val typeVariable: TypeVariableName? = TypeVariableName.get("T").withBounds(
         ParameterizedTypeName.get(
             ClassName.get("promise.commons.model", "Identifiable"),
             ClassName.get(Integer::class.java)))
-    funSpecs.add(MethodSpec.methodBuilder("tableOf")
+
+    funSpecs.add(MethodSpec.methodBuilder("getEntityClassVisitor")
         .addTypeVariable(typeVariable)
-        .addParameter(ParameterizedTypeName.get(ClassName.get(Class::class.java),
-            WildcardTypeName.subtypeOf(TypeVariableName.get("T"))
-        ), "entityClass")
         .addAnnotation(Override::class.java)
         .addAnnotation(NotNull::class.java)
-        .addException(IllegalArgumentException::class.java)
         .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
-        .returns(ParameterizedTypeName.get(ClassName.get("promise.db", "FastTable"), TypeVariableName.get("T")))
+        .returns(ParameterizedTypeName.get(ClassName.get("promise.utils", "Visitor"),
+            ParameterizedTypeName.get(ClassName.get(Class::class.java),
+                WildcardTypeName.subtypeOf(TypeVariableName.get("T"))
+            ),
+            ParameterizedTypeName.get(
+                ClassName.get("promise.db", "FastTable"),
+                TypeVariableName.get("T"))
+        ))
         .addCode(codeBlock.build())
         .build())
 
     return funSpecs
   }
 
-  private var entities: Array<TypeElement> = emptyArray()
-
-  private fun getPackage(element: TypeElement, returnTypeName: String): String {
-    if (entities.isEmpty()) entities = element.getTableEntities(processingEnv)
-    var pack = ""
-    entities.forEach {
-      if (returnTypeName == it.getClassName()) {
-        pack = processingEnv.elementUtils.getPackageOf(it).toString()
-      }
-    }
-    return pack
-
-  }
-
-
 }
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/db/ompiler/annotation/DatabaseAnnotationGenerator.kt b/compiler/src/main/java/promise/database/compiler/DatabaseAnnotationGenerator.kt
similarity index 65%
rename from compiler/src/main/java/promise/db/ompiler/annotation/DatabaseAnnotationGenerator.kt
rename to compiler/src/main/java/promise/database/compiler/DatabaseAnnotationGenerator.kt
index c949ffb..d9b4904 100644
--- a/compiler/src/main/java/promise/db/ompiler/annotation/DatabaseAnnotationGenerator.kt
+++ b/compiler/src/main/java/promise/database/compiler/DatabaseAnnotationGenerator.kt
@@ -11,55 +11,46 @@
  * limitations under the License.
  */
 
-package promise.db.ompiler.annotation
+package promise.database.compiler
 
 import com.squareup.javapoet.AnnotationSpec
 import com.squareup.javapoet.ClassName
 import com.squareup.javapoet.CodeBlock
-import promise.db.ompiler.CodeBlockGenerator
-import promise.db.ompiler.Utils
-import promise.db.ompiler.getClassName
-import promise.db.ompiler.getDatabaseVersion
-import promise.db.ompiler.getTableEntities
+import promise.database.compiler.utils.LogUtil
+import promise.database.compiler.utils.getDatabaseVersion
+import promise.database.compiler.utils.getTableClassNameString
+import promise.database.compiler.utils.getTableEntities
 import javax.annotation.processing.ProcessingEnvironment
 import javax.lang.model.element.Element
 import javax.lang.model.element.TypeElement
-import javax.tools.Diagnostic
-
+import kotlin.math.max
 
 class DatabaseAnnotationGenerator(
     private val processingEnv: ProcessingEnvironment,
-    private val element: Element) : CodeBlockGenerator<AnnotationSpec> {
-  /*
-  @Database(
-    tables = [
-      PersonFastTable::class
-    ],
-    version = 2
-)
-   */
+    private val element: Element) : CodeGenerator<AnnotationSpec> {
+
   override fun generate(): AnnotationSpec {
     if (element is TypeElement) {
-      var stmt = " {\n"
+      var stmt = "{\n"
       var entities: Array<TypeElement>? = null
       try {
         entities = element.getTableEntities(processingEnv)
       } catch (e: Throwable) {
-        processingEnv.messager.printMessage(Diagnostic.Kind.ERROR, "getTableEntities: ${Utils.getStackTraceString(e)}")
+        LogUtil.e(e)
       }
-      val version = element.getDatabaseVersion()
+      val generatedVersion = TableMetaDataWriter.finalMaxDbVersion()
+      val version = max(element.getDatabaseVersion(), generatedVersion)
       try {
         entities?.forEachIndexed { index, entityClass ->
-          val className = entityClass.getClassName()
-          //fileBuilder.addImport(pack, className)
+          val className = entityClass.getTableClassNameString()
           stmt += "$className.class"
           if (index != entities.size - 1) {
-            stmt += ", \n"
+            stmt += ",\n"
           }
         }
         stmt += "\n}"
       } catch (e: Throwable) {
-        processingEnv.messager.printMessage(Diagnostic.Kind.ERROR, "DatabaseAnnotationGenerator: ${Utils.getStackTraceString(e)}")
+        LogUtil.e(e)
       }
       return AnnotationSpec.builder(ClassName.get("promise.db", "Database"))
           .addMember("tables", CodeBlock.of(stmt))
diff --git a/compiler/src/main/java/promise/db/ompiler/DatabaseCrudStubsGenerator.kt b/compiler/src/main/java/promise/database/compiler/DatabaseCrudStubMethodsGenerator.kt
similarity index 71%
rename from compiler/src/main/java/promise/db/ompiler/DatabaseCrudStubsGenerator.kt
rename to compiler/src/main/java/promise/database/compiler/DatabaseCrudStubMethodsGenerator.kt
index a1239c2..318cb41 100644
--- a/compiler/src/main/java/promise/db/ompiler/DatabaseCrudStubsGenerator.kt
+++ b/compiler/src/main/java/promise/database/compiler/DatabaseCrudStubMethodsGenerator.kt
@@ -11,22 +11,21 @@
  * limitations under the License.
  */
 
-package promise.db.ompiler
+package promise.database.compiler
 
 import com.squareup.javapoet.TypeSpec
 import javax.annotation.processing.ProcessingEnvironment
 import javax.lang.model.element.Element
-import javax.lang.model.element.TypeElement
 
-class DatabaseCrudStubsGenerator(
+class DatabaseCrudStubMethodsGenerator(
     private val typeSpec: TypeSpec.Builder,
     private val element: Element,
-    private val processingEnv: ProcessingEnvironment) : CodeBlockGenerator<String> {
+    private val processingEnv: ProcessingEnvironment) : CodeGenerator<String> {
 
   override fun generate(): String {
-    val pack = processingEnv.elementUtils.getPackageOf(element).toString()
-
-    val entities = (element as TypeElement).getTableEntities(processingEnv)
+//    val pack = processingEnv.elementUtils.getPackageOf(element).toString()
+//
+//    val entities = (element as TypeElement).getTableEntities(processingEnv)
 
     return "created"
   }
diff --git a/compiler/src/main/java/promise/database/compiler/DatabaseEntityAnnotatedProcessor.kt b/compiler/src/main/java/promise/database/compiler/DatabaseEntityAnnotatedProcessor.kt
new file mode 100644
index 0000000..b08971f
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/DatabaseEntityAnnotatedProcessor.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler
+
+import com.squareup.javapoet.AnnotationSpec
+import com.squareup.javapoet.ClassName
+import com.squareup.javapoet.JavaFile
+import com.squareup.javapoet.MethodSpec
+import com.squareup.javapoet.TypeSpec
+import promise.database.compiler.utils.JavaUtils
+import promise.database.compiler.utils.asTableClassName
+import promise.database.compiler.utils.getTableClassNameString
+import promise.database.compiler.utils.getTableEntities
+import java.util.*
+import javax.annotation.processing.ProcessingEnvironment
+import javax.annotation.processing.RoundEnvironment
+import javax.lang.model.element.Element
+import javax.lang.model.element.Modifier
+import javax.lang.model.element.TypeElement
+
+class DatabaseEntityAnnotatedProcessor(private val processingEnv: ProcessingEnvironment,
+                                       private val database: TypeElement) : AnnotatedClassProcessor() {
+
+  override fun process(environment: RoundEnvironment?): List<JavaFile.Builder?>? =
+      Collections.singletonList(processElement(database))
+
+  private fun processElement(element: Element): JavaFile.Builder {
+    val className = element.simpleName.toString()
+    val pack = processingEnv.elementUtils.getPackageOf(element).toString()
+
+    val fileName = "${className}Impl"
+
+    val databaseAnnotationSpec = DatabaseAnnotationGenerator(processingEnv, element).generate()
+
+    val classBuilder = TypeSpec.classBuilder(fileName)
+
+    val constructorMethod = MethodSpec.constructorBuilder()
+        .addParameter(ClassName.get("promise.db", "FastDatabase"),
+            "fastDatabase")
+        .addModifiers(Modifier.PRIVATE)
+        .addStatement("super(fastDatabase)")
+    if (TypeConverterAnnotatedProcessor.typeConverter != null)
+      JavaUtils.generateAddConverterStatementInDatabaseConstructorMethod(processingEnv, constructorMethod, TypeConverterAnnotatedProcessor.typeConverter!!)
+
+    if (RelationsDaoGenerator.relationsMap.isNotEmpty())
+      classBuilder.addMethods(RelationsDaoGenerator.relationsMap.map {
+        MethodSpec.methodBuilder("get" + it.key.simpleName())
+            .addModifiers(Modifier.PUBLIC)
+            .returns(it.key)
+            .addCode(JavaUtils.generateGetRelationDaoCodeBlock(it).build())
+            .build()
+      })
+
+    val supressWarningsSpec = AnnotationSpec.builder(SuppressWarnings::class.java)
+        .addMember("value", "{\"unchecked\"}")
+
+    classBuilder.superclass(ClassName.get(pack, className))
+        .addAnnotation(databaseAnnotationSpec)
+        .addAnnotation(supressWarningsSpec.build())
+        .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
+        .addMethod(constructorMethod.build())
+
+    (element as TypeElement).getTableEntities(processingEnv).forEach {
+      classBuilder.addMethod(MethodSpec.methodBuilder("get" + it.getTableClassNameString())
+          .addModifiers(Modifier.PUBLIC)
+          .returns(it.asTableClassName(processingEnv))
+          .addCode(JavaUtils.generateGetTableStatement(processingEnv, it))
+          .addAnnotation(supressWarningsSpec.build())
+          .build())
+    }
+
+    DatabaseStaticMethodsGenerator(classBuilder, element, processingEnv).generate()
+
+    val abstractFuncsBuilder = DatabaseAbstractMethodsGenerator(element, processingEnv)
+
+    abstractFuncsBuilder.generate()?.forEach {
+      classBuilder.addMethod(it)
+    }
+
+    DatabaseCrudStubMethodsGenerator(classBuilder, element, processingEnv).generate()
+
+    return JavaFile.builder(pack, classBuilder.build())
+
+  }
+}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/database/compiler/DatabaseMetaDataWriter.kt b/compiler/src/main/java/promise/database/compiler/DatabaseMetaDataWriter.kt
new file mode 100644
index 0000000..ce119a4
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/DatabaseMetaDataWriter.kt
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler
+
+import com.fasterxml.jackson.core.JsonProcessingException
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
+import promise.database.compiler.migration.DatabaseMetaData
+import promise.database.compiler.utils.LogUtil
+import promise.database.compiler.utils.getDatabaseVersion
+import java.io.File
+import java.io.FileReader
+import java.io.FileWriter
+import java.io.IOException
+import javax.lang.model.element.TypeElement
+import kotlin.math.max
+
+class DatabaseMetaDataWriter
+(
+    private val databaseElement: TypeElement,
+    private val schemasPath: String) {
+
+  init {
+    val dir = File(schemasPath)
+    dir.parentFile.mkdirs()
+    dir.mkdirs()
+  }
+
+  var currentDatabaseMetaData: DatabaseMetaData? = null
+
+  @Suppress("RECEIVER_NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
+  fun loadCurrentMetaData() = try {
+    val file = File(schemasPath)
+    if (file.exists() && file.isDirectory) {
+      var files = file.listFiles { pathname -> pathname.isFile && pathname.name.endsWith(".yml") }
+          .toList()
+      if (files.isNotEmpty()) {
+        val currentFile: File
+        if (files.size == 1) currentFile = files[0] else {
+          files = files.sortedWith(Comparator<File> { o1, o2 -> o1.name.compareTo(o2.name) })
+          currentFile = files.last()
+        }
+        //LogUtil.n("Current file: ${currentFile.name}")
+        val om = ObjectMapper(YAMLFactory())
+        //xmlMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        val fileWriter = FileReader(currentFile)
+        currentDatabaseMetaData = om.readValue(fileWriter, DatabaseMetaData::class.java)
+        fileWriter.close()
+      } else currentDatabaseMetaData = DatabaseMetaData()
+    } else currentDatabaseMetaData = DatabaseMetaData()
+  } catch (e: JsonProcessingException) {
+    LogUtil.e(e)
+  } catch (e: IOException) {
+    LogUtil.e(e)
+  }
+
+  fun process(
+      //elements: Map<Element, String>
+  ) {
+    val databaseMetaData = DatabaseMetaData()
+    if (TableMetaDataWriter.tableMetaData.isNotEmpty()) {
+      databaseMetaData.tableMetaData = TableMetaDataWriter.tableMetaData
+      val generatedVersion = TableMetaDataWriter.finalMaxDbVersion()
+      databaseMetaData.dbVersion = max(databaseElement.getDatabaseVersion(), generatedVersion)
+    }
+    serializeToXML(databaseMetaData, databaseMetaData.dbVersion)
+  }
+
+  private fun serializeToXML(obj: Any, version: Int) {
+    try {
+      val file = File(schemasPath + File.separator + version + ".yml")
+      if (file.exists()) file.delete()
+      file.createNewFile()
+      val om = ObjectMapper(YAMLFactory())
+      // serialize our Object into XML string
+      val ymlString = om.writeValueAsString(obj)
+      // write XML string to file
+      val fileWriter = FileWriter(file)
+      fileWriter.write(ymlString)
+      fileWriter.close()
+    } catch (e: JsonProcessingException) {
+      LogUtil.e(e)
+    } catch (e: IOException) {
+      LogUtil.e(e)
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/db/ompiler/DatabaseCompanionPropsGenerator.kt b/compiler/src/main/java/promise/database/compiler/DatabaseStaticMethodsGenerator.kt
similarity index 52%
rename from compiler/src/main/java/promise/db/ompiler/DatabaseCompanionPropsGenerator.kt
rename to compiler/src/main/java/promise/database/compiler/DatabaseStaticMethodsGenerator.kt
index 2d2f0f6..756d97a 100644
--- a/compiler/src/main/java/promise/db/ompiler/DatabaseCompanionPropsGenerator.kt
+++ b/compiler/src/main/java/promise/database/compiler/DatabaseStaticMethodsGenerator.kt
@@ -11,104 +11,91 @@
  * limitations under the License.
  */
 
-package promise.db.ompiler
+package promise.database.compiler
 
 import com.squareup.javapoet.ClassName
 import com.squareup.javapoet.CodeBlock
 import com.squareup.javapoet.FieldSpec
 import com.squareup.javapoet.MethodSpec
 import com.squareup.javapoet.TypeSpec
-import promise.db.AddedEntity
+import promise.database.AddedEntity
+import promise.database.compiler.utils.JavaUtils
+import promise.database.compiler.utils.getTableClassNameString
+import promise.database.compiler.utils.getTableEntities
+import promise.database.compiler.utils.toTypeName
 import javax.annotation.processing.ProcessingEnvironment
 import javax.lang.model.element.Element
 import javax.lang.model.element.Modifier
 import javax.lang.model.element.TypeElement
-import javax.tools.Diagnostic
 
-class DatabaseCompanionPropsGenerator(
+class DatabaseStaticMethodsGenerator(
     private val typeSpec: TypeSpec.Builder,
     private val element: Element,
-    private val processingEnv: ProcessingEnvironment) : CodeBlockGenerator<String> {
+    private val processingEnv: ProcessingEnvironment) : CodeGenerator<String> {
+
+  private val tableMetaDataWriter = PromiseDatabaseCompiler.databaseMetaDataWriter
 
   override fun generate(): String {
     val className = element.simpleName.toString()
-    val classnameImpl = "${className}_Impl"
+    val classnameImpl = "${className}Impl"
     val pack = processingEnv.elementUtils.getPackageOf(element).toString()
 
-    try {
-      //fileSpec.addImport("android.database.sqlite", "SQLiteDatabase")
-    } catch (e: Throwable) {
-      processingEnv.messager.printMessage(Diagnostic.Kind.ERROR, "Add Import: ${Utils.getStackTraceString(e)}")
-    }
+    tableMetaDataWriter.process()
 
     val entities = (element as TypeElement).getTableEntities(processingEnv)
-
-    /**
-     * private static Migration getMigration() {
-            return new Migration() {
-              @Override
-              public void onMigrate(@NotNull FastDatabase database, @NotNull SQLiteDatabase sqLiteDatabase, int oldVersion, int newVersion) {
-                if (oldVersion == 2 && newVersion == 3) {
-                  database.add(sqLiteDatabase, database.obtain(PersonFastTable.class));
-                }
-              }
-            };
-          }
-     */
-    var migrationInitialzer = """
-      return new Migration() {
-              @Override
-              public void onMigrate(FastDatabase database, android.database.sqlite.SQLiteDatabase sqLiteDatabase, int oldVersion, int newVersion) {
-    """.plus("\n").trimIndent()
-    entities.forEach {
-      val migrationAnnoTation = it.getAnnotation(AddedEntity::class.java)
-      if (migrationAnnoTation != null) {
-        migrationInitialzer += """
-          if (oldVersion == ${migrationAnnoTation.fromVersion} && newVersion == ${migrationAnnoTation.toVersion}) {
-            database.add(sqLiteDatabase, database.obtain(${it.getClassName()}.class));
-          } 
-          
-    """.trimIndent()
+        .filter {
+          it.getAnnotation(AddedEntity::class.java) != null
+        }
+    val migrationCodeBlock = CodeBlock.builder()
+    if (entities.isEmpty()) migrationCodeBlock.addStatement("return null")
+    else {
+      migrationCodeBlock.beginControlFlow("return new Migration()")
+      JavaUtils.generateDatabaseMigrationOverrideControlBlock(migrationCodeBlock)
+      entities.forEach {
+        val migrationAnnotation = it.getAnnotation(AddedEntity::class.java)
+        migrationCodeBlock.beginControlFlow("if (oldVersion == ${migrationAnnotation.fromVersion} && newVersion == ${migrationAnnotation.toVersion})")
+        migrationCodeBlock.addStatement("database.add(sqLiteDatabase, database.obtain(${it.getTableClassNameString()}.class))")
+        migrationCodeBlock.endControlFlow()
       }
+      migrationCodeBlock.endControlFlow()
+      migrationCodeBlock.add("};")
     }
 
-
-    migrationInitialzer += """
-        }
-      };
-    """.trimIndent()
-
     val migrationPropSpec = MethodSpec.methodBuilder("getMigration")
         .returns(ClassName.get("promise.db", "Migration"))
         .addModifiers(Modifier.PRIVATE, Modifier.STATIC)
-        .addCode(CodeBlock.of(migrationInitialzer))
+        .addCode(migrationCodeBlock.build())
         .build()
 
     typeSpec.addMethod(migrationPropSpec)
-    // adding db instance var
-    // private static volatile FastDatabase instance = null;
-    typeSpec.addField(FieldSpec.builder(ClassName.get("promise.db", "FastDatabase"),"instance")
-        .initializer("null")
-        .addModifiers(Modifier.PRIVATE)
-        .build())
 
-    typeSpec.addField(FieldSpec.builder(Boolean::class.javaPrimitiveType,"initialized")
+    if (TypeConverterAnnotatedProcessor.typeConverter != null)
+      typeSpec.addField(FieldSpec.builder(
+          TypeConverterAnnotatedProcessor.typeConverter!!.toTypeName(),
+          "typeConverter")
+          .addModifiers(Modifier.PRIVATE)
+          .addJavadoc("""
+          TypeConverter instance
+        """.trimIndent())
+          .build())
+
+    typeSpec.addField(FieldSpec.builder(Boolean::class.javaPrimitiveType, "initialized")
         .initializer("false")
+        .addJavadoc("""
+          Check to ensure database instance is not instantiated more than once
+        """.trimIndent())
         .addModifiers(Modifier.PRIVATE, Modifier.VOLATILE, Modifier.STATIC)
         .build())
 
 
-    // @JvmStatic
-    //    fun createDatabase(name: String): GeneratedDatabase {
-    //      if (instance != null) throw IllegalStateException("Database already created")
-    //      instance = FastDatabase.createDatabase(GeneratedDatabaseImpl::class.java,
-    //          name, migration)
-    //      return GeneratedDatabaseImpl()
-    //    }
     typeSpec.addMethod(MethodSpec.methodBuilder("createDatabase")
         .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
-        .addParameter(ClassName.get(String::class.java),"name")
-        .returns(ClassName.get(pack, className))
+        .addParameter(ClassName.get(String::class.java), "name")
+        .returns(ClassName.get(pack, classnameImpl))
+        .addJavadoc("""
+          Creates the simplest database with name specified
+          @Param name the name of the database
+        """.trimIndent())
         .addCode(CodeBlock.of("""
           if (initialized) throw new IllegalStateException("Database already created");
           initialized = true;
@@ -119,25 +106,29 @@ class DatabaseCompanionPropsGenerator(
     // add with creation callback
     typeSpec.addMethod(MethodSpec.methodBuilder("createDatabase")
         .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
-        .addParameter(ClassName.get(String::class.java),"name")
-        .addParameter(ClassName.get("promise.db", "DatabaseCreationCallback"),"databaseCreationCallback")
-        .returns(ClassName.get(pack, className))
+        .addParameter(ClassName.get(String::class.java), "name")
+        .addParameter(ClassName.get("promise.db", "DatabaseCreationCallback"), "databaseCreationCallback")
+        .returns(ClassName.get(pack, classnameImpl))
+        .addJavadoc("""
+          Creates the simplest database with name specified with callback
+          Callback can be used to pre populate database with records or
+          set flags like foreign keys
+          @Param name the name of the database
+          @Param databaseCreationCallback callback
+        """.trimIndent())
         .addCode(CodeBlock.of("""
           if (initialized) throw new IllegalStateException("Database already created");
           initialized = true;
-          return new $classnameImpl(FastDatabase.createDatabase($classnameImpl.class, name, getMigration()).setDatabaseCreationCallback(databaseCreationCallback));
+          return new $classnameImpl(FastDatabase.createDatabase($classnameImpl.class, name, getMigration(), databaseCreationCallback));
         """.trimIndent()))
         .build())
 
-    //    @JvmStatic
-    //    fun createInMemoryDatabase(): GeneratedDatabase {
-    //      if (instance != null) throw IllegalStateException("Database already created")
-    //      instance = FastDatabase.createInMemoryDatabase(GeneratedDatabaseImpl::class.java)
-    //      return GeneratedDatabaseImpl()
-    //    }
     typeSpec.addMethod(MethodSpec.methodBuilder("createInMemoryDatabase")
         .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
-        .returns(ClassName.get(pack, className))
+        .returns(ClassName.get(pack, classnameImpl))
+        .addJavadoc("""
+          Creates an in memory database, useful for tests
+        """.trimIndent())
         .addCode(CodeBlock.of("""
           if (initialized) throw new IllegalStateException("Database already created");
           initialized = true;
@@ -147,24 +138,27 @@ class DatabaseCompanionPropsGenerator(
     // with in memory database
     typeSpec.addMethod(MethodSpec.methodBuilder("createInMemoryDatabase")
         .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
-        .addParameter(ClassName.get("promise.db", "DatabaseCreationCallback"),"databaseCreationCallback")
-        .returns(ClassName.get(pack, className))
+        .addParameter(ClassName.get("promise.db", "DatabaseCreationCallback"), "databaseCreationCallback")
+        .returns(ClassName.get(pack, classnameImpl))
+        .addJavadoc("""
+          Creates an in memory database, useful for tests
+          Callback can be used to pre populate database with records or
+          set flags like foreign keys
+          @Param databaseCreationCallback callback
+        """.trimIndent())
         .addCode(CodeBlock.of("""
           if (initialized) throw new IllegalStateException("Database already created");
           initialized = true;
-          return new $classnameImpl(FastDatabase.createInMemoryDatabase($classnameImpl.class).setDatabaseCreationCallback(databaseCreationCallback));
+          return new $classnameImpl(FastDatabase.createInMemoryDatabase($classnameImpl.class, databaseCreationCallback));
         """.trimIndent()))
         .build())
 
-    //    @JvmStatic
-    //    fun createReactiveInMemoryDatabase(): GeneratedDatabase {
-    //      if (instance != null) throw IllegalStateException("Database already created")
-    //      instance = FastDatabase.createInMemoryReactiveDatabase(GeneratedDatabaseImpl::class.java)
-    //      return GeneratedDatabaseImpl()
-    //    }
     typeSpec.addMethod(MethodSpec.methodBuilder("createReactiveInMemoryDatabase")
         .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
-        .returns(ClassName.get(pack, className))
+        .returns(ClassName.get(pack, classnameImpl))
+        .addJavadoc("""
+          Creates an in memory database, enables calling rx DML functions in the tables
+        """.trimIndent())
         .addCode(CodeBlock.of("""
           if (initialized) throw new IllegalStateException("Database already created");
           initialized = true;
@@ -174,8 +168,14 @@ class DatabaseCompanionPropsGenerator(
     // with callback
     typeSpec.addMethod(MethodSpec.methodBuilder("createReactiveInMemoryDatabase")
         .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
-        .addParameter(ClassName.get("promise.db", "DatabaseCreationCallback"),"databaseCreationCallback")
-        .returns(ClassName.get(pack, className))
+        .addParameter(ClassName.get("promise.db", "DatabaseCreationCallback"), "databaseCreationCallback")
+        .returns(ClassName.get(pack, classnameImpl))
+        .addJavadoc("""
+          Creates an in memory database, enables calling rx DML functions in the tables
+          Callback can be used to pre populate database with records or
+          set flags like foreign keys
+          @Param databaseCreationCallback callback
+        """.trimIndent())
         .addCode(CodeBlock.of("""
           if (initialized) throw new IllegalStateException("Database already created");
           initialized = true;
@@ -183,17 +183,14 @@ class DatabaseCompanionPropsGenerator(
         """.trimIndent()))
         .build())
 
-    //    @JvmStatic
-    //    fun createReactiveDatabase(name: String): GeneratedDatabase {
-    //      if (instance != null) throw IllegalStateException("Database already created")
-    //      instance = FastDatabase.createReactiveDatabase(GeneratedDatabaseImpl::class.java,
-    //          name, migration)
-    //      return GeneratedDatabaseImpl()
-    //    }
     typeSpec.addMethod(MethodSpec.methodBuilder("createReactiveDatabase")
         .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
-        .addParameter(ClassName.get(String::class.java),"name")
-        .returns(ClassName.get(pack, className))
+        .addParameter(ClassName.get(String::class.java), "name")
+        .returns(ClassName.get(pack, classnameImpl))
+        .addJavadoc("""
+          Creates database, that enables calling rx DML functions in the tables
+          @Param name name of the database 
+        """.trimIndent())
         .addCode(CodeBlock.of("""
           if (initialized) throw new IllegalStateException("Database already created");
            initialized = true;
@@ -204,29 +201,22 @@ class DatabaseCompanionPropsGenerator(
     // with creation callback
     typeSpec.addMethod(MethodSpec.methodBuilder("createReactiveDatabase")
         .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
-        .addParameter(ClassName.get(String::class.java),"name")
-        .addParameter(ClassName.get("promise.db", "DatabaseCreationCallback"),"databaseCreationCallback")
-        .returns(ClassName.get(pack, className))
+        .addParameter(ClassName.get(String::class.java), "name")
+        .addParameter(ClassName.get("promise.db", "DatabaseCreationCallback"), "databaseCreationCallback")
+        .returns(ClassName.get(pack, classnameImpl))
+        .addJavadoc("""
+          Creates database, that enables calling rx DML functions in the tables
+          Callback can be used to pre populate database with records or
+          set flags like foreign keys
+          @Param name name of the database 
+          @Param databaseCreationCallback callback
+        """.trimIndent())
         .addCode(CodeBlock.of("""
           if (initialized) throw new IllegalStateException("Database already created");
            initialized = true;
           return new $classnameImpl(FastDatabase.createReactiveDatabase($classnameImpl.class, name, getMigration(), databaseCreationCallback));
         """.trimIndent()))
         .build())
-    //    @JvmStatic
-    //    fun getDatabaseInstance(): FastDatabase {
-    //      if (instance == null) throw IllegalStateException("Database not initialized or created yet")
-    //      return instance!!
-    //    }
-    typeSpec.addMethod(MethodSpec.methodBuilder("getDatabaseInstance")
-        .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
-        .addAnnotation(Override::class.java)
-        .returns(ClassName.get("promise.db", "FastDatabase"))
-        .addCode(CodeBlock.of("""
-          if (instance == null) throw new IllegalStateException("Database not initialized or created yet");
-          return instance;
-        """.trimIndent()))
-        .build())
 
     return "created"
   }
diff --git a/compiler/src/main/java/promise/database/compiler/EntityAnnotatedProcessor.kt b/compiler/src/main/java/promise/database/compiler/EntityAnnotatedProcessor.kt
new file mode 100644
index 0000000..4ff2616
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/EntityAnnotatedProcessor.kt
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler
+
+import com.squareup.javapoet.AnnotationSpec
+import com.squareup.javapoet.ClassName
+import com.squareup.javapoet.CodeBlock
+import com.squareup.javapoet.FieldSpec
+import com.squareup.javapoet.JavaFile
+import com.squareup.javapoet.MethodSpec
+import com.squareup.javapoet.ParameterizedTypeName
+import com.squareup.javapoet.TypeName
+import com.squareup.javapoet.TypeSpec
+import org.jetbrains.annotations.NotNull
+import promise.database.Entity
+import promise.database.compiler.utils.JavaUtils
+import promise.database.compiler.utils.LogUtil
+import promise.database.compiler.utils.checkIfAnyElementNeedsTypeConverter
+import promise.database.compiler.utils.getTableClassNameString
+import promise.database.compiler.utils.getTableEntities
+import javax.annotation.processing.ProcessingEnvironment
+import javax.annotation.processing.RoundEnvironment
+import javax.lang.model.element.Element
+import javax.lang.model.element.ElementKind
+import javax.lang.model.element.Modifier
+import javax.lang.model.element.TypeElement
+import javax.lang.model.util.ElementFilter
+
+class EntityAnnotatedProcessor(private val processingEnv: ProcessingEnvironment,
+                               private val database: TypeElement) : AnnotatedClassProcessor() {
+
+  private val entities = database.getTableEntities(processingEnv)
+
+  override fun process(environment: RoundEnvironment?): List<JavaFile.Builder?>? {
+    val javaFiles = ArrayList<JavaFile.Builder?>()
+    environment?.getElementsAnnotatedWith(Entity::class.java)
+        ?.forEach { element ->
+          val identifiableInterface = processingEnv.elementUtils.getTypeElement("promise.commons.model.Identifiable")
+          val declaredInterface = JavaUtils.toWildCardType(processingEnv, identifiableInterface, 1)
+          if (!JavaUtils.isSubTypeOfDeclaredType(processingEnv, element as TypeElement, declaredInterface))
+            LogUtil.e(Exception("The Entity class ${element.simpleName} must implement Identifiable"), element)
+          else javaFiles.add(processAnnotation(element))
+        }
+    return javaFiles
+  }
+
+  private fun processAnnotation(element: Element): JavaFile.Builder {
+    if (!entities.map { it.asType().toString() }.contains(element.asType().toString()))
+      LogUtil.e(Exception("Entity class ${element.simpleName} is not registered in database"), database)
+
+/**
+ if (ElementFilter.methodsIn(element.enclosedElements).none {
+          it.kind == ElementKind.CONSTRUCTOR && it.parameters.isEmpty()
+        }) LogUtil.e(Exception("$element must have a no args constructor"), element)
+ */
+   
+    val className = element.simpleName.toString()
+    val pack = processingEnv.elementUtils.getPackageOf(element).toString()
+
+    val fileName = element.getTableClassNameString()
+
+    val tableAnnotationSpec = TableAnnotationGenerator(element, processingEnv).generate()
+
+    val classBuilder = TypeSpec.classBuilder(fileName)
+        .addModifiers(Modifier.PUBLIC)
+        .superclass(ParameterizedTypeName.get(
+            ClassName.get("promise.db", "FastTable"),
+            ClassName.get(pack, className))
+        )
+        .addMethod(MethodSpec.constructorBuilder()
+            .addModifiers(Modifier.PUBLIC)
+            .addParameter(
+                ClassName.get("promise.db", "FastDatabase")
+                    .annotated(AnnotationSpec.builder(NotNull::class.java).build()),
+                "database")
+            .addStatement("super(database)")
+            .build())
+
+    classBuilder.addAnnotation(tableAnnotationSpec)
+
+    val activeRecordType = processingEnv.elementUtils.getTypeElement("promise.db.ActiveRecord")
+    val declaredActiveRecordType = JavaUtils.toWildCardType(processingEnv, activeRecordType, 1)
+
+    if (JavaUtils.isSubTypeOfDeclaredType(processingEnv, (element as TypeElement), declaredActiveRecordType))
+      classBuilder.addMethod(MethodSpec.methodBuilder("createEntityInstance")
+          .addAnnotation(Override::class.java)
+          .addAnnotation(NotNull::class.java)
+          .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
+          .returns(ClassName.get(pack, className))
+          .addCode("return new $className();")
+          .build())
+
+    // static column block generation
+    val tableColumnPropsGenerator = TableColumnFieldsGenerator(processingEnv, element.enclosedElements)
+
+    if (element.checkIfAnyElementNeedsTypeConverter()) {
+      classBuilder.addField(FieldSpec.builder(TypeName.get(TypeConverterAnnotatedProcessor
+          .typeConverter!!.asType()), "typeConverter")
+          .addModifiers(Modifier.PRIVATE)
+          .build())
+      classBuilder.addMethod(MethodSpec.methodBuilder("setTypeConverter")
+          .addModifiers(Modifier.PUBLIC)
+          .addParameter(TypeName.get(TypeConverterAnnotatedProcessor
+              .typeConverter!!.asType()), "typeConverter")
+          .addStatement("this.typeConverter = typeConverter")
+          .build())
+    }
+
+    val idColumnSpec = FieldSpec.builder(
+        ParameterizedTypeName.get(
+            ClassName.get("promise.db", "Column"),
+            ClassName.get(Integer::class.java)
+        ), "idColumn")
+        .addModifiers(Modifier.STATIC, Modifier.PUBLIC, Modifier.FINAL)
+        .initializer(CodeBlock.of("FastTable.getId()")).build()
+
+    classBuilder.addField(idColumnSpec)
+
+    val tagSpec = JavaUtils.generateEntityTableLogField(element)
+
+    classBuilder.addField(tagSpec)
+
+    val columnSpecs = tableColumnPropsGenerator.generate()
+
+    columnSpecs.values.forEach {
+      classBuilder.addField(it)
+    }
+
+    // column register generation
+    val columnRegSpecGenerator = TableRegisteredColumnsMethodGenerator(tableColumnPropsGenerator.genColValues.map { it.second })
+    classBuilder.addMethod(columnRegSpecGenerator.generate())
+
+    // serializer generator
+    val serializerGenerator = TableSerializerMethodGenerator(pack, className, tableColumnPropsGenerator.genColValues)
+    classBuilder.addMethod(serializerGenerator.generate())
+
+    // deserializer generator
+    val deserializerGenerator = TableDeserializerMethodGenerator(pack, className, tableColumnPropsGenerator.genColValues)
+    classBuilder.addMethod(deserializerGenerator.generate())
+
+    // migrations
+    val elemMap = HashMap<Element, String>()
+    columnSpecs.forEach {
+      elemMap[it.key.first] = it.key.second
+    }
+    val migrationGenerator = TableMigrationFieldGenerator(element, elemMap)
+    val migrationFunc = migrationGenerator.generate()
+    if (migrationFunc != null) classBuilder.addMethod(migrationFunc)
+
+    return JavaFile.builder(pack, classBuilder.build())
+  }
+
+}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/database/compiler/PromiseDatabaseCompiler.kt b/compiler/src/main/java/promise/database/compiler/PromiseDatabaseCompiler.kt
new file mode 100644
index 0000000..8a1ef02
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/PromiseDatabaseCompiler.kt
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler
+
+import com.google.auto.service.AutoService
+import com.squareup.javapoet.JavaFile
+import promise.database.DAO
+import promise.database.DatabaseEntity
+import promise.database.Entity
+import promise.database.TypeConverter
+import promise.database.compiler.utils.JavaUtils
+import promise.database.compiler.utils.LogUtil
+import java.io.File
+import javax.annotation.processing.AbstractProcessor
+import javax.annotation.processing.ProcessingEnvironment
+import javax.annotation.processing.Processor
+import javax.annotation.processing.RoundEnvironment
+import javax.annotation.processing.SupportedOptions
+import javax.annotation.processing.SupportedSourceVersion
+import javax.lang.model.SourceVersion
+import javax.lang.model.element.ElementKind
+import javax.lang.model.element.Modifier
+import javax.lang.model.element.TypeElement
+
+@AutoService(Processor::class)
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedOptions(PromiseDatabaseCompiler.KAPT_JAVA_GENERATED_OPTION_NAME)
+class PromiseDatabaseCompiler : AbstractProcessor() {
+
+  override fun init(processingEnv: ProcessingEnvironment?) {
+    super.init(processingEnv)
+    LogUtil.initLogger(processingEnv)
+  }
+
+  private fun getDatabaseElement(environment: RoundEnvironment?, processingEnv: ProcessingEnvironment): TypeElement? {
+    val databases = environment?.getElementsAnnotatedWith(DatabaseEntity::class.java) ?: emptySet()
+    if (databases.size > 1)
+      LogUtil.e(Exception("There can only be one database in the module"))
+    else if (databases.size == 1) {
+      val element = databases.first()
+      if (element.kind != ElementKind.CLASS) {
+        LogUtil.e(Exception("Only classes can be annotated"), element)
+        return null
+      }
+      if (element.kind == ElementKind.CLASS && !(element as TypeElement).modifiers.contains(Modifier.ABSTRACT))
+        LogUtil.e(Exception("Database class must be abstract"), element)
+      val promiseDatabaseType = JavaUtils.getDeclaredType(processingEnv,
+          processingEnv.elementUtils.getTypeElement("promise.db.PromiseDatabase"))
+      if (!JavaUtils.isSubTypeOfDeclaredType(processingEnv, element, promiseDatabaseType))
+        LogUtil.e(Exception("Database class must extend from promise.db.PromiseDatabase"), element)
+      return element as TypeElement
+    }
+    return null
+  }
+
+  override fun process(mutableSet: MutableSet<out TypeElement>?, environment: RoundEnvironment?): Boolean {
+    if (mutableSet == null || mutableSet.isEmpty()) return false
+    try {
+      val database = getDatabaseElement(environment, processingEnv)
+      if (database != null) {
+        var schelocation = ""
+        val options = processingEnv?.options ?: emptyMap()
+        if (options.containsKey("promise.database.projectDir")) schelocation = options["promise.database.projectDir"]!!
+        else LogUtil.e(Exception("you must provide schema location as argument"))
+        val finalLocation = "${schelocation}${File.separator}schemas${File.separator}${database.asType()}"
+        //LogUtil.e(Exception("Schema loc $finalLocation"))
+        databaseMetaDataWriter = DatabaseMetaDataWriter(database, finalLocation)
+      } else LogUtil.e(Exception("No database class found in module"))
+      val javaFiles: ArrayList<JavaFile.Builder> = ArrayList()
+      val processors: ArrayList<AnnotatedClassProcessor> = ArrayList()
+      processors.add(TypeConverterAnnotatedProcessor(processingEnv))
+      processors.add(EntityAnnotatedProcessor(processingEnv, database!!))
+      processors.add(RelationsDaoProcessor(processingEnv))
+      //processors.add(DAOAnnotatedProcessor(processingEnv))
+      processors.add(DatabaseEntityAnnotatedProcessor(processingEnv, database))
+      processors.forEach {
+        val builders = it.process(environment)
+        if (builders != null) javaFiles.addAll(builders.filterNotNull())
+      }
+      javaFiles.forEach {
+        it
+            .indent("\t")
+            .skipJavaLangImports(true)
+            .addFileComment(
+                """
+                Copyright 2017, Android Promise Database
+                Licensed under the Apache License, Version 2.0, Android Promise.
+                you may not use this file except in compliance with the License.
+                You may obtain a copy of the License at
+                http://www.apache.org/licenses/LICENSE-2.0
+                Unless required by applicable law or agreed to in writing,
+                software distributed under the License is distributed on an AS IS BASIS,
+                WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied
+                See the License for the specific language governing permissions and
+                limitations under the License
+                
+                https://github.com/android-promise/database
+                
+                Generated by Android Promise Database Compiler, do not modify
+            """.trim()
+            )
+            .build()
+            .writeTo(processingEnv.filer)
+      }
+      return true
+    } catch (e: Throwable) {
+      LogUtil.e(e)
+      return false
+    }
+  }
+
+  override fun getSupportedAnnotationTypes(): MutableSet<String> = mutableSetOf(
+      Entity::class.java.name,
+      DatabaseEntity::class.java.name,
+      TypeConverter::class.java.name,
+      DAO::class.java.name
+  )
+
+  companion object {
+    const val KAPT_JAVA_GENERATED_OPTION_NAME = "kapt.java.generated"
+    lateinit var databaseMetaDataWriter: DatabaseMetaDataWriter
+  }
+
+}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/database/compiler/RelationsDaoGenerator.java b/compiler/src/main/java/promise/database/compiler/RelationsDaoGenerator.java
new file mode 100644
index 0000000..52d3b85
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/RelationsDaoGenerator.java
@@ -0,0 +1,585 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler;
+
+import com.google.auto.common.MoreElements;
+import com.google.auto.common.MoreTypes;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.MoreCollectors;
+import com.google.common.util.concurrent.MoreExecutors;
+import com.squareup.javapoet.ArrayTypeName;
+import com.squareup.javapoet.ClassName;
+import com.squareup.javapoet.CodeBlock;
+import com.squareup.javapoet.FieldSpec;
+import com.squareup.javapoet.JavaFile;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.ParameterSpec;
+import com.squareup.javapoet.ParameterizedTypeName;
+import com.squareup.javapoet.TypeName;
+import com.squareup.javapoet.TypeSpec;
+import com.squareup.javapoet.WildcardTypeName;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.ElementFilter;
+import javax.lang.model.util.ElementKindVisitor7;
+import javax.lang.model.util.SimpleElementVisitor7;
+
+import kotlin.Pair;
+import promise.database.Entity;
+import promise.database.HasMany;
+import promise.database.HasOne;
+import promise.database.compiler.utils.JavaUtils;
+import promise.database.compiler.utils.LogUtil;
+import promise.database.compiler.utils.PersistableEntityUtilsKt;
+import promise.database.compiler.utils.Utils;
+import promise.database.compiler.utils.UtilsKt;
+
+import static promise.database.compiler.utils.PersistableEntityUtilsKt.asTableClassName;
+import static promise.database.compiler.utils.PersistableEntityUtilsKt.camelCase;
+import static promise.database.compiler.utils.PersistableEntityUtilsKt.capitalizeFirst;
+import static promise.database.compiler.utils.PersistableEntityUtilsKt.getTableClassNameString;
+import static promise.database.compiler.utils.PersistableEntityUtilsKt.pluralize;
+
+public class RelationsDaoGenerator implements CodeGenerator<List<JavaFile.Builder>> {
+
+  public static HashMap<ClassName, HashMap<ClassName, Element>> relationsMap = new HashMap<>();
+  private ProcessingEnvironment processingEnvironment;
+  private TypeElement element;
+  private List<VariableElement> relationElements;
+  private TypeSpec.Builder classBuilder;
+  /*
+   * Variable name for element
+   */
+  private String parentElementVarName;
+  /*
+   * pluralized version of parentElementVarName
+   */
+  private String parentElementVarNames;
+  private String getParentElementTableVarName;
+
+  public RelationsDaoGenerator(ProcessingEnvironment processingEnvironment,
+                               TypeElement element,
+                               List<VariableElement> relationElements) {
+    this.processingEnvironment = processingEnvironment;
+    this.element = element;
+    this.relationElements = relationElements;
+    parentElementVarName = camelCase(element.getSimpleName().toString());
+    parentElementVarNames = pluralize(parentElementVarName);
+    getParentElementTableVarName = camelCase(getTableClassNameString(element));
+  }
+
+  @Override
+  public List<JavaFile.Builder> generate() throws Exception {
+    ArrayList<JavaFile.Builder> javaFiles = new ArrayList<>();
+    String className = element.getSimpleName().toString();
+    String pack = processingEnvironment.getElementUtils().getPackageOf(element).toString();
+    String fileName = className + "RelationsDao";
+    classBuilder = TypeSpec.classBuilder(fileName)
+        .addModifiers(Modifier.PUBLIC, Modifier.FINAL);
+    classBuilder.addField(FieldSpec.builder(
+        asTableClassName(element, processingEnvironment),
+        getParentElementTableVarName)
+        .addModifiers(Modifier.PRIVATE)
+        .build());
+    ArrayList<ParameterSpec> constructorParameters = new ArrayList<>();
+    HashMap<ClassName, Element> tableAndRelationElements = new HashMap<>();
+    ClassName parentRelationTableClassName = PersistableEntityUtilsKt.asTableClassName(element, processingEnvironment);
+    constructorParameters.add(ParameterSpec.builder(parentRelationTableClassName, getParentElementTableVarName).build());
+    tableAndRelationElements.put(parentRelationTableClassName, element);
+    relationElements.forEach(relationElement -> {
+      if (relationElement.getAnnotation(HasMany.class) != null) try {
+        Pair<ClassName, Element> pair = generateForHasManyRelation(relationElement, constructorParameters, tableAndRelationElements);
+        if (pair != null) tableAndRelationElements.put(pair.getFirst(), pair.getSecond());
+      } catch (Exception e) {
+        LogUtil.e(e, relationElement);
+      }
+      else if (relationElement.getAnnotation(HasOne.class) != null) try {
+        Pair<ClassName, Element> pair = generateForHasOneRelation(relationElement, constructorParameters, tableAndRelationElements);
+        if (pair != null) tableAndRelationElements.put(pair.getFirst(), pair.getSecond());
+      } catch (Exception e) {
+        LogUtil.e(e, relationElement);
+      }
+    });
+    CodeBlock.Builder constructorBlock = CodeBlock.builder();
+    constructorParameters.forEach(parameterSpec ->
+        constructorBlock.addStatement("this." + parameterSpec.name + " = " + parameterSpec.name));
+    classBuilder.addMethod(MethodSpec.constructorBuilder()
+        .addModifiers(Modifier.PRIVATE)
+        .addParameters(constructorParameters)
+        .addCode(constructorBlock.build())
+        .build());
+    generateRelationsDaoBuilder(constructorParameters, pack, fileName);
+    javaFiles.add(JavaFile.builder(pack, classBuilder.build()));
+    javaFiles.add(Utils.INSTANCE.generateInstanceProviderHolder(ClassName.get(pack, fileName)));
+    relationsMap.put(ClassName.get(pack, fileName), tableAndRelationElements);
+    return javaFiles;
+  }
+
+  private Pair<ClassName, Element> generateForHasManyRelation(Element hasManyRelationFieldElement,
+                                                              ArrayList<ParameterSpec> constructorParameters,
+                                                              HashMap<ClassName, Element> tableAndRelationElements) throws Exception {
+    if (JavaUtils.isCollectionType(processingEnvironment, (VariableElement) hasManyRelationFieldElement)) {
+      List<? extends TypeMirror> typeMirrors = JavaUtils.getParameterizedTypeMirrors((VariableElement) hasManyRelationFieldElement);
+      if (typeMirrors != null) {
+        /*
+         * Field name for the relation
+         */
+        String hasManyRelationFieldName = hasManyRelationFieldElement.getSimpleName().toString();
+        /*
+         * Element that this element is related to by HasMany relation
+         */
+        TypeElement relationElement = UtilsKt.asTypeElement(typeMirrors.get(0), processingEnvironment);
+        if (relationElement.getAnnotation(Entity.class) == null)
+          throw new Exception("Element related to " + element.getSimpleName() + " as HasMany in " + hasManyRelationFieldElement.getSimpleName() + " field is not marked as an Entity");
+        if (tableAndRelationElements.entrySet().stream().anyMatch(classNameElementEntry -> PersistableEntityUtilsKt.getTableName(classNameElementEntry.getValue())
+            .equals(PersistableEntityUtilsKt.getTableName(UtilsKt.asTypeElement(relationElement.asType(), processingEnvironment))))) {
+          LogUtil.e(new IllegalStateException("Relation has been repeated in "+element),  hasManyRelationFieldElement);
+          return null;
+        }
+
+        VariableElement relationHasOneRelatedElement = null;
+        for (VariableElement elem : ElementFilter.fieldsIn(relationElement.getEnclosedElements()))
+          if (elem.getAnnotation(HasOne.class) != null && JavaUtils.isTypeEqual(elem.asType(), TypeName.get(element.asType())))
+            relationHasOneRelatedElement = elem;
+        if (relationHasOneRelatedElement == null)
+          throw new Exception(relationElement.getSimpleName() + " is marked as HasMany in  " + hasManyRelationFieldElement.getSimpleName() + " field for " + element.getSimpleName() + " but it is not marked as HasOne relation field in " + element.getSimpleName());
+        /*
+         * Table ClassName for relationElement
+         */
+        ClassName relationElementTableClassName = asTableClassName(relationElement, processingEnvironment);
+        /*
+         * Variable name for relationElementTableClassName
+         */
+        String relationElementTableVarName = camelCase(getTableClassNameString(relationElement));
+        /*
+         * Name of relationElement
+         */
+        String relationElementVarName = relationElement.getSimpleName().toString();
+        /*
+         * name of relation element for collection types
+         */
+        String relationElementVarNames = pluralize(relationElementVarName);
+
+        /*
+         * adding field for Table of child relation element
+         */
+
+        constructorParameters.add(ParameterSpec.builder(relationElementTableClassName, relationElementTableVarName).build());
+        classBuilder.addField(FieldSpec.builder(relationElementTableClassName, relationElementTableVarName)
+            .addModifiers(Modifier.PRIVATE)
+            .build());
+
+        classBuilder.addMethod(MethodSpec.methodBuilder("paginateWith" + capitalizeFirst(hasManyRelationFieldName))
+            .addModifiers(Modifier.PUBLIC)
+            .addParameter(int.class, "skip")
+            .addParameter(int.class, "limit")
+            .returns(ParameterizedTypeName.get(ClassName.get("promise.model", "IdentifiableList"),
+                WildcardTypeName.subtypeOf(
+                    ClassName.get(element.asType())
+                )
+            )).addCode(CodeBlock.builder()
+                .addStatement("IdentifiableList<? extends $T> " + parentElementVarNames + " = " + getParentElementTableVarName + ".find().paginateDescending(skip, limit)", ClassName.get(element.asType()))
+                .beginControlFlow(parentElementVarNames + ".forEach(new $T<$T>()",
+                    ClassName.get("java.util.function", "Consumer"),
+                    ClassName.get(element.asType()))
+                .add("@Override\n")
+                .beginControlFlow("public void accept($T " + parentElementVarName + ")",
+                    ClassName.get(element.asType()))
+                .addStatement(parentElementVarName + ".set" + capitalizeFirst(hasManyRelationFieldName) + "(new $T<>(get" + capitalizeFirst(hasManyRelationFieldName) + "(" + parentElementVarName + ")))",
+                    ClassName.get("promise.model", "IdentifiableList"))
+                .endControlFlow()
+                .endControlFlow(")")
+                .addStatement("return " + parentElementVarNames)
+                .build())
+            .build());
+
+        classBuilder.addMethod(MethodSpec.methodBuilder("listWith" + capitalizeFirst(hasManyRelationFieldName))
+            .addModifiers(Modifier.PUBLIC)
+            .returns(ParameterizedTypeName.get(ClassName.get("promise.model", "IdentifiableList"),
+                WildcardTypeName.subtypeOf(
+                    ClassName.get(element.asType())
+                )
+            )).addCode(CodeBlock.builder()
+                .addStatement("IdentifiableList<? extends $T> " + parentElementVarNames + " = " + getParentElementTableVarName + ".findAll()", ClassName.get(element.asType()))
+                .beginControlFlow(parentElementVarNames + ".forEach(new $T<$T>()",
+                    ClassName.get("java.util.function", "Consumer"),
+                    ClassName.get(element.asType()))
+                .add("@Override\n")
+                .beginControlFlow("public void accept($T " + parentElementVarName + ")",
+                    ClassName.get(element.asType()))
+                .addStatement(parentElementVarName + ".set" + capitalizeFirst(hasManyRelationFieldName) + "(new $T<>(get" + capitalizeFirst(hasManyRelationFieldName) + "(" + parentElementVarName + ")))",
+                    ClassName.get("promise.model", "IdentifiableList"))
+                .endControlFlow()
+                .endControlFlow(")")
+                .addStatement("return " + parentElementVarNames)
+                .build())
+            .build());
+
+        classBuilder.addMethod(MethodSpec.methodBuilder("listWith" + capitalizeFirst(hasManyRelationFieldName))
+            .addParameter(ArrayTypeName.of(
+                ParameterizedTypeName.get(ClassName.get("promise.db", "Column"),
+                    WildcardTypeName.subtypeOf(TypeName.OBJECT))
+            ), "columns")
+            .addModifiers(Modifier.PUBLIC)
+            .returns(ParameterizedTypeName.get(ClassName.get("promise.model", "IdentifiableList"),
+                WildcardTypeName.subtypeOf(
+                    ClassName.get(element.asType())
+                )
+            )).addCode(CodeBlock.builder()
+                .addStatement("IdentifiableList<? extends $T> " + parentElementVarNames + " = " + getParentElementTableVarName + ".findAll(columns)", ClassName.get(element.asType()))
+                .beginControlFlow(parentElementVarNames + ".forEach(new $T<$T>()",
+                    ClassName.get("java.util.function", "Consumer"),
+                    ClassName.get(element.asType()))
+                .add("@Override\n")
+                .beginControlFlow("public void accept($T " + parentElementVarName + ")",
+                    ClassName.get(element.asType()))
+                .addStatement(parentElementVarName + ".set" + capitalizeFirst(hasManyRelationFieldName) + "(new $T<>(get" + capitalizeFirst(hasManyRelationFieldName) + "(" + parentElementVarName + ")))",
+                    ClassName.get("promise.model", "IdentifiableList"))
+                .endControlFlow()
+                .endControlFlow(")")
+                .addStatement("return " + parentElementVarNames)
+                .build())
+            .build());
+
+        classBuilder.addMethod(MethodSpec.methodBuilder("get" + capitalizeFirst(hasManyRelationFieldName))
+            .addParameter(TypeName.get(element.asType()), parentElementVarName)
+            .addModifiers(Modifier.PUBLIC)
+            .returns(ParameterizedTypeName.get(ClassName.get("promise.model", "IdentifiableList"),
+                WildcardTypeName.subtypeOf(
+                    ClassName.get(relationElement.asType())
+                )
+            ))
+            .addCode(CodeBlock.builder()
+                .addStatement("return " + relationElementTableVarName + ".findAll($T." + relationHasOneRelatedElement.getSimpleName() + "Column.with(" + parentElementVarName + ".getId()))", relationElementTableClassName)
+                .build())
+            .build());
+
+        classBuilder.addMethod(MethodSpec.methodBuilder("delete" + capitalizeFirst(hasManyRelationFieldName))
+            .returns(boolean.class)
+            .addModifiers(Modifier.PUBLIC)
+            .addParameter(TypeName.get(element.asType()), parentElementVarName)
+            .addCode(CodeBlock.builder()
+                .addStatement("return " + relationElementTableVarName + ".delete($T." + relationHasOneRelatedElement.getSimpleName() + "Column.with(" + parentElementVarName + ".getId()))", relationElementTableClassName)
+                .build())
+            .build());
+
+        classBuilder.addMethod(MethodSpec.methodBuilder("saveWith" + capitalizeFirst(hasManyRelationFieldName))
+            .addParameter(TypeName.get(element.asType()), parentElementVarName)
+            .addModifiers(Modifier.PUBLIC)
+            .returns(long.class)
+            .addCode(CodeBlock.builder()
+                .addStatement("long id = " + getParentElementTableVarName + ".save(" + parentElementVarName + ")")
+                .beginControlFlow(parentElementVarName + ".get" + capitalizeFirst(hasManyRelationFieldName) + "().forEach(new $T<$T>()",
+                    ClassName.get("java.util.function", "Consumer"),
+                    TypeName.get(relationElement.asType()))
+                .add("@Override\n")
+                .beginControlFlow("public void accept($T " + camelCase(relationElementVarName) + ")", TypeName.get(relationElement.asType()))
+                .addStatement("$T " + parentElementVarName + "1 = new $T()",
+                    TypeName.get(element.asType()),
+                    TypeName.get(element.asType()))
+                .addStatement(parentElementVarName + "1.setId((int) id)")
+                .addStatement(camelCase(relationElementVarName) + ".set" + capitalizeFirst(relationHasOneRelatedElement.getSimpleName().toString()) + "(" + parentElementVarName + "1)")
+                .endControlFlow()
+                .endControlFlow(")")
+                .addStatement(relationElementTableVarName + ".save(new $T<>(" + parentElementVarName + ".get" + capitalizeFirst(hasManyRelationFieldName) + "()))",
+                    ClassName.get("promise.model", "IdentifiableList"))
+                .addStatement("return id")
+                .build())
+            .build());
+
+        classBuilder.addMethod(MethodSpec.methodBuilder("saveWith" + capitalizeFirst(hasManyRelationFieldName))
+            .addParameter(ParameterizedTypeName.get(
+                ClassName.get("java.util", "List"),
+                WildcardTypeName.subtypeOf(TypeName.get(element.asType()))),
+                parentElementVarNames)
+            .addModifiers(Modifier.PUBLIC)
+            .returns(boolean.class)
+            .addCode(CodeBlock.builder()
+                .beginControlFlow(parentElementVarNames + ".forEach(new $T<$T>()",
+                    ClassName.get("java.util.function", "Consumer"),
+                    TypeName.get(element.asType()))
+                .add("@Override\n")
+                .beginControlFlow("public void accept($T " + parentElementVarName + ")", TypeName.get(element.asType()))
+                .addStatement("saveWith" + capitalizeFirst(hasManyRelationFieldName) + "(" + parentElementVarName + ")")
+                .endControlFlow()
+                .endControlFlow(")")
+                .addStatement("return true")
+                .build())
+            .build());
+
+        classBuilder.addMethod(MethodSpec.methodBuilder("updateWith" + capitalizeFirst(hasManyRelationFieldName))
+            .addModifiers(Modifier.PUBLIC)
+            .addParameter(TypeName.get(element.asType()), parentElementVarName)
+            .returns(boolean.class)
+            .addStatement("return (delete" + capitalizeFirst(hasManyRelationFieldName) + "(" + parentElementVarName + ") && saveWith" + capitalizeFirst(hasManyRelationFieldName) + "(" + parentElementVarName + ") > 0)")
+            .build());
+
+        return new Pair<>(relationElementTableClassName, relationElement);
+      }
+    } else
+      throw new Exception(hasManyRelationFieldElement.getSimpleName() + " in " + element.getSimpleName() + " is marked as HasMany but is not a collection type");
+    return null;
+  }
+
+  private Pair<ClassName, Element> generateForHasOneRelation(Element hasOneRelationFieldElement,
+                                                             ArrayList<ParameterSpec> constructorParameters,
+                                                             HashMap<ClassName, Element> tableAndRelationElements) throws Exception {
+    if (tableAndRelationElements.entrySet().stream().anyMatch(classNameElementEntry -> PersistableEntityUtilsKt.getTableName(classNameElementEntry.getValue())
+        .equals(PersistableEntityUtilsKt.getTableName(
+            UtilsKt.asTypeElement(hasOneRelationFieldElement.asType(), processingEnvironment))))) {
+        LogUtil.e(new IllegalStateException("Relation has been repeated in "+element),  hasOneRelationFieldElement);
+        return null;
+    }
+    if (!JavaUtils.isCollectionType(processingEnvironment, (VariableElement) hasOneRelationFieldElement)) {
+      TypeMirror typeMirror = JavaUtils.getTypeMirror((VariableElement) hasOneRelationFieldElement);
+      if (typeMirror != null) {
+        /*
+         * Field name for the relation
+         */
+        String hasOneRelationFieldName = hasOneRelationFieldElement.getSimpleName().toString();
+        /*
+         * Element that this element is related to by HasOne relation
+         */
+        TypeElement relationElement = UtilsKt.asTypeElement(typeMirror, processingEnvironment);
+
+        if (relationElement.getAnnotation(Entity.class) == null)
+          throw new Exception("Element related to " + element.getSimpleName() + " as HasOne in " + hasOneRelationFieldName + " field is not marked as an Entity");
+        /*
+         * Table ClassName for relationElement
+         */
+        ClassName relationElementTableClassName = asTableClassName(relationElement, processingEnvironment);
+        /*
+         * Variable name for relationElementTableClassName
+         */
+        String relationElementTableVarName = camelCase(getTableClassNameString(relationElement));
+        /*
+         * Name of relationElement
+         */
+        String relationElementVarName = relationElement.getSimpleName().toString();
+        /*
+         * name of relation element for collection types
+         */
+        String relationElementVarNames = pluralize(relationElementVarName);
+
+        /*
+         * adding field for Table of child relation element
+         */
+
+        constructorParameters.add(ParameterSpec.builder(relationElementTableClassName, relationElementTableVarName).build());
+        classBuilder.addField(FieldSpec.builder(relationElementTableClassName, relationElementTableVarName)
+            .addModifiers(Modifier.PRIVATE)
+            .build());
+
+
+        classBuilder.addMethod(MethodSpec.methodBuilder("paginateWith" + pluralize(capitalizeFirst(hasOneRelationFieldName)))
+            .addModifiers(Modifier.PUBLIC)
+            .addParameter(int.class, "skip")
+            .addParameter(int.class, "limit")
+            .returns(ParameterizedTypeName.get(ClassName.get("promise.model", "IdentifiableList"),
+                WildcardTypeName.subtypeOf(
+                    ClassName.get(element.asType())
+                )
+            ))
+            .addCode(CodeBlock.builder()
+                .addStatement("$T " + parentElementVarNames + " = " + getParentElementTableVarName + ".find().paginateDescending(skip, limit)",
+                    ParameterizedTypeName.get(ClassName.get("promise.model", "IdentifiableList"),
+                        WildcardTypeName.subtypeOf(
+                            ClassName.get(element.asType())
+                        )
+                    ))
+                .addStatement("return populateWith" + pluralize(capitalizeFirst(hasOneRelationFieldName)) + "(" + parentElementVarNames + ")")
+                .build())
+            .build());
+
+
+        classBuilder.addMethod(MethodSpec.methodBuilder("listWith" + pluralize(capitalizeFirst(hasOneRelationFieldName)))
+            .addModifiers(Modifier.PUBLIC)
+            .returns(ParameterizedTypeName.get(ClassName.get("promise.model", "IdentifiableList"),
+                WildcardTypeName.subtypeOf(
+                    ClassName.get(element.asType())
+                )
+            ))
+            .addCode(CodeBlock.builder()
+                .addStatement("$T " + parentElementVarNames + " = " + getParentElementTableVarName + ".findAll()",
+                    ParameterizedTypeName.get(ClassName.get("promise.model", "IdentifiableList"),
+                        WildcardTypeName.subtypeOf(
+                            ClassName.get(element.asType())
+                        )
+                    ))
+                .addStatement("return populateWith" + pluralize(capitalizeFirst(hasOneRelationFieldName)) + "(" + parentElementVarNames + ")")
+                .build())
+            .build());
+
+        classBuilder.addMethod(MethodSpec.methodBuilder("listWith" + pluralize(capitalizeFirst(hasOneRelationFieldName)))
+            .addModifiers(Modifier.PUBLIC)
+            .addParameter(ArrayTypeName.of(
+                ParameterizedTypeName.get(ClassName.get("promise.db", "Column"),
+                    WildcardTypeName.subtypeOf(TypeName.OBJECT))
+            ), "columns")
+            .returns(ParameterizedTypeName.get(ClassName.get("promise.model", "IdentifiableList"),
+                WildcardTypeName.subtypeOf(
+                    ClassName.get(element.asType())
+                )
+            ))
+            .addCode(CodeBlock.builder()
+                .addStatement("$T " + parentElementVarNames + " = " + getParentElementTableVarName + ".findAll(columns)",
+                    ParameterizedTypeName.get(ClassName.get("promise.model", "IdentifiableList"),
+                        WildcardTypeName.subtypeOf(
+                            ClassName.get(element.asType())
+                        )
+                    ))
+                .addStatement("return populateWith" + pluralize(capitalizeFirst(hasOneRelationFieldName)) + "(" + parentElementVarNames + ")")
+                .build())
+            .build());
+
+        classBuilder.addMethod(MethodSpec.methodBuilder("populateWith" + pluralize(capitalizeFirst(hasOneRelationFieldName)))
+            .addModifiers(Modifier.PUBLIC)
+            .addParameter(ParameterizedTypeName.get(ClassName.get("promise.model", "IdentifiableList"),
+                WildcardTypeName.subtypeOf(
+                    ClassName.get(element.asType())
+                )
+            ), parentElementVarNames)
+            .returns(ParameterizedTypeName.get(ClassName.get("promise.model", "IdentifiableList"),
+                WildcardTypeName.subtypeOf(
+                    ClassName.get(element.asType())
+                )
+            ))
+            .addCode(CodeBlock.builder()
+                .beginControlFlow(parentElementVarNames + ".forEach(new $T<$T>()",
+                    ClassName.get("java.util.function", "Consumer"),
+                    TypeName.get(element.asType()))
+                .add("@Override\n")
+                .beginControlFlow("public void accept($T " + parentElementVarName + ")",
+                    TypeName.get(element.asType()))
+                .addStatement(parentElementVarName + ".set" + capitalizeFirst(hasOneRelationFieldName) + "(get" + capitalizeFirst(hasOneRelationFieldName) + "(" + parentElementVarName + "))")
+                .endControlFlow()
+                .endControlFlow(")")
+                .addStatement("return " + parentElementVarNames + "")
+                .build())
+            .build());
+
+        classBuilder.addMethod(MethodSpec.methodBuilder("saveWith" + capitalizeFirst(hasOneRelationFieldName))
+            .returns(long.class)
+            .addModifiers(Modifier.PUBLIC)
+            .addParameter(TypeName.get(element.asType()), parentElementVarName)
+            .addCode(CodeBlock.builder()
+                .addStatement("long " + camelCase(relationElementVarName) + "Id = " + relationElementTableVarName + ".save(" + parentElementVarName + ".get" + capitalizeFirst(hasOneRelationFieldName) + "())")
+                .addStatement("$T " + camelCase(relationElementVarName) + " = new $T()", relationElement, relationElement)
+                .addStatement(camelCase(relationElementVarName) + ".setId((int) " + camelCase(relationElementVarName) + "Id)")
+                .addStatement(parentElementVarName + ".set" + capitalizeFirst(hasOneRelationFieldName) + "(" + camelCase(relationElementVarName) + ")")
+                .addStatement("return " + getParentElementTableVarName + ".save(" + parentElementVarName + ")")
+                .build())
+            .build());
+
+
+        classBuilder.addMethod(MethodSpec.methodBuilder("get" + capitalizeFirst(hasOneRelationFieldName))
+            .addParameter(TypeName.get(element.asType()), parentElementVarName)
+            .addModifiers(Modifier.PUBLIC)
+            .returns(TypeName.get(relationElement.asType()))
+            .addCode(CodeBlock.builder()
+                .addStatement("return " + relationElementTableVarName + ".findById(" + parentElementVarName + ".get" + capitalizeFirst(hasOneRelationFieldName) + "().getId())")
+                .build())
+            .build());
+
+        classBuilder.addMethod(MethodSpec.methodBuilder("saveWith" + pluralize(capitalizeFirst(hasOneRelationFieldName)))
+            .addModifiers(Modifier.PUBLIC)
+            .returns(boolean.class)
+            .addParameter(ParameterizedTypeName.get(ClassName.get("promise.model", "IdentifiableList"),
+                WildcardTypeName.subtypeOf(
+                    ClassName.get(element.asType())
+                )
+            ), parentElementVarNames)
+            .addCode(CodeBlock.builder()
+                .beginControlFlow(parentElementVarNames + ".forEach(new $T<$T>()",
+                    ClassName.get("java.util.function", "Consumer"),
+                    TypeName.get(element.asType()))
+                .add("@Override\n")
+                .beginControlFlow("public void accept($T " + parentElementVarName + ")",
+                    TypeName.get(element.asType()))
+                .addStatement("saveWith" + capitalizeFirst(hasOneRelationFieldName) + "(" + parentElementVarName + ")")
+                .endControlFlow()
+                .endControlFlow(")")
+                .addStatement("return true")
+                .build())
+            .build());
+
+        classBuilder.addMethod(MethodSpec.methodBuilder("updateWith" + capitalizeFirst(hasOneRelationFieldName))
+            .addModifiers(Modifier.PUBLIC)
+            .addParameter(TypeName.get(element.asType()), parentElementVarName)
+            .addCode(CodeBlock.builder()
+                .addStatement("return " + getParentElementTableVarName + ".update(" + parentElementVarName + ") &&\n" +
+                    " " + relationElementTableVarName + ".update(" + parentElementVarName + ".get" + capitalizeFirst(hasOneRelationFieldName) + "())")
+                .build())
+            .returns(boolean.class)
+            .build());
+
+        return new Pair<>(relationElementTableClassName, relationElement);
+      }
+
+    } else
+      throw new Exception(hasOneRelationFieldElement.getSimpleName() + " in " + element.getSimpleName() + " is marked as HasOne but is a collection type");
+    return null;
+
+  }
+
+  private void generateRelationsDaoBuilder(ArrayList<ParameterSpec> constructorParameters,
+                                           String pack,
+                                           String fileName) {
+
+    TypeSpec.Builder builderClass = TypeSpec.classBuilder("Builder")
+        .addModifiers(Modifier.FINAL, Modifier.STATIC, Modifier.PUBLIC);
+
+    builderClass.addFields(constructorParameters.stream().map(parameterSpec ->
+        FieldSpec.builder(parameterSpec.type, parameterSpec.name)
+            .build()).collect(Collectors.toList()));
+
+    builderClass.addMethods(constructorParameters.stream().map(parameterSpec ->
+        MethodSpec.methodBuilder("set" + capitalizeFirst(parameterSpec.name))
+            .addParameter(parameterSpec)
+            .addModifiers(Modifier.PUBLIC)
+            .addCode(CodeBlock.builder()
+                .addStatement("this." + parameterSpec.name + " = " + parameterSpec.name)
+                .addStatement("return this")
+                .build())
+            .returns(ClassName.get(pack, fileName + ".Builder"))
+            .build()).collect(Collectors.toList()));
+    StringBuilder returnBuilderStatement = new StringBuilder("return new $T(");
+    for (int i = 0; i < constructorParameters.size(); i++) {
+      returnBuilderStatement.append(constructorParameters.get(i).name);
+      if (i != constructorParameters.size() - 1) returnBuilderStatement.append(", ");
+    }
+    returnBuilderStatement.append(")");
+    builderClass.addMethod(MethodSpec.methodBuilder("build")
+        .addModifiers(Modifier.PUBLIC)
+        .returns(ClassName.get(pack, fileName))
+        .addCode(CodeBlock.builder()
+            .addStatement(returnBuilderStatement.toString(), ClassName.get(pack, fileName))
+            .build())
+        .build());
+
+    classBuilder.addType(builderClass.build());
+  }
+}
diff --git a/compiler/src/main/java/promise/database/compiler/RelationsDaoProcessor.kt b/compiler/src/main/java/promise/database/compiler/RelationsDaoProcessor.kt
new file mode 100644
index 0000000..29ec5ff
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/RelationsDaoProcessor.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler
+
+import com.squareup.javapoet.JavaFile
+import promise.database.Entity
+import promise.database.compiler.utils.isElementAnnotatedAsRelation
+import javax.annotation.processing.ProcessingEnvironment
+import javax.annotation.processing.RoundEnvironment
+import javax.lang.model.element.Element
+import javax.lang.model.element.TypeElement
+import javax.lang.model.util.ElementFilter
+
+class RelationsDaoProcessor(private val processingEnv: ProcessingEnvironment) : AnnotatedClassProcessor() {
+  override fun process(environment: RoundEnvironment?): List<JavaFile.Builder?>? {
+    val javaFiles = ArrayList<JavaFile.Builder?>()
+    environment?.getElementsAnnotatedWith(Entity::class.java)
+        ?.forEach { element ->
+          if (element.getAnnotation(Entity::class.java).generateRelations)
+          javaFiles.addAll(processElementDaos(element))
+        }
+    return javaFiles
+  }
+
+  private fun processElementDaos(element: Element): List<JavaFile.Builder?> {
+    val javaFiles = ArrayList<JavaFile.Builder?>()
+    val fields = ElementFilter.fieldsIn(element.enclosedElements).filter {
+      it.isElementAnnotatedAsRelation()
+    }
+    if (fields.isNotEmpty())
+      javaFiles.addAll(RelationsDaoGenerator(processingEnv, element as TypeElement, fields).generate())
+    return javaFiles
+  }
+}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/db/ompiler/annotation/TableAnnotationGenerator.java b/compiler/src/main/java/promise/database/compiler/TableAnnotationGenerator.java
similarity index 54%
rename from compiler/src/main/java/promise/db/ompiler/annotation/TableAnnotationGenerator.java
rename to compiler/src/main/java/promise/database/compiler/TableAnnotationGenerator.java
index db8a52e..1fa8425 100644
--- a/compiler/src/main/java/promise/db/ompiler/annotation/TableAnnotationGenerator.java
+++ b/compiler/src/main/java/promise/database/compiler/TableAnnotationGenerator.java
@@ -11,26 +11,24 @@
  * limitations under the License.
  */
 
-package promise.db.ompiler.annotation;
+package promise.database.compiler;
 
 import com.squareup.javapoet.AnnotationSpec;
 import com.squareup.javapoet.CodeBlock;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Map;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
-import javax.tools.Diagnostic;
 
-import promise.db.Entity;
-import promise.db.Table;
-import promise.db.ompiler.CodeBlockGenerator;
-import promise.db.ompiler.PersistableEntityUtilsKt;
+import promise.database.Entity;
+import promise.database.Table;
+import promise.database.compiler.utils.LogUtil;
+import promise.database.compiler.utils.PersistableEntityUtilsKt;
 
-public class TableAnnotationGenerator implements CodeBlockGenerator<AnnotationSpec> {
+public class TableAnnotationGenerator implements CodeGenerator<AnnotationSpec> {
   private Element element;
   private ProcessingEnvironment processingEnvironment;
 
@@ -44,65 +42,32 @@ private String getCompoundIndexAnnotation(Entity.CompoundIndex annotation) {
     for (int i = 0; i < annotation.columns().length; i++) {
       String index = annotation.columns()[i];
       stmt.append("@Table.Index(columnName = \"").append(index).append("\")");
-      if (i != annotation.columns().length - 1) {
-        stmt.append(",\n");
-      }
+      if (i != annotation.columns().length - 1) stmt.append(",\n");
     }
-    if (annotation.unique()) {
-      stmt.append("},\n" +
-          "unique = true\n" +
-          ")");
-    } else stmt.append("\n})");
-
+    if (annotation.unique()) stmt.append("},\n" +
+        "unique = true\n" +
+        ")");
+    else stmt.append("\n})");
     return stmt.toString();
   }
 
   @Override
   public AnnotationSpec generate() throws Exception {
-    String gen = "@Table(\n" +
-        "         tableName = \"p\",\n" +
-        "         compoundIndexes = {\n" +
-        "             @Table.CompoundIndex(\n" +
-        "                 indexes = {\n" +
-        "                     @Table.Index(columnName = \"n\"),\n" +
-        "                     @Table.Index(columnName = \"m\")\n" +
-        "                 }, unique = true\n" +
-        "             ),\n" +
-        "             @Table.CompoundIndex(\n" +
-        "                 indexes = {\n" +
-        "                     @Table.Index(columnName = \"a\"),\n" +
-        "                     @Table.Index(columnName = \"m\")\n" +
-        "                 }\n" +
-        "             )\n" +
-        "         },\n" +
-        "         indexes = {\n" +
-        "             @Table.Index(columnName = \"n\")\n" +
-        "         },\n" +
-        "         foreignKeys = {\n" +
-        "             @Table.ForeignKey(columnName = \"m\", referencedColumnName = \"legs\", referencedTableName = \"cats\")\n" +
-        "         }\n" +
-        "     )";
+
     AnnotationSpec.Builder annotationSpec = AnnotationSpec.builder(Table.class);
     Entity.CompoundIndex[] compoundIndices = PersistableEntityUtilsKt.getTableCompoundIndices((TypeElement) element);
-    //System.out.println(compoundIndices.toString());
-    //this.processingEnvironment.getMessager().printMessage(Diagnostic.Kind.ERROR, "CompoundIndices " + Arrays.toString(compoundIndices));
-    StringBuilder stmt = new StringBuilder("{\n");
-    if (compoundIndices.length > 0) {
-      //fileBuilder.addImport("promise.db", "Table")
-      try {
-        for (int index = 0; index < compoundIndices.length; index++) {
-          Entity.CompoundIndex compoundIndex = compoundIndices[index];
-          stmt.append(getCompoundIndexAnnotation(compoundIndex));
-          if (index != compoundIndices.length - 1) {
-            stmt.append(",\n");
-          }
-        }
-        stmt.append("}\n");
 
-        annotationSpec.addMember("compoundIndexes", CodeBlock.of(stmt.toString()));
-      } catch (Throwable e) {
-        this.processingEnvironment.getMessager().printMessage(Diagnostic.Kind.ERROR, "CompoundIndex gen error " + Arrays.toString(e.getStackTrace()));
+    StringBuilder stmt = new StringBuilder("{\n");
+    if (compoundIndices.length > 0) try {
+      for (int index = 0; index < compoundIndices.length; index++) {
+        Entity.CompoundIndex compoundIndex = compoundIndices[index];
+        stmt.append(getCompoundIndexAnnotation(compoundIndex));
+        if (index != compoundIndices.length - 1) stmt.append(",\n");
       }
+      stmt.append("}\n");
+      annotationSpec.addMember("compoundIndexes", CodeBlock.of(stmt.toString()));
+    } catch (Throwable e) {
+      LogUtil.e(e);
     }
     String[] indices = PersistableEntityUtilsKt.getTableIndices((TypeElement) element);
     if (indices != null) {
@@ -110,14 +75,12 @@ public AnnotationSpec generate() throws Exception {
       try {
         for (int i = 0; i < indices.length; i++) {
           stmt2.append("@Table.Index(columnName = \"").append(indices[i]).append("\")\n");
-          if (i != indices.length - 1) {
-            stmt2.append(",\n");
-          }
+          if (i != indices.length - 1) stmt2.append(",\n");
         }
         stmt2.append("}\n");
         annotationSpec.addMember("indices", CodeBlock.of(stmt2.toString()));
       } catch (Throwable e) {
-        this.processingEnvironment.getMessager().printMessage(Diagnostic.Kind.ERROR, "Index gen error " + Arrays.toString(e.getStackTrace()));
+        LogUtil.e(e);
       }
     }
     Map<String, String>[] foreignKeys = PersistableEntityUtilsKt.getTableForeignKeys((TypeElement) element, processingEnvironment);
@@ -140,7 +103,7 @@ public AnnotationSpec generate() throws Exception {
         stmt3.append("}\n");
         annotationSpec.addMember("foreignKeys", CodeBlock.of(stmt3.toString()));
       } catch (Throwable e) {
-        this.processingEnvironment.getMessager().printMessage(Diagnostic.Kind.ERROR, "Index gen error " + Arrays.toString(e.getStackTrace()));
+        LogUtil.e(e);
       }
     }
     annotationSpec.addMember("tableName", "$S", PersistableEntityUtilsKt.getTableName(element));
diff --git a/compiler/src/main/java/promise/database/compiler/TableColumnFieldsGenerator.kt b/compiler/src/main/java/promise/database/compiler/TableColumnFieldsGenerator.kt
new file mode 100644
index 0000000..649273c
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/TableColumnFieldsGenerator.kt
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler
+
+import com.squareup.javapoet.ClassName
+import com.squareup.javapoet.CodeBlock
+import com.squareup.javapoet.FieldSpec
+import com.squareup.javapoet.ParameterizedTypeName
+import com.squareup.javapoet.TypeName
+import promise.database.ColumnInfo
+import promise.database.HasOne
+import promise.database.Ignore
+import promise.database.PrimaryKey
+import promise.database.PrimaryKeyAutoIncrement
+import promise.database.compiler.utils.LogUtil
+import promise.database.compiler.utils.checkIfHasTypeConverter
+import promise.database.compiler.utils.getNameOfColumn
+import promise.database.compiler.utils.isElementAnnotatedAsRelation
+import promise.database.compiler.utils.isPersistable
+import promise.database.compiler.utils.isSameAs
+import promise.database.compiler.utils.toTypeName
+import javax.annotation.processing.ProcessingEnvironment
+import javax.lang.model.element.Element
+import javax.lang.model.element.Modifier
+
+class TableColumnFieldsGenerator(
+    private val processingEnvironment: ProcessingEnvironment,
+    private val setElements: List<Element>) : CodeGenerator<Map<Pair<Element, String>, FieldSpec>> {
+
+  var genColValues: ArrayList<Pair<Pair<String, Element>, String>> = ArrayList()
+
+  override fun generate(): Map<Pair<Element, String>, FieldSpec> {
+    val map = HashMap<Pair<Element, String>, FieldSpec>()
+    setElements.filter {
+      it.kind.isField
+    }.forEachIndexed { i, element ->
+      if (element.getAnnotation(PrimaryKeyAutoIncrement::class.java) != null ||
+          element.getAnnotation(Ignore::class.java) != null) return@forEachIndexed
+      var nameOfColumn = element.getNameOfColumn()
+      if (nameOfColumn == "id") return@forEachIndexed
+      val colVariableName = "${element.simpleName}Column"
+      var variableClassType = element.toTypeName()
+      if (variableClassType.isPrimitive) variableClassType = variableClassType.box()
+      if (!element.isPersistable() && !element.isElementAnnotatedAsRelation()) {
+        if (element.checkIfHasTypeConverter()) {
+          val parameterizedColumnTypeName = ParameterizedTypeName.get(
+              ClassName.get("promise.db", "Column"),
+              TypeName.get(String::class.java))
+          val columnInitializer = getColumnInitializer(element, ClassName.get(String::class.java))
+          val spec = FieldSpec.builder(parameterizedColumnTypeName, colVariableName)
+              .addModifiers(Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)
+              .initializer(CodeBlock.of("""
+              new Column<String>("$nameOfColumn", $columnInitializer, ${i + 1})
+            """.trimIndent())
+              )
+              .build()
+          map[Pair(element, colVariableName)] = spec
+          val pair: Pair<Pair<String, Element>, String> = Pair(Pair(element.simpleName.toString(), element), colVariableName)
+          genColValues.add(pair)
+        }
+      } else if (element.isElementAnnotatedAsRelation()) {
+        val hasOneAnnotation = element.getAnnotation(HasOne::class.java)
+        if (hasOneAnnotation != null) {
+          nameOfColumn = "${element.simpleName}Id"
+          val parameterizedColumnTypeName = ParameterizedTypeName.get(
+              ClassName.get("promise.db", "Column"),
+              TypeName.get(Integer::class.java))
+          val columnInitializer = getColumnInitializer(element, ClassName.get(Integer::class.java))
+          val spec = FieldSpec.builder(parameterizedColumnTypeName, colVariableName)
+              .addModifiers(Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)
+              .initializer(CodeBlock.of("""
+              new Column<Integer>("$nameOfColumn", $columnInitializer, ${i + 1})
+            """.trimIndent())
+              )
+              .build()
+          map[Pair(element, colVariableName)] = spec
+          val pair: Pair<Pair<String, Element>, String> = Pair(Pair(element.simpleName.toString(), element), colVariableName)
+          genColValues.add(pair)
+        }
+      } else if (element.isPersistable()) {
+        val spec = processField(element, nameOfColumn, i)
+        map[Pair(element, colVariableName)] = spec
+        val pair: Pair<Pair<String, Element>, String> = Pair(Pair(element.simpleName.toString(), element), colVariableName)
+        genColValues.add(pair)
+      }
+    }
+    return map
+  }
+
+  private fun processField(element: Element, nameOfColumn: String, i: Int): FieldSpec {
+    val colVariableName = "${element.simpleName}Column"
+    var variableClassType = element.toTypeName()
+    if (variableClassType.isPrimitive) variableClassType = variableClassType.box()
+    val parameterizedColumnTypeName = ParameterizedTypeName.get(
+        ClassName.get("promise.db", "Column"),
+        variableClassType)
+    val columnInitializer = getColumnInitializer(element, variableClassType)
+    return FieldSpec.builder(parameterizedColumnTypeName, colVariableName)
+        .addModifiers(Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)
+        .initializer(CodeBlock.of("""
+              new Column<${variableClassType}>("$nameOfColumn", $columnInitializer, ${i + 1})
+            """.trimIndent())
+        )
+        .build()
+  }
+
+  private fun getColumnInitializer(element: Element, classTypeName: TypeName): String {
+    var str = "Column.Type"
+    if (classTypeName.isSameAs(Integer::class.java) ||
+        classTypeName.isSameAs(Long::class.java) ||
+        classTypeName.isSameAs(Float::class.java) ||
+        classTypeName.isSameAs(Double::class.java) ||
+        classTypeName.isSameAs(Boolean::class.java)) {
+      str += ".INTEGER"
+      if (element.getAnnotation(PrimaryKey::class.java) != null) str += ".PRIMARY_KEY()"
+      else if (element.getAnnotation(ColumnInfo::class.java) != null) {
+        val annotation = element.getAnnotation(ColumnInfo::class.java)
+        if (annotation.default != 0) {
+          str += ".DEFAULT(${annotation.default})"
+        } else {
+          if (annotation.nullable) str += ".NULLABLE()"
+          else if (!annotation.nullable) str += ".NON_NULL()"
+        }
+      } else str += ".NULLABLE()"
+    } else if (classTypeName.isSameAs(String::class.java)) {
+      if (element.getAnnotation(ColumnInfo::class.java) != null) {
+        val annotation = element.getAnnotation(ColumnInfo::class.java)
+        if (annotation.length != 0) {
+          str += ".VARCHAR"
+          str += if (annotation.unique)
+            ".UNIQUE(${annotation.length})"
+          else if (annotation.nullable)
+            ".NULLABLE(${annotation.length})"
+          else if (!annotation.nullable)
+            ".NOT_NULL(${annotation.length})"
+          else LogUtil.e(IllegalStateException("element ${element.simpleName} is annotated as varchar without length"), element)
+        } else {
+          str += ".TEXT"
+          str += if (annotation.nullable)
+            ".NULLABLE()"
+          else if (!annotation.nullable)
+            ".NOT_NULL()"
+          else
+            LogUtil.e(IllegalStateException("unknown error in  ${element.simpleName}"), element)
+        }
+      } else str += ".TEXT.NULLABLE()"
+    }
+    else {
+      // TODO implement this block
+      // for type converter columns
+
+    }
+    return str
+  }
+}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/database/compiler/TableDeserializerMethodGenerator.kt b/compiler/src/main/java/promise/database/compiler/TableDeserializerMethodGenerator.kt
new file mode 100644
index 0000000..6cc08a7
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/TableDeserializerMethodGenerator.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler
+
+import com.squareup.javapoet.ClassName
+import com.squareup.javapoet.CodeBlock
+import com.squareup.javapoet.MethodSpec
+import com.squareup.javapoet.TypeName
+import promise.database.compiler.utils.ConverterTypes
+import promise.database.compiler.utils.JavaUtils
+import promise.database.compiler.utils.camelCase
+import promise.database.compiler.utils.capitalizeFirst
+import promise.database.compiler.utils.checkIfHasTypeConverter
+import promise.database.compiler.utils.getConverterCompatibleMethod
+import promise.database.compiler.utils.isElementAnnotatedAsRelation
+import promise.database.compiler.utils.isSameAs
+import promise.database.compiler.utils.toTypeName
+import javax.lang.model.element.Element
+import javax.lang.model.element.Modifier
+
+class TableDeserializerMethodGenerator(
+    private val typeDataTypePack: String,
+    private val typeDataType: String,
+    private val columns: List<Pair<Pair<String, Element>, String>>) : CodeGenerator<MethodSpec> {
+
+  override fun generate(): MethodSpec {
+    val codeBlock = CodeBlock.builder()
+    val varName = typeDataType.camelCase()
+    codeBlock.beginControlFlow("try")
+    codeBlock.addStatement("$typeDataType $varName = new $typeDataType()")
+    columns.forEach {
+      generateSetStatement(
+          codeBlock,
+          varName,
+          it.first.first, it.first.second, it.second)
+    }
+    codeBlock.addStatement("return $varName")
+    codeBlock.endControlFlow()
+    JavaUtils.generateCatchSQliteExceptionBlockForDeserializer(codeBlock, typeDataType)
+    codeBlock.endControlFlow()
+
+    return MethodSpec.methodBuilder("deserialize")
+        .addParameter(ClassName.get("android.database", "Cursor"), "e")
+        .addAnnotation(Override::class.java)
+        .addModifiers(Modifier.PUBLIC)
+        .returns(ClassName.get(typeDataTypePack, typeDataType))
+        .addCode(codeBlock.build())
+        .build()
+  }
+
+  private fun generateSetStatement(
+      codeBlock: CodeBlock.Builder,
+      objectName: String,
+      varName: String,
+      varType: Element,
+      colName: String) {
+    if (varType.toTypeName().isSameAs(Boolean::class.java)) {
+      codeBlock.addStatement("$objectName.set${varName.capitalizeFirst()}(e.${getCursorReturn(varType.toTypeName())}(${colName}.getIndex(e)) == 1)")
+      return
+    }
+    if (varType.checkIfHasTypeConverter()) {
+      val executableFn = varType.getConverterCompatibleMethod(ConverterTypes.DESERIALIZER)
+      if (executableFn != null)
+        codeBlock.addStatement("$objectName.set${varName.capitalizeFirst()}(typeConverter.${executableFn.simpleName}(e.${getCursorReturn(TypeName.get(String::class.java))}(${colName}.getIndex(e))))")
+    } else if (varType.isElementAnnotatedAsRelation()) {
+      codeBlock.add(JavaUtils.generateDeserializerRelationSetStatement(objectName, varType, colName))
+    } else {
+      codeBlock.addStatement("$objectName.set${varName.capitalizeFirst()}(e.${getCursorReturn(varType.toTypeName())}(${colName}.getIndex(e)))")
+    }
+  }
+
+  private fun getCursorReturn(varType: TypeName): String =
+      when {
+        varType.isSameAs(Integer::class.java) -> "getInt"
+        varType.isSameAs(Long::class.java) -> "getLong"
+        varType.isSameAs(Boolean::class.java) -> "getInt"
+        varType.isSameAs(Double::class.java) -> "getDouble"
+        varType.isSameAs(Float::class.java) -> "getFloat"
+        else -> "getString"
+      }
+}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/database/compiler/TableMetaDataWriter.kt b/compiler/src/main/java/promise/database/compiler/TableMetaDataWriter.kt
new file mode 100644
index 0000000..4a8f1ab
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/TableMetaDataWriter.kt
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler
+
+import promise.database.HasMany
+import promise.database.Ignore
+import promise.database.Migrate
+import promise.database.MigrationOptions
+import promise.database.Migrations
+import promise.database.PrimaryKeyAutoIncrement
+import promise.database.compiler.migration.Field
+import promise.database.compiler.migration.TableMetaData
+import promise.database.compiler.migration.TableMigration
+import promise.database.compiler.migration.VersionChange
+import promise.database.compiler.utils.function.FilterFunction2
+import promise.database.compiler.utils.getNameOfColumn
+import promise.database.compiler.utils.getTableName
+import promise.database.compiler.utils.isColumnNullable
+import javax.lang.model.element.Element
+import javax.lang.model.element.Modifier
+import javax.lang.model.util.ElementFilter
+
+class TableMetaDataWriter(
+    private val entityElement: Element,
+    private val elements: Map<Element, String>) {
+
+  companion object {
+    val tableMetaData: ArrayList<TableMetaData> = ArrayList()
+
+    fun finalMaxDbVersion(): Int {
+      if (tableMetaData.isNotEmpty()) {
+        val versionChanges: ArrayList<VersionChange?> = ArrayList()
+        tableMetaData.map { metaData -> metaData.migrations.map { it.versionChange } }
+            .forEach {
+              versionChanges.addAll(it)
+            }
+        return versionChanges.mapNotNull { it!!.toVersion }.max() ?: 1
+      }
+      return 1
+    }
+
+    init {
+      if (PromiseDatabaseCompiler.databaseMetaDataWriter.currentDatabaseMetaData == null)
+        PromiseDatabaseCompiler.databaseMetaDataWriter.loadCurrentMetaData()
+    }
+  }
+
+  fun process(
+      //elements: Map<Element, String>
+  ): promise.database.compiler.utils.List<TableMigration> {
+    val tableMigrations = promise.database.compiler.utils.List<TableMigration>()
+
+    val migrateFields = elements.filter {
+      it.key.getAnnotation(Migrate::class.java) != null ||
+          it.key.getAnnotation(Migrations::class.java) != null
+    }
+
+    if (migrateFields.isNotEmpty()) migrateFields.forEach { entry ->
+      if (entry.key.getAnnotation(Migrate::class.java) != null) {
+        val migration = entry.key.getAnnotation(Migrate::class.java)
+        tableMigrations.add(TableMigration().apply {
+          versionChange = VersionChange().apply {
+            fromVersion = migration.fromVersion
+            toVersion = migration.toVersion
+          }
+          field = if (migration.action == MigrationOptions.CREATE_INDEX) entry.key.getNameOfColumn() else entry.value
+          action = migration.action
+        })
+      } else if (entry.key.getAnnotation(Migrations::class.java) != null) {
+        val migrations = entry.key.getAnnotation(Migrations::class.java)
+        migrations.values.forEach {
+          val migration = it
+          tableMigrations.add(TableMigration().apply {
+            versionChange = VersionChange().apply {
+              fromVersion = migration.fromVersion
+              toVersion = migration.toVersion
+            }
+            field = if (migration.action == MigrationOptions.CREATE_INDEX) entry.key.getNameOfColumn() else entry.value
+            action = migration.action
+          })
+        }
+      }
+    }
+
+    val metaData = TableMetaData()
+    val oldMetaData = promise.database.compiler.utils.List<TableMetaData>(
+        PromiseDatabaseCompiler.databaseMetaDataWriter.currentDatabaseMetaData!!.tableMetaData)
+        .find {
+          it.tableName == entityElement.getTableName()
+        }
+
+    if (oldMetaData != null) {
+      tableMigrations.addAll(generateRequiredTableMigrations(
+          PromiseDatabaseCompiler.databaseMetaDataWriter.currentDatabaseMetaData!!.dbVersion,
+          promise.database.compiler.utils.List(oldMetaData.fields),
+          elements.filter {
+            it.key.getAnnotation(Migrate::class.java) == null &&
+                it.key.getAnnotation(Migrations::class.java) == null &&
+                it.key.getAnnotation(PrimaryKeyAutoIncrement::class.java) == null &&
+                it.key.getAnnotation(Ignore::class.java) == null &&
+                !(it.key.modifiers.contains(Modifier.STATIC))
+          }))
+      tableMigrations.addAll(promise.database.compiler.utils.List(oldMetaData.migrations))
+      metaData.migrations = tableMigrations.uniques()
+    } else metaData.migrations = tableMigrations
+
+    val fields: ArrayList<Field> = ArrayList()
+    /**
+     * ignore fields with Has many relation and ones with Ignore annotation
+     */
+    ElementFilter.fieldsIn(entityElement.enclosedElements).filter {
+      it.getAnnotation(Ignore::class.java) == null &&
+          it.getAnnotation(PrimaryKeyAutoIncrement::class.java) == null &&
+          it.getAnnotation(HasMany::class.java) == null
+          && !(it.modifiers.contains(Modifier.STATIC))
+    }
+        .forEach {
+          fields.add(Field().apply {
+            fieldName = it.simpleName.toString()
+            columnName = it.getNameOfColumn()
+            nullable = it.isColumnNullable()
+          })
+        }
+
+    metaData.fields = fields
+    metaData.tableName = entityElement.getTableName()
+    tableMetaData.add(metaData)
+    return tableMigrations
+  }
+
+  private fun generateRequiredTableMigrations(
+      oldDatabaseVersion: Int,
+      oldFields: promise.database.compiler.utils.List<Field>,
+      newFields: Map<Element, String>
+  ): List<TableMigration> {
+    if (oldFields.isEmpty() && newFields.isEmpty()) return emptyList()
+    val newFields2 = promise.database.compiler.utils.List(newFields.toList())
+    val migrations: ArrayList<TableMigration> = ArrayList()
+    if (oldFields.size > newFields.size) oldFields.reduce(newFields2,
+        object : FilterFunction2<String, Pair<Element, String>, Field> {
+          override fun filterBy(u: Field): String = u.fieldName
+          override fun getKey(t: Pair<Element, String>): String = t.first.simpleName.toString()
+        }, false)
+        .forEach {
+          migrations.add(TableMigration().apply {
+            versionChange = VersionChange().apply {
+              fromVersion = oldDatabaseVersion
+              toVersion = oldDatabaseVersion + 1
+            }
+            field = "\"${it.columnName}\""
+            action = MigrationOptions.DROP
+          })
+        }
+    if (newFields.size > oldFields.size) newFields2.reduce(oldFields,
+        object : FilterFunction2<String, Field, Pair<Element, String>> {
+          override fun filterBy(u: Pair<Element, String>): String = u.first.simpleName.toString()
+          override fun getKey(t: Field): String = t.fieldName
+        }, false)
+        .forEach {
+          migrations.add(TableMigration().apply {
+            versionChange = VersionChange().apply {
+              fromVersion = oldDatabaseVersion
+              toVersion = oldDatabaseVersion + 1
+            }
+            field = it.second
+            action = MigrationOptions.CREATE
+          })
+        }
+    if (newFields2.size == oldFields.size) {
+      val sameFieldsMaintained = newFields2.joinOn(oldFields
+      ) { t, u -> t.first.simpleName.toString() == u.fieldName }
+
+    }
+    return migrations
+  }
+
+}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/database/compiler/TableMigrationFieldGenerator.kt b/compiler/src/main/java/promise/database/compiler/TableMigrationFieldGenerator.kt
new file mode 100644
index 0000000..101d85d
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/TableMigrationFieldGenerator.kt
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler
+
+import com.squareup.javapoet.AnnotationSpec
+import com.squareup.javapoet.ClassName
+import com.squareup.javapoet.CodeBlock
+import com.squareup.javapoet.MethodSpec
+import org.jetbrains.annotations.NotNull
+import promise.database.HasMany
+import promise.database.Ignore
+import promise.database.MigrationOptions
+import promise.database.compiler.migration.TableMigration
+import promise.database.compiler.migration.VersionChange
+import promise.database.compiler.utils.List
+import javax.lang.model.element.Element
+import javax.lang.model.element.Modifier
+
+class TableMigrationFieldGenerator(
+    private val entityElement: Element,
+    private val elements: Map<Element, String>) : CodeGenerator<MethodSpec?> {
+
+  private fun buildMigration(
+      versionChange: VersionChange,
+      tableMigrations: List<out TableMigration>,
+      codeBlock: CodeBlock.Builder) {
+    codeBlock.add("if (v1 == ${versionChange.fromVersion} && v2 == ${versionChange.toVersion}) {\n")
+    codeBlock.indent()
+    tableMigrations.groupBy { it.action }
+        .forEach { category ->
+          when (category.name()) {
+            MigrationOptions.CREATE -> {
+              val list: StringBuilder = StringBuilder("")
+              category.list().forEachIndexed { index, tableMigration ->
+                list.append("${tableMigration.field}")
+                if (index != category.list().size - 1) list.append(", ")
+              }
+              codeBlock.addStatement("addColumns(x, $list)")
+            }
+            MigrationOptions.DROP -> {
+              val list: StringBuilder = StringBuilder("")
+              category.list().forEachIndexed { index, tableMigration ->
+                list.append("${tableMigration.field}")
+                if (index != category.list().size - 1) list.append(", ")
+              }
+              codeBlock.addStatement("dropColumns(x, $list)")
+            }
+            MigrationOptions.CREATE_INDEX -> category.list().forEach {
+              codeBlock.addStatement("addIndex(x, \"${it.field}\")")
+            }
+
+          }
+        }
+    codeBlock.unindent()
+    codeBlock.add("}\n")
+  }
+
+  override fun generate(): MethodSpec? {
+    /**
+     * ignore fields with Has many relation and ones with Ignore annotation
+     */
+    val elements2 = elements.filter {
+      it.key.getAnnotation(HasMany::class.java) == null &&
+          it.key.getAnnotation(Ignore::class.java) == null
+    }
+    val tableMetaDataWriter = TableMetaDataWriter(entityElement, elements2)
+
+
+    val tableMigrations = tableMetaDataWriter.process()
+//
+//    tableMigrations.addAll(elements2.filter { it.key.getAnnotation(RenameColumn::class.java) != null }
+//        .map {
+//          val renameColumn = it.key.getAnnotation(RenameColumn::class.java)
+//          RenameColumnTableMigration().apply {
+//            versionChange = VersionChange().apply {
+//              fromVersion = renameColumn.fromVersion
+//              toVersion = renameColumn.toVersion
+//            }
+//            field = it.key.getNameOfColumn()
+//            oldColumnName = renameColumn.oldName
+//          }
+//        })
+//
+    if (tableMigrations.isNotEmpty()) {
+      val codeBlock = CodeBlock.builder()
+      tableMigrations.groupBy { it.versionChange }
+          .forEach {
+            buildMigration(it.name()!!, it.list(), codeBlock)
+          }
+      return MethodSpec.methodBuilder("onUpgrade")
+          .addParameter(
+              ClassName.get("androidx.sqlite.db", "SupportSQLiteDatabase")
+                  .annotated(AnnotationSpec.builder(NotNull::class.java).build()),
+              "x")
+          .addParameter(Integer::class.javaPrimitiveType, "v1")
+          .addParameter(Integer::class.javaPrimitiveType, "v2")
+          .addAnnotation(Override::class.java)
+          .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
+          .addException(ClassName.get("promise.db", "TableError"))
+          .addCode(codeBlock.build())
+          .build()
+    }
+    return null
+  }
+}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/db/ompiler/RegisterColumnsGenerator.kt b/compiler/src/main/java/promise/database/compiler/TableRegisteredColumnsMethodGenerator.kt
similarity index 81%
rename from compiler/src/main/java/promise/db/ompiler/RegisterColumnsGenerator.kt
rename to compiler/src/main/java/promise/database/compiler/TableRegisteredColumnsMethodGenerator.kt
index 2ba173c..ddf1f97 100644
--- a/compiler/src/main/java/promise/db/ompiler/RegisterColumnsGenerator.kt
+++ b/compiler/src/main/java/promise/database/compiler/TableRegisteredColumnsMethodGenerator.kt
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package promise.db.ompiler
+package promise.database.compiler
 
 import com.squareup.javapoet.ClassName
 import com.squareup.javapoet.CodeBlock
@@ -20,26 +20,15 @@ import com.squareup.javapoet.ParameterizedTypeName
 import com.squareup.javapoet.TypeName
 import com.squareup.javapoet.WildcardTypeName
 import org.jetbrains.annotations.NotNull
-import java.lang.reflect.Type
 import javax.lang.model.element.Modifier
-import javax.lang.model.type.TypeVariable
-import javax.lang.model.type.WildcardType
-
-
-class RegisterColumnsGenerator(
-    private val columns: List<String>) : CodeBlockGenerator<MethodSpec> {
-  init {
-    //fileSpec.addImport("promise.commons.model", "List")
-  }
 
+class TableRegisteredColumnsMethodGenerator(
+    private val columns: List<String>) : CodeGenerator<MethodSpec> {
   override fun generate(): MethodSpec {
-
     var stmt = "return List.fromArray("
     columns.forEachIndexed { index, s ->
       stmt += s
-      if (index != columns.size - 1) {
-        stmt += ", "
-      }
+      if (index != columns.size - 1) stmt += ", "
     }
     stmt += ");"
     return MethodSpec.methodBuilder("getColumns")
@@ -57,6 +46,5 @@ class RegisterColumnsGenerator(
         .addAnnotation(NotNull::class.java)
         .addCode(CodeBlock.of(stmt))
         .build()
-
   }
 }
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/database/compiler/TableSerializerMethodGenerator.kt b/compiler/src/main/java/promise/database/compiler/TableSerializerMethodGenerator.kt
new file mode 100644
index 0000000..3d5d9e8
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/TableSerializerMethodGenerator.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler
+
+import com.squareup.javapoet.ClassName
+import com.squareup.javapoet.CodeBlock
+import com.squareup.javapoet.MethodSpec
+import promise.database.compiler.utils.ConverterTypes
+import promise.database.compiler.utils.JavaUtils
+import promise.database.compiler.utils.capitalizeFirst
+import promise.database.compiler.utils.checkIfHasTypeConverter
+import promise.database.compiler.utils.getConverterCompatibleMethod
+import promise.database.compiler.utils.isElementAnnotatedAsRelation
+import promise.database.compiler.utils.isSameAs
+import promise.database.compiler.utils.toTypeName
+import javax.lang.model.element.Element
+import javax.lang.model.element.Modifier
+
+class TableSerializerMethodGenerator(
+    private val typeDataTypePack: String,
+    private val typeDataType: String,
+    private val columns: List<Pair<Pair<String, Element>, String>>) : CodeGenerator<MethodSpec> {
+
+  override fun generate(): MethodSpec {
+
+    val codeBlock = CodeBlock.builder()
+
+    codeBlock.addStatement("ContentValues values = new ContentValues()")
+
+    columns.forEach {
+      generatePutStatement(codeBlock, it.first.first, it.second, it.first.second)
+    }
+    codeBlock.addStatement("return values")
+    return MethodSpec.methodBuilder("serialize")
+        .addModifiers(Modifier.PUBLIC)
+        .addParameter(ClassName.get(typeDataTypePack, typeDataType), "t")
+        .addAnnotation(Override::class.java)
+        .returns(ClassName.get("android.content", "ContentValues"))
+        .addCode(codeBlock.build())
+        .build()
+  }
+
+  private fun generatePutStatement(
+      codeBlock: CodeBlock.Builder,
+      typeVariable: String, columnName: String, varTypeName: Element) {
+    if (varTypeName.toTypeName().isSameAs(Boolean::class.java)) {
+      codeBlock.addStatement("values.put(${columnName}.getName(), t.is${typeVariable.capitalizeFirst()}() ? 1 : 0)")
+      return
+    }
+    if (varTypeName.checkIfHasTypeConverter()) {
+      val executableFn = varTypeName.getConverterCompatibleMethod(ConverterTypes.SERIALIZER)
+      if (executableFn != null)
+        codeBlock.addStatement("values.put(${columnName}.getName(), typeConverter.${executableFn.simpleName}(t.get${typeVariable.capitalizeFirst()}()))")
+    } else if (varTypeName.isElementAnnotatedAsRelation())
+      codeBlock.add(JavaUtils.generateSerializerRelationPutStatement(varTypeName, columnName)) else codeBlock.addStatement("values.put(${columnName}.getName(), t.get${typeVariable.capitalizeFirst()}())")
+  }
+}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/database/compiler/TypeConverterAnnotatedProcessor.kt b/compiler/src/main/java/promise/database/compiler/TypeConverterAnnotatedProcessor.kt
new file mode 100644
index 0000000..b64e565
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/TypeConverterAnnotatedProcessor.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler
+
+import com.squareup.javapoet.ClassName
+import com.squareup.javapoet.JavaFile
+import promise.database.TypeConverter
+import promise.database.compiler.utils.LogUtil
+import promise.database.compiler.utils.Utils
+import java.util.*
+import javax.annotation.processing.ProcessingEnvironment
+import javax.annotation.processing.RoundEnvironment
+import javax.lang.model.element.TypeElement
+
+class TypeConverterAnnotatedProcessor(private val processingEnv: ProcessingEnvironment) : AnnotatedClassProcessor() {
+
+  override fun process(environment: RoundEnvironment?): List<JavaFile.Builder?>? {
+    val typeConverters = environment?.getElementsAnnotatedWith(TypeConverter::class.java)
+    if (typeConverters != null) {
+      if (typeConverters.size > 1)
+        LogUtil.e(Exception("There can only be one typeConverter in the module"))
+      else if (typeConverters.size == 1) try {
+        typeConverter = typeConverters.first() as TypeElement
+        return Collections.singletonList(processElement(typeConverter!!))
+      } catch (e: Throwable) {
+        LogUtil.e(e, typeConverter)
+      }
+    }
+    return null
+  }
+
+  private fun processElement(element: TypeElement): JavaFile.Builder {
+    val className = element.simpleName.toString()
+    val pack = processingEnv.elementUtils.getPackageOf(element).toString()
+    return Utils.generateInstanceProviderHolder(ClassName.get(pack, className))
+  }
+  ;
+  companion object {
+    var typeConverter: TypeElement? = null
+  }
+}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/database/compiler/migration/DatabaseMetaData.kt b/compiler/src/main/java/promise/database/compiler/migration/DatabaseMetaData.kt
new file mode 100644
index 0000000..a35a124
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/migration/DatabaseMetaData.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.migration
+
+class DatabaseMetaData {
+  var dbVersion: Int = 1
+  var tableMetaData: List<TableMetaData> = emptyList()
+}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/database/compiler/migration/TableMetaData.kt b/compiler/src/main/java/promise/database/compiler/migration/TableMetaData.kt
new file mode 100644
index 0000000..d502653
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/migration/TableMetaData.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.migration
+
+import com.fasterxml.jackson.annotation.JsonInclude
+
+class Field {
+  var fieldName = ""
+  var columnName = ""
+  var nullable = true
+}
+
+class TableMetaData {
+  var tableName: String = ""
+  var fields: List<Field> = emptyList()
+
+  @JsonInclude(JsonInclude.Include.NON_NULL)
+  var migrations: List<TableMigration> = emptyList()
+}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/database/compiler/migration/TableMigration.kt b/compiler/src/main/java/promise/database/compiler/migration/TableMigration.kt
new file mode 100644
index 0000000..e3def9b
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/migration/TableMigration.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.migration
+
+import promise.database.MigrationOptions
+
+open class TableMigration {
+  var versionChange: VersionChange? = null
+  var field: String? = null
+  var action: MigrationOptions? = null
+
+  override fun equals(other: Any?): Boolean {
+    if (javaClass != other?.javaClass) return false
+    other as TableMigration
+
+    if (versionChange != other.versionChange) return false
+    if (field != other.field) return false
+    if (action != other.action) return false
+    return true
+  }
+
+  override fun hashCode(): Int {
+    var result = versionChange?.hashCode() ?: 0
+    result = 31 * result + (field?.hashCode() ?: 0)
+    result = 31 * result + (action?.hashCode() ?: 0)
+    return result
+  }
+}
+
+class RenameColumnTableMigration : TableMigration() {
+
+  var oldColumnName: String? = null
+
+  init {
+    super.action = MigrationOptions.RENAME_COLUMN
+  }
+
+  override fun equals(other: Any?): Boolean {
+    if (this === other) return true
+    if (javaClass != other?.javaClass) return false
+    if (!super.equals(other)) return false
+    other as RenameColumnTableMigration
+    if (oldColumnName != other.oldColumnName) return false
+    return true
+  }
+
+  override fun hashCode(): Int {
+    var result = 0
+    result = 31 * result + (oldColumnName?.hashCode() ?: 0)
+    return result
+  }
+
+}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/database/compiler/migration/VersionChange.kt b/compiler/src/main/java/promise/database/compiler/migration/VersionChange.kt
new file mode 100644
index 0000000..dd3e347
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/migration/VersionChange.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.migration
+
+class VersionChange {
+  var fromVersion: Int = 0
+  var toVersion: Int = 0
+  override fun equals(other: Any?): Boolean {
+    if (this === other) return true
+    if (javaClass != other?.javaClass) return false
+    other as VersionChange
+    if (fromVersion != other.fromVersion) return false
+    if (toVersion != other.toVersion) return false
+    return true
+  }
+
+  override fun hashCode(): Int {
+    var result = fromVersion
+    result = 31 * result + toVersion
+    return result
+  }
+}
diff --git a/compiler/src/main/java/promise/database/compiler/utils/Arrangeable.java b/compiler/src/main/java/promise/database/compiler/utils/Arrangeable.java
new file mode 100644
index 0000000..b5ea39b
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/utils/Arrangeable.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.utils;
+
+public class Arrangeable<Value, Key> {
+  private Value value;
+  private Key key;
+
+  Value value() {
+    return value;
+  }
+
+  Arrangeable<Value, Key> value(Value value) {
+    this.value = value;
+    return this;
+  }
+
+  Key key() {
+    return key;
+  }
+
+  Arrangeable<Value, Key> key(Key key) {
+    this.key = key;
+    return this;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    Arrangeable<?, ?> that = (Arrangeable<?, ?>) o;
+    return value.equals(that.value) &&
+        key.equals(that.key);
+  }
+
+  @Override
+  public int hashCode() {
+    return key.hashCode() + value.hashCode();
+  }
+}
+
diff --git a/compiler/src/main/java/promise/database/compiler/utils/Category.java b/compiler/src/main/java/promise/database/compiler/utils/Category.java
new file mode 100644
index 0000000..1d15fc9
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/utils/Category.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.utils;
+
+public class Category<K, T> {
+  private List<? extends T> list;
+  private K name;
+
+  Category(K name) {
+    this.name = name;
+  }
+
+  public List<? extends T> list() {
+    return list;
+  }
+
+  public Category<K, T> list(List<? extends T> list) {
+    this.list = list;
+    return this;
+  }
+
+  public K name() {
+    return name;
+  }
+
+  public Category<K, T> name(K name) {
+    this.name = name;
+    return this;
+  }
+}
+
diff --git a/compiler/src/main/java/promise/database/compiler/utils/JavaUtils.java b/compiler/src/main/java/promise/database/compiler/utils/JavaUtils.java
new file mode 100644
index 0000000..ea9d7e1
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/utils/JavaUtils.java
@@ -0,0 +1,223 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.utils;
+
+import com.squareup.javapoet.ClassName;
+import com.squareup.javapoet.CodeBlock;
+import com.squareup.javapoet.FieldSpec;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.TypeName;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.type.WildcardType;
+
+@SuppressWarnings("WeakerAccess")
+public class JavaUtils {
+
+  // code generation participants
+
+  // end of code generation participants
+  private static final Map<Class<?>, Class<?>> PRIMITIVES_TO_WRAPPERS
+      = new HashMap<Class<?>, Class<?>>() {{
+    put(boolean.class, Boolean.class);
+    put(byte.class, Byte.class);
+    put(char.class, Character.class);
+    put(double.class, Double.class);
+    put(float.class, Float.class);
+    put(int.class, Integer.class);
+    put(long.class, Long.class);
+    put(short.class, Short.class);
+    put(void.class, Void.class);
+  }};
+
+  /**
+   * @param element
+   * @return
+   */
+  public static FieldSpec generateEntityTableLogField(Element element) {
+    return FieldSpec.builder(
+        String.class, "TAG")
+        .addModifiers(Modifier.STATIC, Modifier.PRIVATE, Modifier.FINAL)
+        .initializer("$T.makeTag(" + element.getSimpleName() + ".class)",
+            ClassName.get("promise.commons.data.log", "LogUtil"))
+        .build();
+  }
+
+  public static void generateAddConverterStatementInDatabaseConstructorMethod(
+      ProcessingEnvironment processingEnvironment,
+      MethodSpec.Builder constructorMethod,
+      TypeElement converter) {
+    String pack = processingEnvironment.getElementUtils().getPackageOf(converter).toString();
+    constructorMethod.addStatement("this.typeConverter = $T.provider($T.create(new $T())).get()",
+        ClassName.get("promise.commons", "SingletonInstanceProvider"),
+        ClassName.get(pack, UtilsKt.getInstanceProviderClassName(converter.getSimpleName().toString())),
+        UtilsKt.toTypeName(converter));
+  }
+
+  public static CodeBlock.Builder generateGetRelationDaoCodeBlock(Map.Entry<ClassName, HashMap<ClassName, Element>> relationDao) {
+    ClassName providerClassName = ClassName.get(relationDao.getKey().packageName(),
+        UtilsKt.getInstanceProviderClassName(relationDao.getKey().simpleName()));
+    CodeBlock.Builder codeBlock = CodeBlock.builder();
+    codeBlock.add("return $T.provider($T.create(new $T.Builder()\n",
+        ClassName.get("promise.commons", "SingletonInstanceProvider"),
+        providerClassName,
+        relationDao.getKey());
+    for (Map.Entry<ClassName, Element> tableAndEntity : relationDao.getValue().entrySet())
+      codeBlock.add(".set" + tableAndEntity.getKey().simpleName() + "(get" + tableAndEntity.getKey().simpleName() + "())\n");
+    codeBlock.addStatement(".build())).get()");
+    return codeBlock;
+  }
+
+  public static void generateIfStatementObtainClassString(
+      ProcessingEnvironment processingEnv,
+      CodeBlock.Builder codeBlock,
+      TypeElement entity) {
+    String pack = processingEnv.getElementUtils().getPackageOf(entity).toString();
+    if (PersistableEntityUtilsKt.checkIfAnyElementNeedsTypeConverter(entity)) {
+      String tableVarName = PersistableEntityUtilsKt.camelCase(PersistableEntityUtilsKt.getTableClassNameString(entity));
+      codeBlock.beginControlFlow("if (entityClass == $T.class)", ClassName.get(pack, entity.getSimpleName().toString()));
+      codeBlock.addStatement("$T " + tableVarName + " = getDatabaseInstance().obtain($T.class)",
+          ClassName.get(pack, PersistableEntityUtilsKt.getTableClassNameString(entity)),
+          ClassName.get(pack, PersistableEntityUtilsKt.getTableClassNameString(entity)));
+      codeBlock.addStatement(tableVarName + ".setTypeConverter(typeConverter)");
+      codeBlock.addStatement("return (FastTable<T>) " + tableVarName);
+      codeBlock.endControlFlow();
+    } else
+      codeBlock.addStatement("if (entityClass == $T.class) return getDatabaseInstance().obtain($T.class)",
+          ClassName.get(pack, entity.getSimpleName().toString()),
+          ClassName.get(pack, PersistableEntityUtilsKt.getTableClassNameString(entity)));
+  }
+
+  public static CodeBlock generateGetTableStatement(
+      ProcessingEnvironment processingEnv,
+      TypeElement entity) {
+    String pack = processingEnv.getElementUtils().getPackageOf(entity).toString();
+    return CodeBlock.builder()
+        .addStatement("return ($T) tableOf($T.class)",
+            ClassName.get(pack, PersistableEntityUtilsKt.getTableClassNameString(entity)),
+            TypeName.get(entity.asType()))
+        .build();
+  }
+
+  public static CodeBlock generateSerializerRelationPutStatement(Element element, String colName) {
+    CodeBlock.Builder codeBlock = CodeBlock.builder();
+    String variableName = PersistableEntityUtilsKt.camelCase(element.getSimpleName().toString());
+    codeBlock.addStatement("$T " + variableName + " = t.get" + PersistableEntityUtilsKt.capitalizeFirst(element.getSimpleName().toString()) + "()", TypeName.get(element.asType()));
+    codeBlock.beginControlFlow("if(" + variableName + " != null)");
+    codeBlock.addStatement("values.put(" + colName + ".getName(), " + variableName + ".getId())");
+    codeBlock.endControlFlow();
+    codeBlock.beginControlFlow("else");
+    codeBlock.addStatement("values.put(" + colName + ".getName(), 0)");
+    codeBlock.endControlFlow();
+    return codeBlock.build();
+  }
+
+  public static CodeBlock generateDeserializerRelationSetStatement(
+      String entitySetName,
+      Element element,
+      String colName) {
+    CodeBlock.Builder codeBlock = CodeBlock.builder();
+    String variableName = PersistableEntityUtilsKt.camelCase(element.getSimpleName().toString());
+    String variableNameId = variableName + "Id";
+    codeBlock.addStatement("int " + variableNameId + " = e.getInt(" + colName + ".getIndex(e))");
+    codeBlock.beginControlFlow("if(" + variableNameId + " != 0)");
+    codeBlock.addStatement("$T " + variableName + " = new $T()",
+        TypeName.get(element.asType()),
+        TypeName.get(element.asType()));
+    codeBlock.addStatement(variableName + ".setId(" + variableNameId + ")");
+    codeBlock.addStatement(entitySetName + ".set" + PersistableEntityUtilsKt.capitalizeFirst(element.getSimpleName().toString()) + "(" + variableName + ")");
+    codeBlock.endControlFlow();
+    return codeBlock.build();
+  }
+
+  public static void generateCatchSQliteExceptionBlockForDeserializer(CodeBlock.Builder codeBlock, String typeDataType) {
+    codeBlock.beginControlFlow("catch($T ex)",
+        ClassName.get("android.database", "CursorIndexOutOfBoundsException"));
+    codeBlock.addStatement("LogUtil.e(TAG, \"deserialize\", ex)");
+    codeBlock.addStatement("return new " + typeDataType + "()");
+  }
+
+  public static void generateDatabaseMigrationOverrideControlBlock(CodeBlock.Builder codeBlock) {
+    codeBlock.add("@Override \n");
+    codeBlock.beginControlFlow("public void onMigrate(FastDatabase database, $T sqLiteDatabase, int oldVersion, int newVersion)",
+        ClassName.get("androidx.sqlite.db", "SupportSQLiteDatabase"));
+  }
+
+  public static CodeBlock generateReturnDaoImplInstance(ClassName daoImpl) {
+    return CodeBlock.builder()
+        .addStatement("return new $T(this)", daoImpl)
+        .build();
+  }
+
+  // safe because both Long.class and long.class are of type Class<Long>
+  @SuppressWarnings("unchecked")
+  public static <T> Class<T> wrap(Class<T> c) {
+    return c.isPrimitive() ? (Class<T>) PRIMITIVES_TO_WRAPPERS.get(c) : c;
+  }
+
+  public static boolean isTypeEqual(TypeMirror typeMirror, TypeName otherType) {
+    if (typeMirror.getKind() == TypeKind.NONE || otherType == TypeName.VOID ||
+        typeMirror.getKind() == TypeKind.VOID) {
+      return false;
+    }
+    return otherType.toString().equals(TypeName.get(typeMirror).toString());
+  }
+
+  public static DeclaredType getDeclaredType(ProcessingEnvironment processingEnvironment, TypeElement typeElement) {
+    return processingEnvironment.getTypeUtils().getDeclaredType(typeElement);
+  }
+
+  public static boolean isSubTypeOfDeclaredType(ProcessingEnvironment processingEnvironment, Element typeElement, DeclaredType declaredType) {
+    return processingEnvironment.getTypeUtils().isAssignable(typeElement.asType(), declaredType);
+  }
+
+  public static DeclaredType toWildCardType(ProcessingEnvironment processingEnvironment, TypeElement typeElement, int wildTimes) {
+    WildcardType WILDCARD_TYPE_NULL = processingEnvironment.getTypeUtils().getWildcardType(null, null);
+    TypeMirror[] mirrors = new TypeMirror[wildTimes];
+    for (int i = 0; i < wildTimes; i++) mirrors[i] = WILDCARD_TYPE_NULL;
+    return processingEnvironment.getTypeUtils().getDeclaredType(typeElement, mirrors);
+  }
+
+  public static boolean isCollectionType(ProcessingEnvironment processingEnvironment, VariableElement variableElement) {
+    DeclaredType collectionType = toWildCardType(processingEnvironment,
+        processingEnvironment.getElementUtils().getTypeElement(Collection.class.getName()),
+        1);
+    return isSubTypeOfDeclaredType(processingEnvironment, variableElement, collectionType);
+  }
+
+  public static List<? extends TypeMirror> getParameterizedTypeMirrors(VariableElement variableElement) {
+    if (variableElement.asType() instanceof DeclaredType) {
+      DeclaredType declaredType = (DeclaredType) variableElement.asType();
+      return declaredType.getTypeArguments();
+    }
+    return null;
+  }
+
+  public static TypeMirror getTypeMirror(VariableElement variableElement) {
+    if (variableElement.asType() instanceof DeclaredType) return variableElement.asType();
+    return null;
+  }
+}
diff --git a/compiler/src/main/java/promise/database/compiler/utils/List.java b/compiler/src/main/java/promise/database/compiler/utils/List.java
new file mode 100644
index 0000000..4dad631
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/utils/List.java
@@ -0,0 +1,521 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.utils;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+import kotlin.Pair;
+import promise.database.compiler.utils.function.BIConsumer;
+import promise.database.compiler.utils.function.Combiner;
+import promise.database.compiler.utils.function.FilterFunction;
+import promise.database.compiler.utils.function.FilterFunction2;
+import promise.database.compiler.utils.function.GroupFunction;
+import promise.database.compiler.utils.function.GroupFunction2;
+import promise.database.compiler.utils.function.GroupFunction3;
+import promise.database.compiler.utils.function.JoinFunction;
+import promise.database.compiler.utils.function.MapFunction;
+import promise.database.compiler.utils.function.MapIndexFunction;
+import promise.database.compiler.utils.function.ReduceFunction;
+
+public class List<T> extends ArrayList<T> {
+  /**
+   * Constructs an empty list with the specified initial capacity.
+   *
+   * @param initialCapacity the initial capacity of the list
+   * @throws IllegalArgumentException if the specified initial capacity is negative
+   */
+  public List(int initialCapacity) {
+    super(initialCapacity);
+  }
+
+  /**
+   * Constructs an empty list with an initial capacity of ten.
+   */
+  public List() {
+  }
+
+  /**
+   * Constructs a list containing the elements of the specified collection, in the order they are
+   * returned by the collection's iterator.
+   *
+   * @param c the collection whose elements are to be placed into this list
+   * @throws NullPointerException if the specified collection is null
+   */
+  public List(Collection<? extends T> c) {
+    super(c);
+  }
+
+  /**
+   * returns a list from an array of args
+   *
+   * @param t   array of args
+   * @param <T> type of list elements
+   * @return a list
+   */
+  @SafeVarargs
+  public static <T> List<T> fromArray(T... t) {
+    return new List<>(Arrays.asList(t));
+  }
+
+  public static <T> List<T> generate(int num, MapFunction<? extends T, ? super Integer> function) {
+    List<T> list = new List<>();
+    for (int i = 0; i < num; i++) list.add(function.from(i));
+    return list;
+  }
+
+  /**
+   * reverses this list
+   *
+   * @return a reversed list
+   */
+  public List<T> reverse() {
+    Collections.reverse(this);
+    return this;
+  }
+
+  /**
+   * gets a sample elements from the list
+   *
+   * @param size elements to take
+   *             {@link java.util.List#subList(int, int)}
+   *             where fromIndex is zero
+   * @return a sublist
+   */
+  public List<T> take(int size) {
+    List<T> list = new List<>();
+    if (size() > size) for (int i = 0; i < size; i++) list.add(get(i));
+    else list = this;
+    return list;
+  }
+
+  /**
+   * finds an item within the list
+   *
+   * @param function select function
+   * @return an item or null if not found
+   */
+  @Nullable
+  public T find(FilterFunction<? super T> function) {
+    return filter(function).first();
+  }
+
+  /**
+   * find the index where the condition in the select function is true
+   * returns -1 if item is not found
+   *
+   * @param function select function
+   * @return index of item marching the condition
+   */
+  public int findIndex(FilterFunction<? super T> function) {
+    int match = 0;
+    for (T t : this) {
+      if (function.select(t)) return match;
+      match++;
+    }
+    return -1;
+  }
+
+  /**
+   * shiffle the elements of the list
+   *
+   * @return
+   */
+  public List<T> shuffled() {
+    Collections.shuffle(this);
+    return this;
+  }
+
+  /**
+   * return a transformation of all the items
+   *
+   * @param function transformer function
+   * @param <E>      desires transformation result
+   * @return transformed list
+   */
+  public <E> List<E> map(MapFunction<? extends E, ? super T> function) {
+    List<E> list = new List<>();
+    for (T t : this) list.add(function.from(t));
+    return list;
+  }
+
+  public <E> List<E> mapIndexed(MapIndexFunction<? extends E, ? super T> function) {
+    List<E> list = new List<>();
+    for (int i = 0; i < this.size(); i++) {
+      T t = get(i);
+      list.add(function.from(i, t));
+    }
+    return list;
+  }
+/*
+    public <K, V> Map<K, V> associate(MapFunction<Pair<K, V>, ? super T> function) {
+
+    }
+
+    public List<List<T>> chucked(int chuckSize) {
+
+    }
+
+    public <R> List<R> chucked(int chuckSize, MapFunction<List<? extends T>, ? super R> function) {
+
+    }*/
+
+  public Pair<List<? extends T>, List<? extends T>> partition(FilterFunction<? super T> function) {
+    List<T> first = new List<>();
+    List<T> second = new List<>();
+    for (T t : this) {
+      if (function.select(t)) first.add(t);
+      else second.add(t);
+    }
+    return new Pair(first, second);
+  }
+
+  /**
+   * sorts the elements of the list
+   *
+   * @param comparator compare function
+   * @return sorted list
+   */
+  public List<T> sorted(Comparator<? super T> comparator) {
+    Collections.sort(this, comparator);
+    return this;
+  }
+
+  /**
+   * arrange the list based on an atrribute that is not in blueprint of original items
+   *
+   * @param function   transformer for list to desired attribute that is sortable
+   * @param comparator compare function that compares the result of the transformer
+   * @param <K>        desired compare type
+   * @return a sorted list
+   */
+  public <K> List<T> arranged(final MapFunction<? extends K, ? super T> function, final Comparator<? super K> comparator) {
+    return map(t -> new Arrangeable<T, K>().value(t).key(function.from(t)))
+        .sorted(
+            (o1, o2) -> comparator.compare(o1.key(), o2.key()))
+        .map(Arrangeable::value);
+  }
+
+  /**
+   * groups the items into collections with similar attributes
+   *
+   * @param function group function
+   * @param <E>      type that will contain one group of similar items
+   * @return list of collected groups
+   */
+  public <E> List<E> group(GroupFunction3<E, T> function) {
+    return function.group(this);
+  }
+
+  /**
+   * groups the items into groups with similar attributes
+   *
+   * @param function group function
+   * @param <K>      type of similar attribute
+   * @param <E>      collected group type
+   * @return a list of collected group type
+   */
+  public <K, E> List<E> group(GroupFunction2<K, E, T> function) {
+    List<E> es = new List<>();
+    Map<K, List<T>> map = new LinkedHashMap<>();
+    for (int i = 0, size = this.size(); i < size; i++) {
+      T t = this.get(i);
+      K key = function.getKey(t);
+      if (map.containsKey(key)) {
+        List<T> list = map.get(key);
+        list.add(t);
+      } else {
+        List<T> list = new List<>();
+        list.add(t);
+        map.put(key, list);
+      }
+    }
+    for (Map.Entry<K, List<T>> entry : map.entrySet()) {
+      E e = function.get(entry.getKey());
+      function.apply(e, entry.getValue());
+      es.add(e);
+    }
+    return es;
+  }
+
+  /**
+   * groups a list of items with similar attribute
+   *
+   * @param function group function
+   * @param <K>      similar attribute type
+   * @return a list of category of items
+   * each category returned has a list of items with their similar attribute
+   * {@link Category#list() contains grouped items}
+   * {@link Category#name()} contains the name of group that is the same as the value of the similar attribute
+   */
+  public <K> List<Category<K, T>> groupBy(final GroupFunction<? extends K, ? super T> function) {
+    return group(
+        new GroupFunction2<K, Category<K, T>, T>() {
+          @Override
+          public K getKey(T t) {
+            return function.getKey(t);
+          }
+
+          @Override
+          public Category<K, T> get(K k) {
+            return new Category<>(k);
+          }
+
+          @Override
+          public void apply(Category<K, T> category, List<T> list) {
+            category.list(list);
+          }
+        });
+  }
+
+  /**
+   * reduces this list to only contain the elements with similarity to the elements in the
+   * provided list
+   *
+   * @param uList    compare list
+   * @param function compare function that compares each item in this list to each item
+   *                 in the provided uList
+   * @param <U>      type of item in uList
+   * @return a small list with elements similar to the elements in uList
+   */
+  public <U> List<T> joinOn(List<? extends U> uList, JoinFunction<? super T, ? super U> function) {
+    List<T> ts = new List<>();
+    for (int i = 0, tSize = this.size(); i < tSize; i++) {
+      T t = this.get(i);
+      for (int i1 = 0, uSize = uList.size(); i1 < uSize; i1++) {
+        U u = uList.get(i1);
+        if (function.joinBy(t, u)) {
+          ts.add(t);
+          break;
+        }
+      }
+    }
+    return ts;
+  }
+
+  public <U> List<T> join(List<? extends U> uList, Combiner<? super U, T> function) {
+    if (this.size() != uList.size())
+      throw new IllegalArgumentException("Samples must be of same size");
+    List<T> ts = new List<>();
+    for (int i = 0, size = this.size(); i < size; i++) {
+      T t = this.get(i);
+      U u = uList.get(i);
+      ts.add(function.join(t, u));
+    }
+    return ts;
+  }
+
+  /**
+   * returns a list with no duplicate elements
+   *
+   * @return
+   */
+  public List<T> uniques() {
+    return new List<>(new HashSet<>(this));
+  }
+
+  /**
+   * returns a list with unique items based on a given attribute in each item in the list
+   *
+   * @param function     maps to the items that is supposed to be unique
+   * @param joinFunction reduces the this list with the result
+   *                     of unique list of attribute that is supposed to be unique
+   * @param <K>          type of desired unique attribute
+   * @return a unique list if items
+   */
+  public <K> List<T> uniques(MapFunction<? extends K, ? super T> function, JoinFunction<? super T, ? super K> joinFunction) {
+    return joinOn(map(function).uniques(), joinFunction);
+  }
+
+  /**
+   * reduces this list with comparing to the elements of another list
+   *
+   * @param uList    list to compare from
+   * @param function filter function for each item
+   * @param equals   flags to compare equality or no equality
+   * @param <U>      type of list item to compare from
+   * @param <K>      type of attribute to compare
+   * @return a reduced list
+   */
+  public <U, K> List<T> reduce(
+      List<? extends U> uList, final FilterFunction2<? extends K, ? super U, ? super T> function, final boolean equals) {
+    final Set<K> set = new HashSet<>(uList.map(
+        function::getKey));
+    return filter(
+        t -> {
+          if (equals) return set.contains(function.filterBy(t));
+          else return !set.contains(function.filterBy(t));
+        });
+  }
+
+  /**
+   * @param list
+   * @param reverse
+   * @param function
+   * @param combiner
+   * @param <K>
+   * @param <U>
+   * @return
+   */
+  public <K, U> List<T> merge(
+      List<? extends U> list,
+      final boolean reverse,
+      final FilterFunction2<? extends K, ? super U, ? super T> function,
+      Combiner<? super U, T> combiner) {
+    final Set<K> set = new HashSet<>(list.map(
+        function::getKey));
+    return filter(
+        t -> reverse == set.contains(function.filterBy(t)))
+        .join(list, combiner);
+  }
+
+  /**
+   * @param list
+   * @param function
+   * @param <K>
+   * @param <MERGE>
+   * @return
+   */
+  public <K, MERGE> List<Pair<T, K>> mergeWith(List<? extends K> list, final FilterFunction2<? extends MERGE, ? super K, ? super T> function) {
+    List<Pair<T, K>> list1 = new List<>();
+    /*Set<Arrangeable<K, MERGE>> set = new HashSet<>(
+        list.map(new MapFunction<Arrangeable<K, MERGE>, K>() {
+          @Override
+          public Arrangeable<K, MERGE> from(K k) {
+            return new Arrangeable<K, MERGE>().key(function.getKey(k)).value(k);
+          }
+        })
+    );*/
+    for (T t : this)
+      for (K k : list)
+        if (function.getKey(k).equals(function.filterBy(t))) list1.add(new Pair<>(t, k));
+    return list1;
+  }
+
+  /**
+   * returns whether there's an item in the list that matches the condition flagged in the function
+   *
+   * @param function flag function
+   * @return if there's an item matching in the list
+   */
+  public boolean anyMatch(FilterFunction<? super T> function) {
+    boolean match = false;
+    for (T t : this)
+      if (function.select(t)) {
+        match = true;
+        break;
+      }
+    return match;
+  }
+
+  /**
+   * returns whether all the items in this list match the condition in the flag function
+   *
+   * @param function flag function
+   * @return if all items match the flag condition
+   */
+  public boolean allMatch(FilterFunction<? super T> function) {
+    boolean match = true;
+    for (T t : this)
+      match = match && function.select(t);
+    return match;
+  }
+
+  /**
+   * filters this list to only items matching the condition
+   *
+   * @param function filter function
+   * @return a reduces list
+   */
+  public List<T> filter(FilterFunction<? super T> function) {
+    List<T> list = new List<>();
+    for (T t : this) if (function.select(t)) list.add(t);
+    return list;
+  }
+
+  /**
+   * @param list
+   * @param function
+   * @param <U>
+   * @return
+   */
+  public <U> List<T> reduce(List<? extends U> list, JoinFunction<? super T, ? super U> function) {
+    List<T> ts = new List<>();
+    for (int i = 0; i < this.size(); i++) {
+      T t = this.get(i);
+      for (int j = 0; j < list.size(); j++)
+        if (!function.joinBy(t, list.get(j))) {
+          ts.add(t);
+          break;
+        }
+    }
+    return ts;
+  }
+
+  /**
+   * @param consumer
+   */
+  public void biConsume(BIConsumer<? super T, ? super T> consumer) {
+    Iterator<T> it = iterator();
+    if (!it.hasNext()) return;
+    T first = it.next();
+    while (it.hasNext()) {
+      T next = it.next();
+      consumer.accept(first, next);
+      first = next;
+    }
+  }
+
+  /**
+   * gets the first element in the list
+   *
+   * @return first element
+   */
+  @Nullable
+  public T first() {
+    return this.isEmpty() ? null : this.get(0);
+  }
+
+  /**
+   * gets the last element in the list
+   *
+   * @return last element
+   */
+  @Nullable
+  public T last() {
+    return this.isEmpty() ? null : get(size() - 1);
+  }
+
+  /**
+   * reduces all the items in the list to one result
+   *
+   * @param function reducing function
+   * @param <K>      desired type of reduce result
+   * @return an instance of reduce result
+   */
+  public <K> K reduce(ReduceFunction<? extends K, T> function) {
+    return function.reduce(this);
+  }
+}
+
diff --git a/compiler/src/main/java/promise/database/compiler/utils/LogUtil.java b/compiler/src/main/java/promise/database/compiler/utils/LogUtil.java
new file mode 100644
index 0000000..ad669a9
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/utils/LogUtil.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.utils;
+
+import java.util.Arrays;
+
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.Element;
+import javax.tools.Diagnostic;
+
+public class LogUtil {
+
+  private static final String TAG = "PromiseDatabaseCompiler: ";
+  private static ProcessingEnvironment processingEnv;
+
+  private LogUtil() {
+    //no instance
+  }
+
+  public static void initLogger(ProcessingEnvironment processingEnvironment) {
+    LogUtil.processingEnv = processingEnvironment;
+  }
+
+  public static void w(Object... messages) {
+    StringBuilder builder = new StringBuilder();
+    builder.append(TAG);
+    for (Object message : messages) {
+      builder.append(message.toString());
+    }
+    processingEnv.getMessager().printMessage(Diagnostic.Kind.WARNING, builder.toString());
+  }
+
+  public static void n(Object... messages) {
+
+    StringBuilder builder = new StringBuilder();
+
+    builder.append(TAG);
+    for (Object message : messages) {
+      builder.append(message.toString());
+    }
+    processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, builder.toString());
+  }
+
+  public static void e(Throwable t) {
+    processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR,
+        TAG + Utils.INSTANCE.getStackTraceString(t));
+  }
+
+  public static void eTrace(Throwable t) {
+    processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR,
+        TAG + Arrays.asList(t.getStackTrace()));
+  }
+
+  public static void e(Throwable t, Element element) {
+    processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR,
+        TAG + Utils.INSTANCE.getStackTraceString(t), element);
+  }
+
+}
+
diff --git a/compiler/src/main/java/promise/db/ompiler/PersistableEntityUtils.kt b/compiler/src/main/java/promise/database/compiler/utils/PersistableEntityUtils.kt
similarity index 53%
rename from compiler/src/main/java/promise/db/ompiler/PersistableEntityUtils.kt
rename to compiler/src/main/java/promise/database/compiler/utils/PersistableEntityUtils.kt
index a3083ef..9fd20fd 100644
--- a/compiler/src/main/java/promise/db/ompiler/PersistableEntityUtils.kt
+++ b/compiler/src/main/java/promise/database/compiler/utils/PersistableEntityUtils.kt
@@ -11,19 +11,26 @@
  * limitations under the License.
  */
 
-package promise.db.ompiler
+package promise.database.compiler.utils
 
 import com.squareup.javapoet.ClassName
+import com.squareup.javapoet.TypeName
 import com.sun.tools.javac.code.Attribute
 import org.atteo.evo.inflector.English
-import promise.db.DatabaseEntity
-import promise.db.Entity
-import promise.db.ForeignKey
-import promise.db.Index
+import promise.database.ColumnInfo
+import promise.database.DatabaseEntity
+import promise.database.Entity
+import promise.database.ForeignKey
+import promise.database.HasMany
+import promise.database.HasOne
+import promise.database.Index
+import promise.database.compiler.TypeConverterAnnotatedProcessor
 import java.io.IOException
 import javax.annotation.processing.ProcessingEnvironment
 import javax.lang.model.element.Element
+import javax.lang.model.element.ExecutableElement
 import javax.lang.model.element.TypeElement
+import javax.lang.model.type.TypeKind
 import javax.lang.model.type.TypeMirror
 import javax.lang.model.util.ElementFilter
 
@@ -31,7 +38,7 @@ import javax.lang.model.util.ElementFilter
  * gets the className for type element
  */
 fun TypeElement.asTableClassName(processingEnv: ProcessingEnvironment): ClassName {
-  val className = this.getClassName()
+  val className = this.getTableClassNameString()
   val pack = processingEnv.elementUtils.getPackageOf(this).toString()
   return ClassName.get(pack, className)
 }
@@ -39,7 +46,7 @@ fun TypeElement.asTableClassName(processingEnv: ProcessingEnvironment): ClassNam
 /**
  * gets the class name for the table class of this element
  */
-fun Element.getClassName(): String = "${this.simpleName.toString().pluralize().capitalizeFirst()}Table"
+fun Element.getTableClassNameString(): String = "${this.simpleName.toString().pluralize().capitalizeFirst()}Table"
 
 //@JvmName("PersistableEntityUtils")
 /**
@@ -92,7 +99,7 @@ fun TypeElement.getTableForeignKeys(processingEnv: ProcessingEnvironment): Array
         val entityClass = ((annotationValue as Attribute.Class).classType as TypeMirror).asTypeElement(processingEnv)
         val refColName = Utils.getAnnotationValue(foreignKeyAnnotationMirror, "referencedEntityColumnName")
         mapOf(Pair("columnName", it.getNameOfColumn()),
-            Pair("referencedColumnName", if (refColName != null ) refColName.value as String else "id"),
+            Pair("referencedColumnName", if (refColName != null) refColName.value as String else "id"),
             Pair("referencedTableName", entityClass.getTableName()))
       }
   if (fields.isNullOrEmpty()) return null
@@ -125,27 +132,105 @@ fun TypeElement.getDatabaseVersion(): Int {
  * gets name of column for a field in entity class
  */
 fun Element.getNameOfColumn(): String {
-  //processingEnvironment.messager.printMessage(Diagnostic.Kind.ERROR, "elemtype: "+element.toTypeName().toString()+"\n")
-  //processingEnvironment.messager.printMessage(Diagnostic.Kind.ERROR, "class type: "+Int::class.java.name+"\n")
   var name: String? = null
   if ((this.toTypeName().isSameAs(Integer::class.java) ||
           this.toTypeName().isSameAs(Float::class.java) ||
+          this.toTypeName().isSameAs(Long::class.java) ||
           this.toTypeName().isSameAs(Double::class.java) ||
           this.toTypeName().isSameAs(Boolean::class.java)) &&
-      this.getAnnotation(promise.db.Number::class.java) != null) {
-    name = this.getAnnotation(promise.db.Number::class.java).columnName
+      this.getAnnotation(ColumnInfo::class.java) != null) {
+    name = this.getAnnotation(ColumnInfo::class.java).columnName
   } else if (this.toTypeName().isSameAs(String::class.java) &&
-      this.getAnnotation(promise.db.VarChar::class.java) != null) {
-    name = this.getAnnotation(promise.db.VarChar::class.java).columnName
+      this.getAnnotation(ColumnInfo::class.java) != null) {
+    name = this.getAnnotation(ColumnInfo::class.java).columnName
+  } else if (this.getAnnotation(ColumnInfo::class.java) != null) {
+    name = this.getAnnotation(ColumnInfo::class.java).columnName
+  } else if (this.getAnnotation(ColumnInfo::class.java) != null) {
+    name = this.getAnnotation(ColumnInfo::class.java).columnName
   }
   if (name != null && name.isNotEmpty()) return name
   return this.simpleName.toString()
 }
 
+fun Element.isColumnNullable(): Boolean {
+  var nullable: Boolean = true
+  if ((this.toTypeName().isSameAs(Integer::class.java) ||
+          this.toTypeName().isSameAs(Float::class.java) ||
+          this.toTypeName().isSameAs(Long::class.java) ||
+          this.toTypeName().isSameAs(Double::class.java) ||
+          this.toTypeName().isSameAs(Boolean::class.java)) &&
+      this.getAnnotation(promise.database.ColumnInfo::class.java) != null) {
+    nullable = this.getAnnotation(promise.database.ColumnInfo::class.java).nullable
+  } else if (this.toTypeName().isSameAs(String::class.java) &&
+      this.getAnnotation(ColumnInfo::class.java) != null) {
+    nullable = this.getAnnotation(ColumnInfo::class.java).nullable
+  } else if (this.getAnnotation(ColumnInfo::class.java) != null) {
+    nullable = this.getAnnotation(ColumnInfo::class.java).nullable
+  } else if (this.getAnnotation(ColumnInfo::class.java) != null) {
+    nullable = this.getAnnotation(ColumnInfo::class.java).nullable
+  }
+  return nullable
+}
+
 /**
  * capitalize the first char of string
  */
 
 fun String.capitalizeFirst(): String = this.replaceFirst(this.first(), this.first().toUpperCase())
 
-fun String.camelCase(): String = this.replaceFirst(this.first(), this.first().toLowerCase())
\ No newline at end of file
+fun String.camelCase(): String = this.replaceFirst(this.first(), this.first().toLowerCase())
+
+fun TypeElement.checkIfAnyElementNeedsTypeConverter(): Boolean = ElementFilter.fieldsIn(this.enclosedElements).any {
+  it.checkIfHasTypeConverter()
+}
+
+fun Element.checkIfHasTypeConverter(): Boolean {
+  if (TypeConverterAnnotatedProcessor.typeConverter != null)
+    return this.getConverterCompatibleMethod(ConverterTypes.SERIALIZER) != null &&
+        this.getConverterCompatibleMethod(ConverterTypes.DESERIALIZER) != null
+  return false
+}
+
+enum class ConverterTypes {
+  DESERIALIZER,
+  SERIALIZER
+}
+
+fun Element.getConverterCompatibleMethod(converterTypes: ConverterTypes): ExecutableElement? {
+  if (TypeConverterAnnotatedProcessor.typeConverter != null) {
+    val methods =
+        ElementFilter.methodsIn(TypeConverterAnnotatedProcessor.typeConverter!!.enclosedElements)
+            .filter { it.parameters.size == 1 }
+    return methods.find {
+      if (this.asType().kind == TypeKind.VOID) return@find false
+      when (converterTypes) {
+        ConverterTypes.DESERIALIZER -> {
+
+          JavaUtils.isTypeEqual(it.parameters[0].asType(), TypeName.get(String::class.java)) &&
+              JavaUtils.isTypeEqual(it.returnType, TypeName.get(this.asType()))
+        }
+        ConverterTypes.SERIALIZER -> {
+          JavaUtils.isTypeEqual(it.parameters[0].asType(), TypeName.get(this.asType())) &&
+              JavaUtils.isTypeEqual(it.returnType, TypeName.get(String::class.java))
+        }
+      }
+    }
+  } else return null
+}
+
+
+fun Element.isElementAnnotatedAsRelation(): Boolean {
+  return this.getAnnotation(HasMany::class.java) != null ||
+      this.getAnnotation(HasOne::class.java) != null
+}
+
+fun Element.isPersistable(): Boolean = try {
+  this.toTypeName().isSameAs(Integer::class.java) ||
+      this.toTypeName().isSameAs(Long::class.java) ||
+      this.toTypeName().isSameAs(String::class.java) ||
+      this.toTypeName().isSameAs(Float::class.java) ||
+      this.toTypeName().isSameAs(Double::class.java) ||
+      this.toTypeName().isSameAs(Boolean::class.java)
+} catch (e: Throwable) {
+  false
+}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/db/ompiler/Utils.kt b/compiler/src/main/java/promise/database/compiler/utils/Utils.kt
similarity index 57%
rename from compiler/src/main/java/promise/db/ompiler/Utils.kt
rename to compiler/src/main/java/promise/database/compiler/utils/Utils.kt
index 3e7ebf1..43def75 100644
--- a/compiler/src/main/java/promise/db/ompiler/Utils.kt
+++ b/compiler/src/main/java/promise/database/compiler/utils/Utils.kt
@@ -11,9 +11,16 @@
  * limitations under the License.
  */
 
-package promise.db.ompiler
-
+package promise.database.compiler.utils
+
+import com.squareup.javapoet.ClassName
+import com.squareup.javapoet.CodeBlock
+import com.squareup.javapoet.FieldSpec
+import com.squareup.javapoet.JavaFile
+import com.squareup.javapoet.MethodSpec
+import com.squareup.javapoet.ParameterizedTypeName
 import com.squareup.javapoet.TypeName
+import com.squareup.javapoet.TypeSpec
 import java.io.PrintWriter
 import java.io.StringWriter
 import java.net.UnknownHostException
@@ -22,25 +29,18 @@ import javax.annotation.processing.ProcessingEnvironment
 import javax.lang.model.element.AnnotationMirror
 import javax.lang.model.element.AnnotationValue
 import javax.lang.model.element.Element
+import javax.lang.model.element.ExecutableElement
+import javax.lang.model.element.Modifier
 import javax.lang.model.element.TypeElement
 import javax.lang.model.element.VariableElement
-import javax.lang.model.type.DeclaredType
 import javax.lang.model.type.MirroredTypeException
 import javax.lang.model.type.TypeKind
 import javax.lang.model.type.TypeMirror
-import javax.lang.model.util.ElementFilter
 import javax.lang.model.util.Types
-import javax.tools.Diagnostic
 import kotlin.reflect.KClass
 
 
 fun TypeName.isSameAs(javaClass: Class<*>): Boolean {
-  if (this.isPrimitive) this.box()
-  return this.toString() == JavaUtils.wrap(javaClass).name
-}
-
-fun TypeName.isSameAs2(processingEnvironment: ProcessingEnvironment, javaClass: Class<*>): Boolean {
-  processingEnvironment.messager.printMessage(Diagnostic.Kind.OTHER, "comparing \n: elem typeName ${this}, javaClass: ${JavaUtils.wrap(javaClass).name}")
   if (this.isPrimitive) return this.box().toString() == JavaUtils.wrap(javaClass).name
   return this.toString() == JavaUtils.wrap(javaClass).name
 }
@@ -49,7 +49,6 @@ fun Element.toTypeName(): TypeName {
   return TypeName.get(this.asType())
 }
 
-
 fun VariableElement.getClass(): KClass<*> {
   val type = this.asType()
   return when (type.kind) {
@@ -66,13 +65,6 @@ fun VariableElement.getClass(): KClass<*> {
   }
 }
 
-fun getAnnotationMirror(element: Element, annotationClass: Class<out Annotation?>): Optional<out AnnotationMirror?>? {
-  val annotationClassName = annotationClass.name
-  return element.annotationMirrors.stream()
-      .filter { m: AnnotationMirror? -> m!!.annotationType.toString() == annotationClassName }
-      .findFirst()
-}
-
 fun TypeMirror.asTypeElement(processingEnv: ProcessingEnvironment): TypeElement {
   val typeUtils: Types = processingEnv.typeUtils
   return (try {
@@ -82,8 +74,27 @@ fun TypeMirror.asTypeElement(processingEnv: ProcessingEnvironment): TypeElement
   }) as TypeElement
 }
 
+fun TypeMirror.asVariableElement(processingEnv: ProcessingEnvironment): VariableElement? {
+  val typeUtils: Types = processingEnv.typeUtils
+  val typeMirror = typeUtils.erasure(this)
+  if (typeMirror is VariableElement) return typeMirror
+  return null
+}
+
+fun String.getInstanceProviderClassName(): String = "${this}InstanceProvider"
+
 object Utils {
 
+  fun getAnnotationMirror(typeElement: ExecutableElement, clazz: Class<*>): AnnotationMirror? {
+    val clazzName = clazz.name
+    for (m in typeElement.annotationMirrors) {
+      if (m.annotationType.toString() == clazzName) {
+        return m
+      }
+    }
+    return null
+  }
+
   fun getAnnotationMirror(typeElement: TypeElement, clazz: Class<*>): AnnotationMirror? {
     val clazzName = clazz.name
     for (m in typeElement.annotationMirrors) {
@@ -113,71 +124,6 @@ object Utils {
     return null
   }
 
-  fun elementExtendsSuperClass(
-      classElement: TypeElement,
-      superClassCanonicalName: String): Boolean {
-    return classElement.superclass.toString() == superClassCanonicalName
-//    if (typeUtils.isSameType(classElement.superclass, superClass.asType())) return true
-//    //if (classElement.superclass == superClass.asType()) return true
-//    val objectType = processingEnv.elementUtils.getTypeElement("java.lang.Object").asType()
-//    var extends = false
-//    while (classElement.superclass != objectType) {
-//      extends = elementExtendsSuperClass(processingEnv, classElement.superclass.asTypeElement(processingEnv), superClass)
-//      if (extends) break
-//    }
-//    return extends
-
-  }
-
-  fun classImplementsInterface(classElement: TypeElement, interfaceElement: TypeElement): Boolean {
-    for (interfaceType in classElement.interfaces) {
-      if ((interfaceType as DeclaredType).asElement() == interfaceElement) return true
-    }
-    val classMethods: List<Element> = classElement.enclosedElements
-    var implementsMethod: Boolean
-    for (interfaceMethod in ElementFilter.methodsIn(interfaceElement.enclosedElements)) {
-      implementsMethod = false
-      for (classMethod in classMethods) {
-        if (interfaceMethod == classMethod) {
-          implementsMethod = true
-          break
-        }
-      }
-      if (!implementsMethod) {
-        return false
-      }
-    }
-    return false
-  }
-
-  /**
-   * Returns true if a and b are equal, including if they are both null.
-   *
-   * *Note: In platform versions 1.1 and earlier, this method only worked well if
-   * both the arguments were instances of String.*
-   *
-   * @param a first CharSequence to check
-   * @param b second CharSequence to check
-   * @return true if a and b are equal
-   *
-   *
-   * NOTE: Logic slightly change due to strict policy on CI -
-   * "Inner assignments should be avoided"
-   */
-
-
-  fun notEquals(a: CharSequence?, b: CharSequence?): Boolean {
-    if (a === b) return false
-    if (a != null && b != null) {
-      val length = a.length
-      if (length == b.length) return if (a is String && b is String) a != b else {
-        for (i in 0 until length) if (a[i] != b[i]) return true
-        false
-      }
-    }
-    return true
-  }
-
   /**
    * Copied from "android.util.Log.getStackTraceString()" in order to avoid usage of Android stack
    * in unit tests.
@@ -214,4 +160,74 @@ object Utils {
     if (`object` is DoubleArray) return Arrays.toString(`object` as DoubleArray?)
     return if (`object` is Array<*>) Arrays.deepToString(`object` as Array<Any?>?) else "Couldn't find a correct type for the object"
   }
+
+  /**
+   * generates provider for element Typename
+   */
+  fun generateInstanceProviderHolder(
+      /**
+       * Typename for this provider
+       */
+      element: ClassName
+  ): JavaFile.Builder {
+
+    val className = element.simpleName()
+
+    val pack = element.packageName()
+
+    val varName = className.camelCase()
+
+    val fileName = className.getInstanceProviderClassName()
+
+    val classBuilder = TypeSpec.classBuilder(fileName)
+        .addJavadoc("""
+          Class holder for instantiation of TypeConverter
+        """.trimIndent())
+        .addModifiers(Modifier.FINAL, Modifier.PUBLIC)
+        .addSuperinterface(ParameterizedTypeName.get(
+            ClassName.get("promise.commons", "InstanceProvider"),
+            element
+        ))
+        // field instance for the holder
+        .addField(FieldSpec.builder(
+            ClassName.get(pack, fileName),
+            "instance"
+        ).addModifiers(Modifier.PRIVATE, Modifier.STATIC)
+            .build())
+        // holder for type converter
+        .addField(FieldSpec.builder(element, varName,
+            Modifier.FINAL, Modifier.PRIVATE)
+            .addJavadoc("""
+              holder instance for the TypeConverter
+            """.trimIndent())
+            .build())
+        // constructor for the holder
+        .addMethod(MethodSpec.constructorBuilder()
+            .addModifiers(Modifier.PRIVATE)
+            .addParameter(ClassName.get(pack, className), varName)
+            .addStatement("this.$varName = $varName")
+            .build())
+        .addMethod(MethodSpec.methodBuilder("create")
+            .returns(ClassName.get(pack, fileName))
+            .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
+            .addJavadoc("""
+              Creates an instance of the holder with the converter
+            """.trimIndent())
+            .addParameter(
+                ClassName.get(pack, className),
+                varName)
+            .addCode(CodeBlock.builder()
+                .addStatement("if (instance == null) instance = new $fileName($varName)")
+                .addStatement("return instance")
+                .build())
+            .build())
+        .addMethod(MethodSpec.methodBuilder("get")
+            .addAnnotation(Override::class.java)
+            .returns(ClassName.get(pack, className))
+            .addModifiers(Modifier.PUBLIC)
+            .addCode("return $varName;")
+            .build())
+
+    return JavaFile.builder(pack, classBuilder.build())
+  }
 }
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/database/compiler/utils/function/BIConsumer.java b/compiler/src/main/java/promise/database/compiler/utils/function/BIConsumer.java
new file mode 100644
index 0000000..d07a4f8
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/utils/function/BIConsumer.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.utils.function;
+
+public interface BIConsumer<T, U> {
+  void accept(T t, U u);
+}
diff --git a/compiler/src/main/java/promise/database/compiler/utils/function/Combiner.java b/compiler/src/main/java/promise/database/compiler/utils/function/Combiner.java
new file mode 100644
index 0000000..95b4361
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/utils/function/Combiner.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.utils.function;
+
+
+public interface Combiner<K, T> {
+  T join(T t, K k);
+}
diff --git a/compiler/src/main/java/promise/database/compiler/utils/function/FilterFunction.java b/compiler/src/main/java/promise/database/compiler/utils/function/FilterFunction.java
new file mode 100644
index 0000000..1658364
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/utils/function/FilterFunction.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.utils.function;
+
+public interface FilterFunction<T> {
+  boolean select(T t);
+}
diff --git a/compiler/src/main/java/promise/database/compiler/utils/function/FilterFunction2.java b/compiler/src/main/java/promise/database/compiler/utils/function/FilterFunction2.java
new file mode 100644
index 0000000..751c689
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/utils/function/FilterFunction2.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.utils.function;
+
+public interface FilterFunction2<K, T, U> {
+  K filterBy(U u);
+
+  K getKey(T t);
+}
diff --git a/compiler/src/main/java/promise/database/compiler/utils/function/GroupFunction.java b/compiler/src/main/java/promise/database/compiler/utils/function/GroupFunction.java
new file mode 100644
index 0000000..4ebec29
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/utils/function/GroupFunction.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.utils.function;
+
+public interface GroupFunction<K, T> {
+  K getKey(T t);
+}
diff --git a/compiler/src/main/java/promise/database/compiler/utils/function/GroupFunction2.java b/compiler/src/main/java/promise/database/compiler/utils/function/GroupFunction2.java
new file mode 100644
index 0000000..7019d29
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/utils/function/GroupFunction2.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.utils.function;
+
+
+import promise.database.compiler.utils.List;
+
+public interface GroupFunction2<K, E, T> {
+  K getKey(T t);
+
+  E get(K k);
+
+  void apply(E e, List<T> list);
+}
diff --git a/compiler/src/main/java/promise/database/compiler/utils/function/GroupFunction3.java b/compiler/src/main/java/promise/database/compiler/utils/function/GroupFunction3.java
new file mode 100644
index 0000000..e0c950c
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/utils/function/GroupFunction3.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.utils.function;
+
+
+import promise.database.compiler.utils.List;
+
+public interface GroupFunction3<E, T> {
+  List<E> group(List<T> list);
+}
diff --git a/compiler/src/main/java/promise/database/compiler/utils/function/JoinFunction.java b/compiler/src/main/java/promise/database/compiler/utils/function/JoinFunction.java
new file mode 100644
index 0000000..7cbd776
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/utils/function/JoinFunction.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.utils.function;
+
+public interface JoinFunction<T, U> {
+  boolean joinBy(T t, U u);
+}
diff --git a/compiler/src/main/java/promise/database/compiler/utils/function/MapFunction.java b/compiler/src/main/java/promise/database/compiler/utils/function/MapFunction.java
new file mode 100644
index 0000000..419b028
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/utils/function/MapFunction.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.utils.function;
+
+public interface MapFunction<E, T> {
+  E from(T t);
+}
diff --git a/compiler/src/main/java/promise/database/compiler/utils/function/MapIndexFunction.java b/compiler/src/main/java/promise/database/compiler/utils/function/MapIndexFunction.java
new file mode 100644
index 0000000..f972639
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/utils/function/MapIndexFunction.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.utils.function;
+
+public interface MapIndexFunction<E, T> {
+  E from(int index, T t);
+}
diff --git a/compiler/src/main/java/promise/database/compiler/utils/function/ReduceFunction.java b/compiler/src/main/java/promise/database/compiler/utils/function/ReduceFunction.java
new file mode 100644
index 0000000..036bc9c
--- /dev/null
+++ b/compiler/src/main/java/promise/database/compiler/utils/function/ReduceFunction.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.compiler.utils.function;
+
+
+import promise.database.compiler.utils.List;
+
+public interface ReduceFunction<K, T> {
+  K reduce(List<T> list);
+}
diff --git a/compiler/src/main/java/promise/db/ompiler/DatabaseProcessor.kt b/compiler/src/main/java/promise/db/ompiler/DatabaseProcessor.kt
deleted file mode 100644
index 75cf95a..0000000
--- a/compiler/src/main/java/promise/db/ompiler/DatabaseProcessor.kt
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright 2017, Peter Vincent
- * Licensed under the Apache License, Version 2.0, Android Promise.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package promise.db.ompiler
-
-import com.squareup.javapoet.ClassName
-import com.squareup.javapoet.JavaFile
-import com.squareup.javapoet.MethodSpec
-import com.squareup.javapoet.TypeSpec
-import promise.db.DatabaseEntity
-import promise.db.ompiler.annotation.DatabaseAnnotationGenerator
-import javax.annotation.processing.ProcessingEnvironment
-import javax.annotation.processing.RoundEnvironment
-import javax.lang.model.element.Element
-import javax.lang.model.element.ElementKind
-import javax.lang.model.element.Modifier
-import javax.lang.model.element.TypeElement
-import javax.tools.Diagnostic
-
-class DatabaseProcessor(private val processingEnv: ProcessingEnvironment) {
-  fun process(_mutableSet: MutableSet<out TypeElement>?, environment: RoundEnvironment?): Boolean {
-    environment?.getElementsAnnotatedWith(DatabaseEntity::class.java)
-        ?.forEach { element ->
-          if (element.kind != ElementKind.CLASS) {
-            processingEnv.messager.printMessage(Diagnostic.Kind.ERROR, "Only classes can be annotated")
-            return false
-          }
-//          val promiseDatabaseInterface = processingEnv.elementUtils.getTypeElement("promise.db.PromiseDatabase")
-//          if (JavaUtils.implementsInterface(processingEnv, element as TypeElement, promiseDatabaseInterface.asType())) {
-//            processElement(element)
-//          }
-//          else {
-//            processingEnv.messager.printMessage(Diagnostic.Kind.ERROR, "The database class ${element.simpleName} must implement PromiseDatabase")
-//            return false
-//          }
-          processElement(element)
-        }
-    return true
-  }
-
-  private fun processElement(element: Element) {
-    processingEnv.messager.printMessage(Diagnostic.Kind.OTHER, "DatabaseProcessor Processing: ${element.simpleName}")
-
-    val className = element.simpleName.toString()
-    val pack = processingEnv.elementUtils.getPackageOf(element).toString()
-
-    val fileName = "${className}_Impl"
-
-    //fileBuilder.addComment("Generated by Promise database compiler")
-
-    //fileBuilder.addImport(pack, className)
-    val tableAnnotationSpec = DatabaseAnnotationGenerator(processingEnv, element).generate()
-
-    val classBuilder = TypeSpec.classBuilder(fileName)
-    classBuilder.superclass(ClassName.get(pack, className))
-        .addAnnotation(tableAnnotationSpec)
-        .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
-        .addMethod(MethodSpec.constructorBuilder()
-            .addParameter(ClassName.get("promise.db", "FastDatabase"),"instance")
-            .addModifiers(Modifier.PRIVATE)
-            .addStatement("super()")
-            .addStatement("this.instance = instance")
-            .build())
-    DatabaseCompanionPropsGenerator(classBuilder, element, processingEnv).generate()
-
-    val abstractFuncsBuilder = DatabaseAbstractFuncsGenerator((element as TypeElement), processingEnv)
-
-    abstractFuncsBuilder.generate()?.forEach {
-      classBuilder.addMethod(it)
-    }
-
-    DatabaseCrudStubsGenerator(classBuilder, element, processingEnv).generate()
-
-//    // static column block generation
-//    val columnsGenerator: ColumnsGenerator = ColumnsGenerator(fileBuilder, processingEnv, element.enclosedElements)
-//    val companionBuilder = TypeSpec.companionObjectBuilder()
-//
-//    val idColumnSpec = PropertySpec.builder("idColumn", ClassName("promise.db", "Column")
-//        .parameterizedBy(Int::class.asTypeName()))
-//        .initializer(CodeBlock.of("""
-//                id
-//              """.trimIndent())
-//        )
-//        .build()
-//
-//    companionBuilder.addProperty(idColumnSpec)
-//
-//    val columnSpecs = columnsGenerator.generate()
-//
-//    columnSpecs.values.forEach {
-//      companionBuilder.addProperty(it)
-//    }
-//
-//    classBuilder.addType(companionBuilder.build())
-//
-//    // column register generation
-//    val columnRegSpecGenerator = RegisterColumnsGenerator(fileBuilder, columnsGenerator.genColValues.map { it.second })
-//    classBuilder.addProperty(columnRegSpecGenerator.generate())
-//
-//    // serializer generator
-//    val serializerGenerator = SerializerGenerator(fileBuilder, pack, className, columnsGenerator.genColValues)
-//    classBuilder.addFunction(serializerGenerator.generate())
-//
-//    // deserializer generator
-//    val deserializerGenerator = DeserializerGenerator(fileBuilder, processingEnv,
-//        pack, className, columnsGenerator.genColValues)
-//    classBuilder.addFunction(deserializerGenerator.generate())
-//
-//    // migrations
-//    val elemMap = HashMap<Element, String>()
-//    columnSpecs.forEach {
-//      elemMap[it.key.first] = it.key.second
-//    }
-//    val migrationGenerator = MigrationGenerator(fileBuilder, elemMap)
-//    val migrationFunc = migrationGenerator.generate()
-//    if (migrationFunc != null) classBuilder.addFunction(migrationFunc)
-
-    val fileBuilder = JavaFile.builder(pack, classBuilder.build())
-    val file = fileBuilder
-        .indent("    ")
-        .skipJavaLangImports(true)
-        .addFileComment(
-            """
-            Copyright 2017, Android Promise Database
-            Licensed under the Apache License, Version 2.0, Android Promise.
-            you may not use this file except in compliance with the License.
-            You may obtain a copy of the License at
-            http://www.apache.org/licenses/LICENSE-2.0
-            Unless required by applicable law or agreed to in writing,
-            software distributed under the License is distributed on an AS IS BASIS,
-            WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied
-            See the License for the specific language governing permissions and
-            limitations under the License
-            """.trimIndent()
-            )
-        .build()
-    //val kaptKotlinGeneratedDir = processingEnv.options[EntityProcessor.KAPT_JAVA_GENERATED_OPTION_NAME]!!
-    file.writeTo(processingEnv.filer)
-  }
-}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/db/ompiler/DeserializerGenerator.kt b/compiler/src/main/java/promise/db/ompiler/DeserializerGenerator.kt
deleted file mode 100644
index 5c555ca..0000000
--- a/compiler/src/main/java/promise/db/ompiler/DeserializerGenerator.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2017, Peter Vincent
- * Licensed under the Apache License, Version 2.0, Android Promise.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package promise.db.ompiler
-
-import com.squareup.javapoet.ClassName
-import com.squareup.javapoet.CodeBlock
-import com.squareup.javapoet.MethodSpec
-import com.squareup.javapoet.TypeName
-import javax.lang.model.element.Modifier
-
-class DeserializerGenerator(
-    private val typeDataTypePack: String,
-    private val typeDataType: String,
-    private val columns: List<Pair<Pair<String, TypeName>, String>>) : CodeBlockGenerator<MethodSpec> {
-
-  init {
-    //fileSpec.addImport(ClassName("android.database", "Cursor"))
-  }
-
-  override fun generate(): MethodSpec {
-    val varName = typeDataType.camelCase()
-    var stmt = """
-      try {
-        $typeDataType $varName = new $typeDataType();   
-
-    """.trimIndent()
-    columns.forEach {
-      stmt += generateSetStatement(
-          varName,
-          it.first.first, it.first.second, it.second)
-    }
-    stmt += """
-      return $varName;      
-    } catch(android.database.CursorIndexOutOfBoundsException ex) {
-      promise.commons.data.log.LogUtil.e(TAG, "deserialize", ex);
-      return new $typeDataType();
-    }
-    """.trimIndent()
-
-    //fileSpec.addImport("android.database", "CursorIndexOutOfBoundsException")
-
-    return MethodSpec.methodBuilder("deserialize")
-        .addParameter(ClassName.get("android.database", "Cursor"), "e")
-        .addAnnotation(Override::class.java)
-        .addModifiers(Modifier.PUBLIC)
-        .returns(ClassName.get(typeDataTypePack, typeDataType))
-        .addCode(CodeBlock.of(stmt))
-        .build()
-  }
-
-  /**
-   * person.setAge(cursor.getInt(ageColumn.getIndex(cursor)));
-   */
-  private fun generateSetStatement(
-      objectName: String,
-      varName: String,
-      varType: TypeName,
-      colName: String): String {
-    if (varType.isSameAs(Boolean::class.java)) {
-      return "  $objectName.set${varName.capitalizeFirst()}(e.${getCursorReturn(varType)}(${colName}.getIndex(e)) == 1);\n"
-    }
-    return "  $objectName.set${varName.capitalizeFirst()}(e.${getCursorReturn(varType)}(${colName}.getIndex(e)));\n"
-  }
-
-  private fun getCursorReturn(varType: TypeName): String =//processingEnvironment.messager.printMessage(Diagnostic.Kind.ERROR, "type ${varType.toString()}")
-      when {
-        varType.isSameAs(Integer::class.java) -> "getInt"
-        varType.isSameAs(Boolean::class.java) -> "getInt"
-        varType.isSameAs(Double::class.java) -> "getDouble"
-        varType.isSameAs(Float::class.java) -> "getFloat"
-        else -> "getString"
-      }
-}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/db/ompiler/EntityProcessor.kt b/compiler/src/main/java/promise/db/ompiler/EntityProcessor.kt
deleted file mode 100644
index f1a08f4..0000000
--- a/compiler/src/main/java/promise/db/ompiler/EntityProcessor.kt
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright 2017, Peter Vincent
- * Licensed under the Apache License, Version 2.0, Android Promise.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package promise.db.ompiler
-
-import com.google.auto.service.AutoService
-import com.squareup.javapoet.AnnotationSpec
-import com.squareup.javapoet.ClassName
-import com.squareup.javapoet.CodeBlock
-import com.squareup.javapoet.FieldSpec
-import com.squareup.javapoet.JavaFile
-import com.squareup.javapoet.MethodSpec
-import com.squareup.javapoet.ParameterizedTypeName
-import com.squareup.javapoet.TypeSpec
-import net.ltgt.gradle.incap.IncrementalAnnotationProcessor
-import net.ltgt.gradle.incap.IncrementalAnnotationProcessorType
-import org.jetbrains.annotations.NotNull
-import promise.db.DatabaseEntity
-import promise.db.Entity
-import promise.db.ompiler.annotation.TableAnnotationGenerator
-import promise.db.ompiler.migration.MigrationGenerator
-import java.util.*
-import javax.annotation.processing.AbstractProcessor
-import javax.annotation.processing.ProcessingEnvironment
-import javax.annotation.processing.Processor
-import javax.annotation.processing.RoundEnvironment
-import javax.annotation.processing.SupportedOptions
-import javax.annotation.processing.SupportedSourceVersion
-import javax.lang.model.SourceVersion
-import javax.lang.model.element.Element
-import javax.lang.model.element.ElementKind
-import javax.lang.model.element.Modifier
-import javax.lang.model.element.TypeElement
-import javax.tools.Diagnostic
-
-
-@AutoService(Processor::class) // For registering the service
-@IncrementalAnnotationProcessor(IncrementalAnnotationProcessorType.DYNAMIC)
-@SupportedSourceVersion(SourceVersion.RELEASE_7) // to support Java 8
-@SupportedOptions(EntityProcessor.KAPT_JAVA_GENERATED_OPTION_NAME)
-class EntityProcessor : AbstractProcessor() {
-
-  override fun init(processingEnv: ProcessingEnvironment?) {
-    super.init(processingEnv)
-  }
-
-  override fun process(mutableSet: MutableSet<out TypeElement>?, environment: RoundEnvironment?): Boolean {
-    try {
-      environment?.getElementsAnnotatedWith(Entity::class.java)
-          ?.forEach { element ->
-            if (element.kind != ElementKind.CLASS) {
-              processingEnv.messager.printMessage(Diagnostic.Kind.ERROR, "Only classes can be annotated")
-              return false
-            }
-
-//            val identifiableInterface = processingEnv.elementUtils.getTypeElement("promise.commons.model.Identifiable")
-//            processingEnv.messager.printMessage(Diagnostic.Kind.NOTE, "Entity class ${element.simpleName}, interfaceType ${identifiableInterface.toString()}")
-//            if (JavaUtils.implementsInterface(processingEnv, element as TypeElement, identifiableInterface.asType())) {
-//              processAnnotation(element)
-//            }
-             processAnnotation(element)
-//            else {
-//              processingEnv.messager.printMessage(Diagnostic.Kind.ERROR, "The Entity class ${element.simpleName} must implement Identifiable")
-//              return false
-//            }
-          }
-      //return true
-      return DatabaseProcessor(processingEnv).process(mutableSet, environment)
-    } catch (e: Throwable) {
-      processingEnv.messager.printMessage(Diagnostic.Kind.ERROR,
-          //"EntityProcessor: ${Utils.getStackTraceString(e)} " +
-              "EntityProcessor Trace: ${Arrays.toString(e.stackTrace)}")
-      return false
-    }
-  }
-
-  private fun processAnnotation(element: Element) {
-    processingEnv.messager.printMessage(Diagnostic.Kind.OTHER, "Entity Processing: ${element.simpleName}")
-
-    val className = element.simpleName.toString()
-    val pack = processingEnv.elementUtils.getPackageOf(element).toString()
-
-    val fileName = element.getClassName()
-
-    val tableAnnotationSpec = TableAnnotationGenerator(element, processingEnv).generate()
-
-    val classBuilder = TypeSpec.classBuilder(fileName)
-        .addModifiers(Modifier.PUBLIC)
-        .superclass(ParameterizedTypeName.get(
-            ClassName.get("promise.db", "FastTable"),
-            ClassName.get(pack, className))
-        )
-        .addMethod(MethodSpec.constructorBuilder()
-            .addModifiers(Modifier.PUBLIC)
-            .addParameter(
-                ClassName.get("promise.db", "FastDatabase")
-                    .annotated(AnnotationSpec.builder(NotNull::class.java).build()),
-                "database")
-            .addStatement("super(database)")
-            .build())
-
-    classBuilder.addAnnotation(tableAnnotationSpec)
-
-    if (Utils.elementExtendsSuperClass((element as TypeElement), "promise.db.ActiveRecord"))
-      classBuilder.addMethod(MethodSpec.methodBuilder("createEntityInstance")
-        .addAnnotation(Override::class.java)
-        .addAnnotation(NotNull::class.java)
-        .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
-        .returns(ClassName.get(pack, className))
-        .addCode("return new $className();")
-        .build())
-
-    // static column block generation
-    val tableColumnPropsGenerator = TableColumnPropsGenerator(classBuilder, processingEnv, element.enclosedElements)
-
-    val idColumnSpec = FieldSpec.builder(
-        ParameterizedTypeName.get(
-            ClassName.get("promise.db", "Column"),
-            ClassName.get(Integer::class.java)
-        ), "idColumn")
-        .addModifiers(Modifier.STATIC, Modifier.PUBLIC, Modifier.FINAL)
-        .initializer(CodeBlock.of("FastTable.getId()")).build()
-
-    classBuilder.addField(idColumnSpec)
-    /**
-     * private static final String TAG = LogUtil.makeTag(PersonFastTable.class);
-     */
-    val tagSpec = FieldSpec.builder(
-        String::class.java, "TAG")
-        .addModifiers(Modifier.STATIC, Modifier.PRIVATE, Modifier.FINAL)
-        .initializer("promise.commons.data.log.LogUtil.makeTag(${element.getClassName()}.class)")
-        .build()
-
-    classBuilder.addField(tagSpec)
-
-    val columnSpecs = tableColumnPropsGenerator.generate()
-
-    columnSpecs.values.forEach {
-      classBuilder.addField(it)
-    }
-
-    // column register generation
-    val columnRegSpecGenerator = RegisterColumnsGenerator(tableColumnPropsGenerator.genColValues.map { it.second })
-    classBuilder.addMethod(columnRegSpecGenerator.generate())
-
-    // serializer generator
-    val serializerGenerator = SerializerGenerator(pack, className, tableColumnPropsGenerator.genColValues)
-    classBuilder.addMethod(serializerGenerator.generate())
-
-    // deserializer generator
-    val deserializerGenerator = DeserializerGenerator(pack, className,
-        tableColumnPropsGenerator.genColValues)
-    classBuilder.addMethod(deserializerGenerator.generate())
-
-    // migrations
-    val elemMap = HashMap<Element, String>()
-    columnSpecs.forEach {
-      elemMap[it.key.first] = it.key.second
-    }
-    val migrationGenerator = MigrationGenerator(elemMap)
-    val migrationFunc = migrationGenerator.generate()
-    if (migrationFunc != null) classBuilder.addMethod(migrationFunc)
-
-    val fileBuilder = JavaFile.builder(pack, classBuilder.build())
-    //val kaptKotlinGeneratedDir = processingEnv.options[KAPT_JAVA_GENERATED_OPTION_NAME]!!
-
-    fileBuilder
-        .indent("    ")
-        .skipJavaLangImports(true)
-        .addFileComment(
-            """
-            Copyright 2017, Android Promise Database
-            Licensed under the Apache License, Version 2.0, Android Promise.
-            you may not use this file except in compliance with the License.
-            You may obtain a copy of the License at
-            http://www.apache.org/licenses/LICENSE-2.0
-            Unless required by applicable law or agreed to in writing,
-            software distributed under the License is distributed on an AS IS BASIS,
-            WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied
-            See the License for the specific language governing permissions and
-            limitations under the License
-            """.trimIndent()
-            )
-        .build()
-        .writeTo(processingEnv.filer)
-  }
-
-  override fun getSupportedAnnotationTypes(): MutableSet<String> = mutableSetOf(
-      Entity::class.java.name,
-      DatabaseEntity::class.java.name
-  )
-
-  companion object {
-    const val KAPT_JAVA_GENERATED_OPTION_NAME = "kapt.java.generated"
-  }
-
-}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/db/ompiler/JavaUtils.java b/compiler/src/main/java/promise/db/ompiler/JavaUtils.java
deleted file mode 100644
index ad97721..0000000
--- a/compiler/src/main/java/promise/db/ompiler/JavaUtils.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2017, Peter Vincent
- * Licensed under the Apache License, Version 2.0, Android Promise.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package promise.db.ompiler;
-
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.CodeBlock;
-import com.squareup.javapoet.TypeName;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.TypeMirror;
-
-public class JavaUtils {
-  private static final Map<Class<?>, Class<?>> PRIMITIVES_TO_WRAPPERS
-      = new HashMap<Class<?>, Class<?>>() {{
-    put(boolean.class, Boolean.class);
-    put(byte.class, Byte.class);
-    put(char.class, Character.class);
-    put(double.class, Double.class);
-    put(float.class, Float.class);
-    put(int.class, Integer.class);
-    put(long.class, Long.class);
-    put(short.class, Short.class);
-    put(void.class, Void.class);
-  }};
-
-  public static void generateIfStatementObtainClassString(
-      ProcessingEnvironment processingEnv,
-      CodeBlock.Builder codeBlock,
-      TypeElement entity) {
-    String pack = processingEnv.getElementUtils().getPackageOf(entity).toString();
-    codeBlock.addStatement("if (entityClass == $T.class) return getDatabaseInstance().obtain($T.class)",
-        ClassName.get(pack, entity.getSimpleName().toString()),
-        ClassName.get(pack, PersistableEntityUtilsKt.getClassName(entity)));
-  }
-
-  // safe because both Long.class and long.class are of type Class<Long>
-  @SuppressWarnings("unchecked")
-  public static <T> Class<T> wrap(Class<T> c) {
-    return c.isPrimitive() ? (Class<T>) PRIMITIVES_TO_WRAPPERS.get(c) : c;
-  }
-
-  public static boolean implementsInterface(
-      ProcessingEnvironment processingEnv,
-      TypeElement myTypeElement,
-      TypeMirror desiredInterface) {
-    boolean found = false;
-    while (myTypeElement.getSuperclass()
-        != processingEnv.getElementUtils().getTypeElement("java.lang.Object").asType()
-        &&   !found) {
-      for (TypeMirror t : myTypeElement.getInterfaces()) {
-        if (processingEnv.getTypeUtils().isAssignable(t, desiredInterface)){
-          found = true;
-          break;
-        }
-        else {
-          TypeElement elem = (TypeElement) processingEnv.getTypeUtils().asElement(t);
-          return implementsInterface(processingEnv, elem, desiredInterface);
-        }
-      }
-    }
-
-    return found;
-  }
-
-  public static boolean extendsClass(
-      TypeElement myTypeElement,
-      TypeMirror desiredInterface) {
-    return myTypeElement.getSuperclass().toString().equals(desiredInterface.toString());
-
-  }
-}
diff --git a/compiler/src/main/java/promise/db/ompiler/SerializerGenerator.kt b/compiler/src/main/java/promise/db/ompiler/SerializerGenerator.kt
deleted file mode 100644
index abe6046..0000000
--- a/compiler/src/main/java/promise/db/ompiler/SerializerGenerator.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2017, Peter Vincent
- * Licensed under the Apache License, Version 2.0, Android Promise.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package promise.db.ompiler
-
-import com.squareup.javapoet.ClassName
-import com.squareup.javapoet.CodeBlock
-import com.squareup.javapoet.MethodSpec
-import com.squareup.javapoet.TypeName
-import javax.lang.model.element.Modifier
-
-
-class SerializerGenerator(
-    private val typeDataTypePack: String,
-    private val typeDataType: String,
-    private val columns: List<Pair<Pair<String, TypeName>, String>>) : CodeBlockGenerator<MethodSpec> {
-  init {
-   // fileSpec.addImport("android.content", "ContentValues")
-  }
-
-  override fun generate(): MethodSpec {
-
-    var stmt =
-        "ContentValues values = new ContentValues();\n"
-    columns.forEach {
-      stmt += generatePutStatement(it.first.first, it.second, it.first.second)
-    }
-
-    stmt += """
-      return values;
-  
-    """.trimIndent()
-
-    return MethodSpec.methodBuilder("serialize")
-        .addModifiers(Modifier.PUBLIC)
-        .addParameter(ClassName.get(typeDataTypePack, typeDataType),"t")
-        .addAnnotation(Override::class.java)
-        .returns(ClassName.get("android.content", "ContentValues"))
-        .addCode(CodeBlock.of(stmt))
-        .build()
-  }
-
-  /**
-   * values.put(nameColumn.getName(), t.getName());
-   * values.put(isAdultColumn.getName(), person.isAdult() ? 1 : 0);
-   */
-  private fun generatePutStatement(typeVariable: String, columnName: String, varTypeName: TypeName): String {
-    if (varTypeName.isSameAs(Boolean::class.java)) {
-      return "values.put(${columnName}.getName(), t.is${typeVariable.capitalizeFirst()}() ? 1 : 0); \n"
-    }
-    return "values.put(${columnName}.getName(), t.get${typeVariable.capitalizeFirst()}()); \n"
-  }
-
-
-}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/db/ompiler/TableColumnPropsGenerator.kt b/compiler/src/main/java/promise/db/ompiler/TableColumnPropsGenerator.kt
deleted file mode 100644
index fdace1c..0000000
--- a/compiler/src/main/java/promise/db/ompiler/TableColumnPropsGenerator.kt
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright 2017, Peter Vincent
- * Licensed under the Apache License, Version 2.0, Android Promise.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package promise.db.ompiler
-
-import com.squareup.javapoet.ClassName
-import com.squareup.javapoet.CodeBlock
-import com.squareup.javapoet.FieldSpec
-import com.squareup.javapoet.ParameterizedTypeName
-import com.squareup.javapoet.TypeName
-import com.squareup.javapoet.TypeSpec
-import promise.db.Ignore
-import promise.db.PrimaryKey
-import promise.db.PrimaryKeyAutoIncrement
-import java.util.*
-import javax.annotation.processing.ProcessingEnvironment
-import javax.lang.model.element.Element
-import javax.lang.model.element.Modifier
-import javax.tools.Diagnostic
-import kotlin.collections.ArrayList
-import kotlin.collections.HashMap
-
-class TableColumnPropsGenerator(
-                                private val classBuilder: TypeSpec.Builder,
-                                private val processingEnvironment: ProcessingEnvironment
-                                ,
-                                private val setElements: List<Element>) : CodeBlockGenerator<Map<Pair<Element, String>, FieldSpec>> {
-
-  var genColValues: ArrayList<Pair<Pair<String, TypeName>, String>> = ArrayList()
-
-  init {
-    //fileSpec.addImport("promise.db", "Column")
-  }
-
-  override fun generate(): Map<Pair<Element, String>, FieldSpec> {
-    val map = HashMap<Pair<Element, String>, FieldSpec>()
-    filterPrimitiveElements(setElements.filter {
-      it.kind.isField
-    }).forEachIndexed { i, element ->
-      if (element.getAnnotation(PrimaryKeyAutoIncrement::class.java) != null ||
-          element.getAnnotation(Ignore::class.java) != null) return@forEachIndexed
-      val nameOfColumn = element.getNameOfColumn()
-      if (nameOfColumn == "id") return@forEachIndexed
-
-      val colVariableName = "${element.simpleName}Column"
-      var variableClassType = element.toTypeName()
-      if (variableClassType.isPrimitive) variableClassType = variableClassType.box()
-      //processingEnvironment.messager.printMessage(Diagnostic.Kind.OTHER, "gen column : ${element.simpleName} type: $variableClassType")
-
-      val parameterizedColumnTypeName = ParameterizedTypeName.get(ClassName.get("promise.db", "Column"), variableClassType)
-
-      val columnInitializer = getColumnInitializer(element, variableClassType)
-
-
-      val spec = FieldSpec.builder(parameterizedColumnTypeName, colVariableName)
-          .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-          .initializer(CodeBlock.of("""
-              new Column<${variableClassType}>("$nameOfColumn", $columnInitializer, ${i + 1})
-            """.trimIndent())
-          )
-          .build()
-      map[Pair(element, colVariableName)] = spec
-      val pair: Pair<Pair<String, TypeName>, String> = Pair(Pair(element.simpleName.toString(), variableClassType), colVariableName)
-      genColValues.add(pair)
-    }
-
-    return map
-  }
-
-  private fun getColumnInitializer(element: Element, classTypeName: TypeName): String {
-    var str = "Column.Type"
-    if (classTypeName.isSameAs(Integer::class.java) ||
-        classTypeName.isSameAs(Integer::class.java) ||
-        classTypeName.isSameAs(Float::class.java) ||
-        classTypeName.isSameAs(Double::class.java) ||
-       classTypeName.isSameAs(Boolean::class.java)) {
-      str += ".INTEGER"
-      if (element.getAnnotation(PrimaryKey::class.java) != null) {
-        str += ".PRIMARY_KEY()"
-      } else if (element.getAnnotation(promise.db.Number::class.java) != null) {
-        val annotation = element.getAnnotation(promise.db.Number::class.java)
-        if (annotation.default != 0) {
-          str += ".DEFAULT(${annotation.default})"
-        } else {
-          if (annotation.nullable) {
-            str += ".NULLABLE()"
-          } else if (!annotation.nullable) {
-            str += ".NON_NULL()"
-          }
-        }
-      } else {
-        str += ".NULLABLE()"
-      }
-    } else if (classTypeName.isSameAs(String::class.java)) {
-      if (element.getAnnotation(promise.db.VarChar::class.java) != null) {
-        str += ".VARCHAR"
-        val annotation = element.getAnnotation(promise.db.VarChar::class.java)
-        str += if (annotation.unique && annotation.length != 0) {
-          ".UNIQUE(${annotation.length})"
-        } else if (annotation.nullable && annotation.length != 0) {
-          ".NULLABLE(${annotation.length})"
-        } else if (!annotation.nullable && annotation.length != 0) {
-          ".NOT_NULL(${annotation.length})"
-        } else {
-          throw IllegalStateException("element ${element.simpleName} is annotated as varchar without length")
-        }
-      } else {
-        if (element.getAnnotation(promise.db.Text::class.java) != null) {
-          str += ".TEXT"
-          val annotation = element.getAnnotation(promise.db.Text::class.java)
-          str += if (annotation.nullable) {
-            ".NULLABLE()"
-          } else if (!annotation.nullable) {
-            ".NOT_NULL()"
-          } else {
-            throw IllegalStateException("element ${element.simpleName} is annotated as varchar without length")
-          }
-        } else {
-          str += ".TEXT.NULLABLE()"
-        }
-      }
-    }
-    return str
-  }
-
-  private fun filterPrimitiveElements(elements: List<Element>): List<Element> = elements.filter {
-
-    try {
-      it.toTypeName().isSameAs2(processingEnvironment, Integer::class.java) ||
-          it.toTypeName().isSameAs2(processingEnvironment, String::class.java) ||
-          it.toTypeName().isSameAs2(processingEnvironment, Float::class.java) ||
-          it.toTypeName().isSameAs2(processingEnvironment, Double::class.java) ||
-          it.toTypeName().isSameAs2(processingEnvironment, Boolean::class.java)
-    } catch (e: Throwable) {
-      processingEnvironment.messager.printMessage(Diagnostic.Kind.ERROR,
-          "FilterPrimitiveElement ${it.kind.name}: ${Arrays.toString(e.stackTrace)}")
-      false
-    }
-  }
-}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/db/ompiler/migration/MigrationGenerator.kt b/compiler/src/main/java/promise/db/ompiler/migration/MigrationGenerator.kt
deleted file mode 100644
index a082e25..0000000
--- a/compiler/src/main/java/promise/db/ompiler/migration/MigrationGenerator.kt
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2017, Peter Vincent
- * Licensed under the Apache License, Version 2.0, Android Promise.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package promise.db.ompiler.migration
-
-import com.squareup.javapoet.AnnotationSpec
-import com.squareup.javapoet.ClassName
-import com.squareup.javapoet.CodeBlock
-import com.squareup.javapoet.MethodSpec
-import org.jetbrains.annotations.NotNull
-import promise.db.Migrate
-import promise.db.MigrationOptions
-import promise.db.Migrations
-import promise.db.ompiler.CodeBlockGenerator
-import promise.db.ompiler.getNameOfColumn
-import javax.lang.model.element.Element
-import javax.lang.model.element.Modifier
-
-class MigrationGenerator(
-    private val elements: Map<Element, String>) : CodeBlockGenerator<MethodSpec?> {
-  init {
-    //fileSpec.addImport("android.content", "ContentValues")
-  }
-
-  /**
-   * @Override
-  public void onUpgrade(@NotNull SQLiteDatabase x, int v1, int v2) throws TableError {
-  super.onUpgrade(x, v1, v2);
-  if (v1 == 3 && v2 == 4) {
-  dropColumns(x, ageColumn);
-  }
-  if (v1 == 4 && v2 == 5) {
-  addColumns(x, marksColumn);
-  }
-  if (v1 == 7 && v2 == 8) {
-  dropColumns(x, marksColumn);
-  }
-  }
-   */
-  private fun buildIndexMigration(
-      codeBlock: CodeBlock.Builder,
-      column: String,
-      migration: Migrate) {
-    if (migration.action == MigrationOptions.CREATE_INDEX) {
-      codeBlock.add("if (v1 == ${migration.fromVersion} && v2 == ${migration.toVersion}) {\n")
-      codeBlock.indent()
-      codeBlock.addStatement("addIndex(x, \"${column}\")")
-      codeBlock.unindent()
-      codeBlock.add("}\n")
-    }
-  }
-  private fun buildMigration(
-      codeBlock: CodeBlock.Builder,
-      column: String,
-      migration: Migrate) {
-    if (migration.action == MigrationOptions.CREATE) {
-      codeBlock.add("if (v1 == ${migration.fromVersion} && v2 == ${migration.toVersion}) {\n")
-      codeBlock.indent()
-      codeBlock.addStatement("addColumns(x, ${column})")
-      codeBlock.unindent()
-      codeBlock.add("}\n")
-    } else if (migration.action == MigrationOptions.DROP) {
-      codeBlock.add("if (v1 == ${migration.fromVersion} && v2 == ${migration.toVersion}) {\n")
-      codeBlock.indent()
-      codeBlock.addStatement("dropColumns(x, ${column})")
-      codeBlock.unindent()
-      codeBlock.add("}\n")
-    }
-  }
-
-  override fun generate(): MethodSpec? {
-    val migrateFields = elements.filter {
-      it.key.getAnnotation(Migrate::class.java) != null ||
-          it.key.getAnnotation(Migrations::class.java) != null
-    }
-    if (migrateFields.isEmpty()) return null
-    val codeBlock = CodeBlock.builder()
-        .addStatement("super.onUpgrade(x, v1, v2)")
-
-    migrateFields.forEach {
-      val migration = it.key.getAnnotation(Migrate::class.java)
-      if (migration != null) {
-        if (migration.action == MigrationOptions.CREATE_INDEX)
-          buildIndexMigration(codeBlock, it.key.getNameOfColumn(), migration)
-        else buildMigration(codeBlock, it.value, migration)
-        return@forEach
-      }
-      val migrations = it.key.getAnnotation(Migrations::class.java)
-      migrations?.values?.forEach { m ->
-        buildMigration(codeBlock, it.value, m)
-      }
-    }
-
-    return MethodSpec.methodBuilder("onUpgrade")
-        .addParameter(
-            ClassName.get("android.database.sqlite", "SQLiteDatabase")
-                .annotated(AnnotationSpec.builder(NotNull::class.java).build()),
-            "x")
-        .addParameter(Integer::class.javaPrimitiveType, "v1")
-        .addParameter(Integer::class.javaPrimitiveType, "v2")
-        .addAnnotation(Override::class.java)
-        .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
-        .addException(ClassName.get("promise.db", "TableError"))
-        .addCode(codeBlock.build())
-        .build()
-  }
-
-}
\ No newline at end of file
diff --git a/compiler/src/main/java/promise/db/ompiler/relations/RelationsGenerator.kt b/compiler/src/main/java/promise/db/ompiler/relations/RelationsGenerator.kt
deleted file mode 100644
index 7ba879d..0000000
--- a/compiler/src/main/java/promise/db/ompiler/relations/RelationsGenerator.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2017, Peter Vincent
- * Licensed under the Apache License, Version 2.0, Android Promise.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package promise.db.ompiler.relations
-
-import com.squareup.javapoet.MethodSpec
-import promise.db.HasMany
-import promise.db.HasOne
-import promise.db.ompiler.CodeBlockGenerator
-import java.util.*
-import javax.annotation.processing.ProcessingEnvironment
-import javax.lang.model.element.Element
-import javax.tools.Diagnostic
-import kotlin.collections.ArrayList
-
-class RelationsGenerator(
-    private val processingEnvironment: ProcessingEnvironment
-    ,
-    private val setElements: List<Element>
-) : CodeBlockGenerator<List<MethodSpec>?> {
-
-  override fun generate(): List<MethodSpec>? {
-    val funSpecs = ArrayList<MethodSpec>()
-    filterNotPrimitiveElements(setElements.filter {
-      it.kind.isField
-    }).also {
-      if (it.isEmpty()) return null
-    }.forEach {
-
-    }
-    return funSpecs
-  }
-
-  private fun getNameOfColumn(element: Element): String {
-    return element.simpleName.toString()
-  }
-
-  private fun filterNotPrimitiveElements(elements: List<Element>): List<Element> = elements.filter {
-    try {
-      it.getAnnotation(HasOne::class.java) != null ||
-          it.getAnnotation(HasMany::class.java) != null
-    } catch (e: Throwable) {
-      processingEnvironment.messager.printMessage(Diagnostic.Kind.ERROR,
-          "FilterPrimitiveElement ${it.kind.name}: ${Arrays.toString(e.stackTrace)}")
-      true
-    }
-  }
-}
\ No newline at end of file
diff --git a/compiler/src/test/java/promise/database/ompiler/ExampleUnitTest.kt b/compiler/src/test/java/promise/database/ompiler/ExampleUnitTest.kt
new file mode 100644
index 0000000..71f39da
--- /dev/null
+++ b/compiler/src/test/java/promise/database/ompiler/ExampleUnitTest.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.ompiler
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+  @Test
+  fun addition_isCorrect() {
+    assertEquals(4, 2 + 2)
+  }
+}
diff --git a/compiler/src/test/java/promise/database/ompiler/PersistableEntityUtilsKtTest.kt b/compiler/src/test/java/promise/database/ompiler/PersistableEntityUtilsKtTest.kt
new file mode 100644
index 0000000..161d166
--- /dev/null
+++ b/compiler/src/test/java/promise/database/ompiler/PersistableEntityUtilsKtTest.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.database.ompiler
+
+import org.junit.After
+import org.junit.Before
+
+class PersistableEntityUtilsKtTest {
+
+  @Before
+  fun setUp() {
+  }
+
+  @After
+  fun tearDown() {
+  }
+}
\ No newline at end of file
diff --git a/database/build.gradle b/database/build.gradle
index cfb8e80..6b766f2 100644
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -13,7 +13,6 @@
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
@@ -25,13 +24,12 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
     }
 
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 
@@ -42,40 +40,19 @@ android {
 }
 
 dependencies {
+    //api 'com.github.android-promise.database:commons:1.0.3-alpha7'
     api project(path: ':commons')
+    api 'androidx.sqlite:sqlite:2.1.0'
+    implementation 'androidx.sqlite:sqlite-framework:2.1.0'
     compileOnly 'io.reactivex.rxjava2:rxjava:2.2.17'
-    compileOnly 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.3.2'
     compileOnly 'com.github.android-promise:commons:1.1-beta02'
     testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {
     mavenCentral()
 }
 
-task sourcesJar(type: Jar) {
-    classifier = 'sources'
-    from android.sourceSets.main.java.sourceFiles
-}
-
-task javadoc(type: Javadoc) {
-    source = android.sourceSets.main.java.sourceFiles
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-task classesJar(type: Jar) {
-    from "$buildDir/intermediates/classes/release"
-}
-
-artifacts {
-    archives classesJar
-    archives javadocJar
-    archives sourcesJar
-}
diff --git a/database/src/androidTest/java/promise/db/ExampleInstrumentedTest.java b/database/src/androidTest/java/promise/database/ExampleInstrumentedTest.java
similarity index 94%
rename from database/src/androidTest/java/promise/db/ExampleInstrumentedTest.java
rename to database/src/androidTest/java/promise/database/ExampleInstrumentedTest.java
index a964d55..3a3bd23 100644
--- a/database/src/androidTest/java/promise/db/ExampleInstrumentedTest.java
+++ b/database/src/androidTest/java/promise/database/ExampleInstrumentedTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package promise.db;
+package promise.database;
 
 import android.content.Context;
 
@@ -21,7 +21,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Instrumented test, which will execute on an Android device.
diff --git a/database/src/main/AndroidManifest.xml b/database/src/main/AndroidManifest.xml
index 2f2a28c..77b81d9 100644
--- a/database/src/main/AndroidManifest.xml
+++ b/database/src/main/AndroidManifest.xml
@@ -11,5 +11,4 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="promise.db" />
+<manifest package="promise.database" />
diff --git a/database/src/main/java/promise/db/ActiveRecord.kt b/database/src/main/java/promise/db/ActiveRecord.kt
index f028d40..79ec070 100644
--- a/database/src/main/java/promise/db/ActiveRecord.kt
+++ b/database/src/main/java/promise/db/ActiveRecord.kt
@@ -17,53 +17,32 @@ import android.os.Parcel
 import promise.commons.model.Identifiable
 import promise.commons.util.Conditions
 import promise.model.TimeStamped
-import java.lang.Exception
 
-/**
- *
- */
-abstract class ActiveRecord<T: Identifiable<Int>>() : TimeStamped() {
-  /**
-   *
-   */
+abstract class ActiveRecord<T : Identifiable<Int>>() : TimeStamped() {
+
   internal var table: FastTable<T>? = null
 
-  /**
-   *
-   */
-  constructor(parcel: Parcel?): this() {
+  constructor(parcel: Parcel?) : this() {
     super.readFromParcel(parcel)
   }
 
-  /**
-   *
-   */
   @Throws(Exception::class)
   fun save(): Long {
     Conditions.checkNotNull(table, "This record has not been read from the database and can't be saved")
     return table!!.save(getEntity())
   }
 
-  /**
-   *
-   */
   @Throws(Exception::class)
   fun update(): Boolean {
     Conditions.checkNotNull(table, "This record has not been read from the database and can't be updated")
     return table!!.update(getEntity())
   }
 
-  /**
-   *
-   */
   @Throws(Exception::class)
   fun delete(): Boolean {
     Conditions.checkNotNull(table, "This record has not been read from the database and can't be deleted")
     return table!!.delete(getEntity())
   }
 
-  /**
-   *
-   */
   abstract fun getEntity(): T
 }
\ No newline at end of file
diff --git a/database/src/main/java/promise/db/Column.java b/database/src/main/java/promise/db/Column.java
index 30a7753..b7e63b4 100644
--- a/database/src/main/java/promise/db/Column.java
+++ b/database/src/main/java/promise/db/Column.java
@@ -28,9 +28,11 @@ public final class Column<T> {
   private String operand = Op.EQUALS().s;
   private T value;
   private int index;
+
   public Column(String name, Type type) {
     this(name, type, 0);
   }
+
   public Column(String name, Type type, int index) {
     this(name, type.s, index);
   }
@@ -228,23 +230,6 @@ public static Type NOT_NULL(int len) {
       }
     }
 
-    public static class BLOB {
-      private static final String prefix =
-          "BLOB";
-
-      public static Type NULLABLE() {
-        return newType(prefix, NULL.YES);
-      }
-
-      public static Type UNIQUE() {
-        return newType(prefix);
-      }
-
-      public static Type NOT_NULL() {
-        return newType(prefix, NULL.NO);
-      }
-    }
-
     public static class REAL {
       private static final String prefix =
           "REAL";
diff --git a/commons/src/main/java/promise/db/Corrupt.java b/database/src/main/java/promise/db/Corrupt.java
similarity index 86%
rename from commons/src/main/java/promise/db/Corrupt.java
rename to database/src/main/java/promise/db/Corrupt.java
index c0aef65..8fe1c68 100644
--- a/commons/src/main/java/promise/db/Corrupt.java
+++ b/database/src/main/java/promise/db/Corrupt.java
@@ -13,12 +13,8 @@
 
 package promise.db;
 
-/**
- *
- */
+import androidx.sqlite.db.SupportSQLiteDatabase;
+
 public interface Corrupt {
-  /**
-   *
-   */
-  void onCorrupt();
+  void onCorrupt(SupportSQLiteDatabase database);
 }
diff --git a/database/src/main/java/promise/db/Crud.kt b/database/src/main/java/promise/db/Crud.kt
index 8c466d9..ebe8781 100644
--- a/database/src/main/java/promise/db/Crud.kt
+++ b/database/src/main/java/promise/db/Crud.kt
@@ -12,80 +12,35 @@
  */
 package promise.db
 
-import android.database.Cursor
 import promise.commons.model.Identifiable
 import promise.commons.model.List
 import promise.model.IdentifiableList
 
-/**
- *
- */
-internal interface Crud<X> {
-
-  fun querySql(sql: String): Cursor
+interface Crud<X> {
 
-  /**
-   *
-   */
   fun <T : Identifiable<Int>> find(tableCrud: TableCrud<T, in X>): TableCrud.Extras<T>
 
-  /**
-   *
-   */
   fun <T : Identifiable<Int>> findAll(tableCrud: TableCrud<T, in X>): IdentifiableList<out T>
 
-  /**
-   *
-   */
   fun <T : Identifiable<Int>> update(t: T, tableCrud: TableCrud<T, in X>, column: Column<*>): Boolean
 
-  /**
-   *
-   */
   fun <T : Identifiable<Int>> update(t: T, tableCrud: TableCrud<T, in X>): Boolean
 
-  /**
-   *
-   */
   fun <T : Identifiable<Int>> findAll(tableCrud: TableCrud<T, in X>, vararg columns: Column<*>): IdentifiableList<out T>
 
-  /**
-   *
-   */
   fun delete(tableCrud: TableCrud<*, in X>, column: Column<*>): Boolean
 
-  /**
-   *
-   */
   fun <T : Identifiable<Int>> delete(tableCrud: TableCrud<T, in X>, t: T): Boolean
 
-  /**
-   *
-   */
   fun delete(tableCrud: TableCrud<*, in X>): Boolean
 
-  /**
-   *
-   */
   fun <T> delete(tableCrud: TableCrud<*, in X>, column: Column<T>, list: List<out T>): Boolean
 
-  /**
-   *
-   */
   fun <T : Identifiable<Int>> save(t: T, tableCrud: TableCrud<T, in X>): Long
 
-  /**
-   *
-   */
   fun <T : Identifiable<Int>> save(list: IdentifiableList<out T>, tableCrud: TableCrud<T, in X>): Boolean
 
-  /**
-   *
-   */
   fun deleteAll(): Boolean
 
-  /**
-   *
-   */
   fun getLastId(tableCrud: TableCrud<*, in X>): Int
 }
\ No newline at end of file
diff --git a/database/src/main/java/promise/db/CrudStore.java b/database/src/main/java/promise/db/CrudStore.java
index c8da0e6..181bbea 100644
--- a/database/src/main/java/promise/db/CrudStore.java
+++ b/database/src/main/java/promise/db/CrudStore.java
@@ -19,27 +19,15 @@
 import promise.commons.model.List;
 import promise.commons.tx.PromiseResult;
 
-/**
- * @param <T>
- */
 public class CrudStore<T extends Identifiable<Integer>>
     implements Store<T, TableCrud<T, ? super SQLiteDatabase>, Throwable> {
-  /**
-   *
-   */
+
   private Crud<SQLiteDatabase> crudStore;
 
-  /**
-   * @param crudStore
-   */
   public CrudStore(Crud<SQLiteDatabase> crudStore) {
     this.crudStore = crudStore;
   }
 
-  /**
-   * @param tsqLiteDatabaseTable
-   * @param callBack
-   */
   @Override
   public void get(
       TableCrud<T, ? super SQLiteDatabase> tsqLiteDatabaseTable,
@@ -53,11 +41,6 @@ public final <X> List<? extends T> filter(List<? extends T> list, X... x) {
     }, callBack);
   }
 
-  /**
-   * @param tsqLiteDatabaseTable
-   * @param t
-   * @param callBack
-   */
   @Override
   public void delete(
       TableCrud<T, ? super SQLiteDatabase> tsqLiteDatabaseTable,
@@ -70,11 +53,6 @@ public void delete(
     }
   }
 
-  /**
-   * @param tsqLiteDatabaseTable
-   * @param t
-   * @param callBack
-   */
   @Override
   public void update(
       TableCrud<T, ? super SQLiteDatabase> tsqLiteDatabaseTable,
@@ -87,11 +65,6 @@ public void update(
     }
   }
 
-  /**
-   * @param tsqLiteDatabaseTable
-   * @param t
-   * @param callBack
-   */
   @Override
   public void save(
       TableCrud<T, ? super SQLiteDatabase> tsqLiteDatabaseTable,
@@ -104,10 +77,6 @@ public void save(
     }
   }
 
-  /**
-   * @param tsqLiteDatabaseTable
-   * @param callBack
-   */
   @Override
   public void clear(
       TableCrud<T, ? super SQLiteDatabase> tsqLiteDatabaseTable,
@@ -119,9 +88,6 @@ public void clear(
     }
   }
 
-  /**
-   * @param callBack
-   */
   @Override
   public void clear(PromiseResult<Boolean, Throwable> callBack) {
     try {
diff --git a/commons/src/main/java/promise/db/DBError.java b/database/src/main/java/promise/db/DBError.java
similarity index 94%
rename from commons/src/main/java/promise/db/DBError.java
rename to database/src/main/java/promise/db/DBError.java
index af80017..85fa03d 100644
--- a/commons/src/main/java/promise/db/DBError.java
+++ b/database/src/main/java/promise/db/DBError.java
@@ -13,9 +13,7 @@
 
 package promise.db;
 
-/**
- * Created by yoctopus on 2/21/17.
- */
+
 public final class DBError extends Exception {
   DBError() {
   }
diff --git a/database/src/main/java/promise/db/DDLFunctions.kt b/database/src/main/java/promise/db/DDLFunctions.kt
index eddfdb5..b530502 100644
--- a/database/src/main/java/promise/db/DDLFunctions.kt
+++ b/database/src/main/java/promise/db/DDLFunctions.kt
@@ -34,4 +34,12 @@ interface DDLFunctions<in X> {
    */
   @Throws(TableError::class)
   fun onUpgrade(x: X, v1: Int, v2: Int)
+
+  /**
+   * @param x
+   * @return
+   * @throws TableError
+   */
+  @Throws(TableError::class)
+  fun onDrop(x: X): Boolean
 }
\ No newline at end of file
diff --git a/database/src/main/java/promise/db/DMLFunctions.kt b/database/src/main/java/promise/db/DMLFunctions.kt
index a4bf807..7e912f8 100644
--- a/database/src/main/java/promise/db/DMLFunctions.kt
+++ b/database/src/main/java/promise/db/DMLFunctions.kt
@@ -20,182 +20,66 @@ import promise.commons.model.Identifiable
 import promise.commons.model.List
 import promise.model.IdentifiableList
 
-/**
- *
- */
 interface DMLFunctions<T : Identifiable<Int>> {
 
-  /**
-   *
-   */
+  fun transact(block: FastTable<T>.() -> Unit)
+
   fun querySql(sql: String): Cursor
 
-  /**
-   * @param t
-   * @return
-   */
   fun save(t: T): Long
 
-  /**
-   * @param t
-   * @return
-   */
   fun saveAsync(t: T): Single<Long>
 
-  /**
-   * @param list
-   * @return
-   */
   fun save(list: IdentifiableList<out T>): Boolean
 
-  /**
-   * @param list
-   * @return
-   */
   fun saveAsync(list: IdentifiableList<out T>): Single<Boolean>
 
-  /**
-   * @param t
-   * @return
-   */
   fun update(t: T): Boolean
 
-  /**
-   * @param t
-   * @return
-   */
   fun updateAsync(t: T): Maybe<Boolean>
 
-  /**
-   * @param t
-   * @param column
-   * @return
-   */
   fun update(t: T, column: Column<*>): Boolean
 
-  /**
-   * @param t
-   * @param column
-   * @return
-   */
   fun updateAsync(t: T, column: Column<*>): Maybe<Boolean>
 
-  /**
-   *
-   */
-  fun queryBuilder(): QueryBuilder
-
-  /**
-   *
-   */
   fun query(queryBuilder: QueryBuilder): Cursor
 
-  /**
-   *
-   */
   fun queryAsync(queryBuilder: QueryBuilder): Single<Cursor>
 
-  /**
-   * @return
-   */
   fun find(): TableCrud.Extras<T>
 
-  /**
-   * @return
-   */
   fun findById(idLong: Long): T?
 
-  /**
-   * @return
-   */
   fun findOne(vararg columns: Column<*>): T?
 
-  /**
-   * @return
-   * @throws TableError
-   */
   @Throws(TableError::class)
   fun findAsync(): ReactiveTable.Extras<T>
 
-  /**
-   * @return
-   */
   fun findAll(): IdentifiableList<out T>
 
-  /**
-   * @return
-   */
   fun findAllAsync(): Maybe<IdentifiableList<out T>>
 
-  /**
-   * @param column
-   * @return
-   */
   fun findAll(vararg column: Column<*>): IdentifiableList<out T>
 
-  /**
-   * @param column
-   * @return
-   */
   fun findAllAsync(vararg column: Column<*>): Maybe<IdentifiableList<out T>>
 
-  /**
-   * @param column
-   * @return
-   */
   fun delete(column: Column<*>): Boolean
 
-  /**
-   * @param column
-   * @return
-   */
   fun deleteAsync(column: Column<*>): Maybe<Boolean>
 
-  /**
-   * @param t
-   * @return
-   */
   fun delete(t: T): Boolean
 
-  /**
-   * @param t
-   * @return
-   */
   fun deleteAsync(t: T): Maybe<Boolean>
 
-  /**
-   * @param column
-   * @param list
-   * @param <N>
-   * @return
-  </N> */
   fun <N> delete(column: Column<N>, list: List<out N>): Boolean
 
-  /**
-   * @param column
-   * @param list
-   * @param <C>
-   * @return
-  </C> */
   fun <C> deleteAsync(column: Column<C>, list: List<out C>): Maybe<Boolean>
 
-  /**
-   * @return
-   */
   fun clear(): Boolean
 
-  /**
-   * @return
-   */
   fun clearAsync(): Maybe<Boolean>
 
-  /**
-   * @return
-   */
   val lastId: Int
 
-  /**
-   * @return
-   */
   val lastIdAsync: Maybe<Int>
 }
\ No newline at end of file
diff --git a/database/src/main/java/promise/db/DMLVisitors.kt b/database/src/main/java/promise/db/DMLVisitors.kt
new file mode 100644
index 0000000..e3436b2
--- /dev/null
+++ b/database/src/main/java/promise/db/DMLVisitors.kt
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.db
+
+import android.database.sqlite.SQLiteDatabase
+import android.text.TextUtils
+import androidx.sqlite.db.SupportSQLiteDatabase
+import promise.commons.model.Identifiable
+import promise.commons.model.List
+import promise.model.IdentifiableList
+import promise.utils.Visitor
+
+internal class UpdateVisitor<T : Identifiable<Int>>(private val x: SupportSQLiteDatabase,
+                                           private val instance: T,
+                                           private val column: Column<*>? = null) : Visitor<TableCrud<T, in SupportSQLiteDatabase>, Boolean> {
+
+  override fun visit(t: TableCrud<T, in SupportSQLiteDatabase>): Boolean {
+    fun update(instance: T, x: SupportSQLiteDatabase, column: Column<*>): Boolean {
+      val whereArg: String = if (column.operand != null && column.value() != null)
+        column.name + column.operand + column.value()
+      else throw TableError("Cant update the record, missing updating information")
+      val values = t.serialize(instance)
+      values.put(FastTable.updatedAt.name, System.currentTimeMillis())
+      return x.update(t.name, SQLiteDatabase.CONFLICT_ROLLBACK, values, whereArg, null) > 0
+    }
+    return if (column == null) {
+      try {
+        update(this.instance, x, FastTable.id.with(this.instance.getId()))
+      } catch (tableError: TableError) {
+        false
+      }
+    } else update(this.instance, x, column)
+  }
+}
+
+internal class DeleteVisitor<T : Identifiable<Int>>(private val x: SupportSQLiteDatabase,
+                                           private val instance: T) : Visitor<TableCrud<T, in SupportSQLiteDatabase>, Boolean> {
+  override fun visit(t: TableCrud<T, in SupportSQLiteDatabase>): Boolean {
+    fun onDelete(x: SupportSQLiteDatabase, column: Column<*>): Boolean {
+      val where = column.name + column.operand + column.value()
+      return x.delete(t.name, where, null) >= 0
+    }
+    return onDelete(x, FastTable.id.with(instance.getId()))
+  }
+}
+
+internal class DeleteErasureVisitor(private val x: SupportSQLiteDatabase,
+                           private val column: Column<*>? = null) : Visitor<TableCrud<*, in SupportSQLiteDatabase>, Boolean> {
+  override fun visit(t: TableCrud<*, in SupportSQLiteDatabase>): Boolean {
+    fun onDelete(x: SupportSQLiteDatabase): Boolean =
+        !TextUtils.isEmpty(t.name) && x.delete(t.name, null, null) >= 0
+
+    fun onDelete(x: SupportSQLiteDatabase, column: Column<*>): Boolean {
+      val where = column.name + column.operand + column.value()
+      return x.delete(t.name, where, null) >= 0
+    }
+    return if (column != null) onDelete(x, column)
+    else onDelete(x)
+  }
+}
+
+internal class DeleteListErasureVisitor<C>(private val x: SupportSQLiteDatabase,
+                                  private val column: Column<C>,
+                                  private val list: List<out C>) : Visitor<TableCrud<*, in SupportSQLiteDatabase>, Boolean> {
+  override fun visit(t: TableCrud<*, in SupportSQLiteDatabase>): Boolean {
+    fun <C> onDelete(x: SupportSQLiteDatabase, column: Column<C>, list: List<out C>): Boolean {
+      val deleted: Boolean
+      var where = ""
+      var i = 0
+      val listSize = list.size
+      while (i < listSize) {
+        val c = list[i]
+        where = if (i == listSize - 1) {
+          column.name + " " + column.operand + " " + c
+        } else column.name + " " + column.operand + " " + c + " OR "
+        i++
+      }
+      deleted = x.delete(t.name, where, null) >= 0
+      return deleted
+    }
+    return onDelete(x, column, list)
+  }
+}
+
+internal class SaveVisitor<T : Identifiable<Int>>(
+    private val updateVisitor: Visitor<TableCrud<T, in SupportSQLiteDatabase>, Boolean>,
+    private val x: SupportSQLiteDatabase,
+    private val instance: T
+) : Visitor<TableCrud<T, in SupportSQLiteDatabase>, Long> {
+  override fun visit(t: TableCrud<T, in SupportSQLiteDatabase>): Long {
+    fun onSave(instance: T, x: SupportSQLiteDatabase): Long {
+      if (instance.getId() != 0 && updateVisitor.visit(t)) return instance.getId().toLong()
+      val values = t.serialize(instance)
+      values.put(FastTable.createdAt.name, System.currentTimeMillis())
+      values.put(FastTable.updatedAt.name, System.currentTimeMillis())
+      return x.insert(t.name, SQLiteDatabase.CONFLICT_ROLLBACK, values)
+    }
+    return onSave(instance, x)
+  }
+}
+
+internal class SaveListVisitor<T : Identifiable<Int>>(
+    private val x: SupportSQLiteDatabase,
+    private val list: IdentifiableList<out T>
+) : Visitor<TableCrud<T, in SupportSQLiteDatabase>, Boolean> {
+  override fun visit(t: TableCrud<T, in SupportSQLiteDatabase>): Boolean {
+    var saved = true
+    var i = 0
+    val listSize = list.size
+    while (i < listSize) {
+      val instance = list[i]
+      val visitor = SaveVisitor<T>(UpdateVisitor(x, instance, null), x, instance)
+      saved = saved && visitor.visit(t) > 0
+      i++
+    }
+    /*if (close) database.close();*/return saved
+  }
+}
\ No newline at end of file
diff --git a/database/src/main/java/promise/db/DatabaseCreationCallback.kt b/database/src/main/java/promise/db/DatabaseCreationCallback.kt
index b323880..026e169 100644
--- a/database/src/main/java/promise/db/DatabaseCreationCallback.kt
+++ b/database/src/main/java/promise/db/DatabaseCreationCallback.kt
@@ -13,12 +13,12 @@
 
 package promise.db
 
-import android.database.sqlite.SQLiteDatabase
+import androidx.sqlite.db.SupportSQLiteDatabase
 
 interface DatabaseCreationCallback {
 
-  fun beforeCreate(database: SQLiteDatabase)
+  fun beforeCreate(database: SupportSQLiteDatabase)
 
-  fun afterCreate(database: SQLiteDatabase)
+  fun afterCreate(database: SupportSQLiteDatabase)
 
 }
\ No newline at end of file
diff --git a/database/src/main/java/promise/db/DatabaseCursorFactory.java b/database/src/main/java/promise/db/DatabaseCursorFactory.java
deleted file mode 100644
index ab02deb..0000000
--- a/database/src/main/java/promise/db/DatabaseCursorFactory.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2017, Peter Vincent
- * Licensed under the Apache License, Version 2.0, Android Promise.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package promise.db;
-
-import android.database.Cursor;
-import android.database.sqlite.SQLiteCursor;
-import android.database.sqlite.SQLiteCursorDriver;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteQuery;
-
-public class DatabaseCursorFactory implements SQLiteDatabase.CursorFactory {
-
-  private Listener listener;
-
-  DatabaseCursorFactory(Listener listener) {
-    this.listener = listener;
-  }
-
-  @Override
-  public Cursor newCursor(SQLiteDatabase db, SQLiteCursorDriver masterQuery, String editTable, SQLiteQuery query) {
-    if (listener != null) {
-      listener.onLog(query.toString());
-    }
-    return new SQLiteCursor(masterQuery, editTable, query);
-  }
-
-  public interface Listener {
-    void onLog(String query);
-  }
-}
diff --git a/database/src/main/java/promise/db/FastDatabase.kt b/database/src/main/java/promise/db/FastDatabase.kt
index 1454538..fda39e0 100644
--- a/database/src/main/java/promise/db/FastDatabase.kt
+++ b/database/src/main/java/promise/db/FastDatabase.kt
@@ -10,449 +10,96 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package promise.db
 
-import android.annotation.TargetApi
 import android.database.Cursor
-import android.database.DatabaseErrorHandler
-import android.database.sqlite.SQLiteDatabase
-import android.os.Build
 import androidx.collection.ArrayMap
-import promise.commons.data.log.LogUtil
+import androidx.sqlite.db.SupportSQLiteDatabase
 import promise.commons.makeInstance
-import promise.commons.model.Identifiable
 import promise.commons.model.List
 import promise.commons.util.ClassUtil
-import promise.commons.util.Conditions
-import promise.model.IdentifiableList
-import java.util.*
-
-/**
- *
- */
+import promise.utils.Visitor
 
-open class FastDatabase internal constructor(
+abstract class FastDatabase internal constructor(
     name: String?,
-    factory: SQLiteDatabase.CursorFactory?,
-    version: Int,
-    errorHandler: DatabaseErrorHandler)
-  : FastDatabaseOpenHelper(name, factory, version, errorHandler),
-    Crud<SQLiteDatabase> {
-
-  private val cacheMap: ArrayMap<String, Any> = ArrayMap()
-
-  private var migration: Migration? = null
-
-  private var databaseCreationCallback: DatabaseCreationCallback? = null
-
-  /**
-   * @param name
-   * @param version
-   * @param cursorListener
-   * @param listener
-   */
-  @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-  private constructor(name: String?,
-                      version: Int,
-                      cursorListener: DatabaseCursorFactory.Listener?,
-                      listener: Corrupt?) : this(
-      name,
-      DatabaseCursorFactory(cursorListener),
-      version,
-      DatabaseErrorHandler {
-        assert(listener != null)
-        listener!!.onCorrupt()
-      })
-
-  constructor(name: String?, version: Int) : this(name, version, null, null)
-
-  /**
-   * @param db
-   */
-  final override fun onCreate(db: SQLiteDatabase) {
-    if (databaseCreationCallback != null) {
-      databaseCreationCallback!!.beforeCreate(db)
-      create(db)
-      databaseCreationCallback!!.afterCreate(db)
-    } else create(db)
-  }
-
-  /**
-   * @param database
-   * @param oldVersion
-   * @param newVersion
-   */
-  final override fun onUpgrade(database: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
-    LogUtil.d(TAG, "onUpgrade", oldVersion, newVersion)
-    if (newVersion - oldVersion == 1)
-      onUpgradeDatabase(database, oldVersion, newVersion) else {
-      var i = oldVersion
-      while (i < newVersion) {
-        onUpgradeDatabase(database, i, i + 1)
-        i++
-      }
-    }
-    upgradeTables(database, oldVersion, newVersion)
-  }
-
-  /**
-   * @param database
-   * @param oldVersion
-   * @param newVersion
-   * @return
-   */
-  private fun onUpgradeDatabase(database: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
-    if (migration != null) migration!!.onMigrate(this, database, oldVersion, newVersion)
-  }
-
-  /**
-   * @return
-   */
-  fun name(): String = this.databaseName
-
-  private var tables: List<out FastTable<*>>? = null
-
-  /**
-   * @return
-   */
-  protected fun tables(): List<TableCrud<*, in SQLiteDatabase>> =
-      Conditions.checkNotNull(tables, "tables not found for this database")
-          as List<TableCrud<*, in SQLiteDatabase>>
-
-  /**
-   *
-   */
-  fun <T : FastTable<*>> obtain(tableClass: Class<out FastTable<*>>): T {
-    fun <T : FastTable<*>> makeTable(tableClass: Class<out FastTable<*>>): T {
-      if (ClassUtil.hasAnnotation(tableClass, Table::class.java)) {
-        val table = tableClass.getAnnotation(Table::class.java)!!
-        if (cacheMap.containsKey(table.tableName)) return cacheMap[table.tableName] as T
-        val tableObject = makeInstance(tableClass.kotlin, arrayOf(this)) as T
-        tableObject.setNameOfTable(table.tableName)
-        tableObject.setArgs(ArrayMap<String, Any>().apply {
-          put(INDEXES, table.indices)
-          put(FOREIGN_kEYS, table.foreignKeys)
-          put(COMPOUND_INDEXES, table.compoundIndexes)
-        })
-        cacheMap[table.tableName] = tableObject
-        return tableObject
-      }
-      throw IllegalArgumentException("The class must be annotated with @Table")
-    }
-    return makeTable(tableClass)
-  }
-
-  internal fun <T : FastTable<*>> setTables(tablesClasses: List<out Class<out FastTable<*>>>) {
-    this.tables = tablesClasses.map {
-      return@map obtain<T>(it)
-    }
-  }
-
-  internal fun setMigration(migration: Migration?) {
-    this.migration = migration
-  }
-
-  fun setDatabaseCreationCallback(creationCallback: DatabaseCreationCallback?): FastDatabase {
-    this.databaseCreationCallback = creationCallback
-    return this
-  }
-
-  /**
-   * @param database
-   */
-  private fun create(database: SQLiteDatabase) {
-    var created = true
-    for (table in Conditions.checkNotNull(tables())) created = try {
-      created && create(table, database)
-    } catch (dbError: DBError) {
-      LogUtil.e(TAG, dbError)
-      return
-    }
-  }
-
-  /**
-   * @param database
-   * @param v1
-   * @param v2
-   */
-  private fun upgradeTables(database: SQLiteDatabase, v1: Int, v2: Int) {
-    for (table in Conditions.checkNotNull(tables())) try {
-      if (v2 - v1 == 1)
-        checkTableExist(table).onUpgrade(database, v1, v2)
-      else {
-        var i = v1
-        while (i < v2) {
-          checkTableExist(table).onUpgrade(database, i, i + 1)
-          i++
-        }
-      }
-    } catch (tableError: TableError) {
-      LogUtil.e(TAG, tableError)
-    }
-  }
-
+    version: Int) : FastDatabaseOpenHelper(name, version),
+    Crud<SupportSQLiteDatabase> {
   /**
-   * @param database
-   * @param tableCruds
-   * @return
+   * adds tables to the existing database
    */
-  @SafeVarargs
-  fun add(database: SQLiteDatabase, vararg tableCruds: TableCrud<*, in SQLiteDatabase>): Boolean {
-    var created = true
-    for (table in tableCruds) {
-      created = try {
-        created && create(table, database)
-      } catch (dbError: DBError) {
-        LogUtil.e(TAG, dbError)
-        return false
-      }
-    }
-    return created
-  }
+  abstract fun add(database: SupportSQLiteDatabase, vararg tables: TableCrud<*, in SupportSQLiteDatabase>): Boolean
 
   /**
-   * @param database
-   * @return
+   * returns a table instance provided the class of the table
+   * the class provided must be annotated with @Table
    */
-  private fun drop(database: SQLiteDatabase): Boolean {
-    /*for (Map.Entry<IndexCreated, Table<, SQLiteDatabase>> entry :
-        indexCreatedTableHashMap.entrySet()) {
-      try {
-        dropped = dropped && drop(checkTableExist(entry.getValue()), database);
-      } catch (DBError dbError) {
-        dbError.printStackTrace();
-        return false;
-      }
-    }*/return true
-  }
+  abstract fun <T : TableCrud<*, in SupportSQLiteDatabase>> obtain(tableClass: Class<out TableCrud<*, in SupportSQLiteDatabase>>): T
 
   /**
-   * @param tableCrud
-   * @param database
-   * @return
-   * @throws DBError
+   * queries the given sql and returns a cursor
    */
-  @Throws(DBError::class)
-  private fun create(tableCrud: TableCrud<*, in SQLiteDatabase>, database: SQLiteDatabase): Boolean {
-    try {
-      tableCrud.onCreate(database)
-    } catch (e: TableError) {
-      throw DBError(e)
-    }
-    return true
-  }
+  abstract fun querySql(sql: String): Cursor
 
   /**
-   * @param tableCrud
-   * @param database
-   * @return
-   * @throws DBError
+   * pass a visitor to merge multiple operations
    */
-  @Throws(DBError::class)
-  private fun drop(tableCrud: TableCrud<*, in SQLiteDatabase>, database: SQLiteDatabase): Boolean {
-    try {
-      checkTableExist(tableCrud).onDrop(database)
-    } catch (e: TableError) {
-      throw DBError(e)
-    }
-    return true
-  }
-
-  override fun querySql(sql: String): Cursor {
-    LogUtil.d(TAG, "query: $sql")
-    return readableDatabase.rawQuery(sql, null)
-  }
+  abstract fun <R : Any> accept(visitor: Visitor<FastDatabase, R>): R
 
   /**
-   * @param builder
-   * @return
+   * queries the given query builder and returns a cursor
    */
-  fun query(builder: QueryBuilder): Cursor {
-    val sql = builder.build()
-    val params = builder.buildParameters()
-    LogUtil.d(TAG, "query: $sql", " params: " + Arrays.toString(params))
-    return readableDatabase.rawQuery(sql, params)
-  }
-
-  /**
-   * @param tableCrud
-   * @param <T>
-   * @return
-  </T> */
-  override fun <T : Identifiable<Int>> find(tableCrud: TableCrud<T, in SQLiteDatabase>): TableCrud.Extras<T> =
-      checkTableExist(tableCrud).onFind(readableDatabase)
-
-  /**
-   * @param tableCrud
-   * @param <T>
-   * @return
-  </T> */
-  override fun <T : Identifiable<Int>> findAll(tableCrud: TableCrud<T, in SQLiteDatabase>): IdentifiableList<out T> =
-      checkTableExist(tableCrud).onFindAll(readableDatabase, true)
-
-  /**
-   * @param t
-   * @param tableCrud
-   * @param <T>
-   * @return
-  </T> */
-  override fun <T : Identifiable<Int>> update(t: T, tableCrud: TableCrud<T, in SQLiteDatabase>): Boolean =
-      checkTableExist(tableCrud).onUpdate(t, writableDatabase)
-
-  /**
-   * @param t
-   * @param tableCrud
-   * @param column
-   * @param <T>
-   * @return
-  </T> */
-  override fun <T : Identifiable<Int>> update(t: T, tableCrud: TableCrud<T, in SQLiteDatabase>, column: Column<*>): Boolean =
-      try {
-        checkTableExist(tableCrud).onUpdate(t, writableDatabase, column)
-      } catch (tableError: TableError) {
-        LogUtil.e(TAG, "update error", tableError)
-        false
-      }
-
-  /**
-   * @param tableCrud
-   * @param columns
-   * @param <T>
-   * @return
-  </T> */
-  override fun <T : Identifiable<Int>> findAll(tableCrud: TableCrud<T, in SQLiteDatabase>,
-                                               vararg columns: Column<*>): IdentifiableList<out T> =
-      checkTableExist(tableCrud).onFindAll(readableDatabase, *columns)
+  abstract fun query(queryBuilder: QueryBuilder): Cursor
 
   /**
-   * @param tableCrud
-   * @param t
-   * @param <T>
-   * @return
-  </T> */
-  override fun <T : Identifiable<Int>> delete(tableCrud: TableCrud<T, in SQLiteDatabase>, t: T): Boolean =
-      checkTableExist(tableCrud).onDelete(t, writableDatabase)
-
-  /**
-   * @param tableCrud
-   * @param column
-   * @return
+   * returns a writable version of the database
    */
-  override fun delete(tableCrud: TableCrud<*, in SQLiteDatabase>, column: Column<*>): Boolean =
-      checkTableExist(tableCrud).onDelete(writableDatabase, column)
+  abstract fun writableDatabase(): SupportSQLiteDatabase
 
   /**
-   * @param tableCrud
-   * @return
+   * executes query transaction
    */
-  override fun delete(tableCrud: TableCrud<*, in SQLiteDatabase>): Boolean =
-      checkTableExist(tableCrud).onDelete(writableDatabase)
+  abstract fun transact(block: FastDatabase.() -> Unit)
 
   /**
-   * @param tableCruds
-   * @return
+   * clear records in the passed tables
    */
-  @SafeVarargs
-  fun delete(vararg tableCruds: TableCrud<*, in SQLiteDatabase>): Boolean {
-    var delete = true
-    for (table in tableCruds) delete = delete && delete(table)
-    return delete
-  }
-
-  /**
-   * @param tableCrud
-   * @param column
-   * @param list
-   * @param <T>
-   * @return
-  </T> */
-  override fun <T> delete(tableCrud: TableCrud<*, in SQLiteDatabase>, column: Column<T>, list: List<out T>): Boolean =
-      checkTableExist(tableCrud).onDelete(writableDatabase, column, list)
-
-  /**
-   * @param t
-   * @param tableCrud
-   * @param <T>
-   * @return
-  </T> */
-  override fun <T : Identifiable<Int>> save(t: T, tableCrud: TableCrud<T, in SQLiteDatabase>): Long =
-      checkTableExist(tableCrud).onSave(t, writableDatabase)
+  abstract fun delete(vararg tableCruds: TableCrud<*, in SupportSQLiteDatabase>): Boolean
 
   /**
-   * @param list
-   * @param tableCrud
-   * @param <T>
-   * @return
-  </T> */
-  override fun <T : Identifiable<Int>> save(list: IdentifiableList<out T>, tableCrud: TableCrud<T, in SQLiteDatabase>): Boolean =
-      checkTableExist(tableCrud).onSave(list, writableDatabase)
-
-  /**
-   * @return
+   * returns the name of the database
    */
-  override fun deleteAll(): Boolean = synchronized(FastDatabase::class.java) {
-    var deleted = true
-    try {
-      writableDatabase.execSQL("PRAGMA foreign_keys = FALSE");
-      transact {
-        for (table in Conditions.checkNotNull(tables())) deleted = deleted && delete(checkTableExist(table))
-      }
-      writableDatabase.execSQL("PRAGMA foreign_keys = TRUE");
-    } catch (e: Exception) { }
-    return deleted
-  }
+  abstract fun name(): String
 
   /**
-   * @param tableCrud
-   * @return
+   * in case migrations have not been done successfully, calling this ensures the database drops and creates all the tables afresh
    */
-  override fun getLastId(tableCrud: TableCrud<*, in SQLiteDatabase>): Int =
-      checkTableExist(tableCrud).onGetLastId(readableDatabase)
-
-  inline fun transact(block: FastDatabase.() -> Unit) = synchronized(this) {
-    val db = writableDatabase
-    try {
-      db.beginTransaction()
-      block.invoke(this)
-      db.setTransactionSuccessful()
-    } finally {
-      db.endTransaction()
-    }
-  }
-
-  /**
-   * @param tableCrud
-   * @param <T>
-   * @return
-  </T> */
-  private fun <T : Identifiable<Int>> checkTableExist(tableCrud: TableCrud<T, in SQLiteDatabase>): TableCrud<T, in SQLiteDatabase> =
-      Conditions.checkNotNull(tableCrud)
+  abstract fun fallBackToDestructiveMigration()
 
   companion object {
-
     private val dbCache: ArrayMap<String, FastDatabase> = ArrayMap()
-
     private val lock = Any()
-    /**
-     *
-     */
     const val DEFAULT_NAME = "fast"
 
     @JvmOverloads
     @JvmStatic
-    fun createDatabase(dbClass: Class<*>, name: String, migration: Migration? = null): FastDatabase {
+    fun createDatabase(dbClass: Class<*>,
+                       name: String,
+                       migration: Migration? = null,
+                       databaseCreationCallback: DatabaseCreationCallback? = null): FastDatabase {
       fun makeDatabase(dbClass: Class<*>): FastDatabase {
         if (ClassUtil.hasAnnotation(dbClass, Database::class.java)) {
           val database = dbClass.getAnnotation(Database::class.java)!!
           if (dbCache.containsKey(name)) return dbCache[name] as FastDatabase
-          val databaseObject = makeInstance(FastDatabase::class,
-              arrayOf(name, database.version)) as FastDatabase
+          val databaseObject = makeInstance(FastDatabaseImpl::class,
+              arrayOf(name, database.version)) as FastDatabaseImpl
           val classList: List<Class<out FastTable<*>>> = List()
           database.tables.forEach {
             classList.add(it.java)
           }
           databaseObject.setTables<FastTable<*>>(classList)
           databaseObject.setMigration(migration)
+          databaseObject.setDatabaseCreationCallback(databaseCreationCallback)
           dbCache[name] = databaseObject
           return databaseObject
         }
@@ -463,18 +110,22 @@ open class FastDatabase internal constructor(
       }
     }
 
+    @JvmOverloads
     @JvmStatic
-    fun createInMemoryDatabase(dbClass: Class<*>): FastDatabase {
+    fun createInMemoryDatabase(
+        dbClass: Class<*>,
+        databaseCreationCallback: DatabaseCreationCallback? = null): FastDatabase {
       fun makeDatabase(dbClass: Class<*>): FastDatabase {
         if (ClassUtil.hasAnnotation(dbClass, Database::class.java)) {
           val database = dbClass.getAnnotation(Database::class.java)!!
-          val databaseObject = makeInstance(FastDatabase::class,
-              arrayOf(null, database.version)) as FastDatabase
+          val databaseObject = makeInstance(FastDatabaseImpl::class,
+              arrayOf(null, database.version)) as FastDatabaseImpl
           val classList: List<Class<out FastTable<*>>> = List()
           database.tables.forEach {
             classList.add(it.java)
           }
           databaseObject.setTables<FastTable<*>>(classList)
+          databaseObject.setDatabaseCreationCallback(databaseCreationCallback)
           return databaseObject
         }
         throw IllegalArgumentException("The class must be annotated with @Database")
@@ -489,8 +140,8 @@ open class FastDatabase internal constructor(
     fun createReactiveDatabase(dbClass: Class<*>,
                                name: String,
                                migration: Migration? = null,
-                               databaseCreationCallback: DatabaseCreationCallback? = null): ReactiveFastDatabase {
-      fun makeDatabase(dbClass: Class<*>): ReactiveFastDatabase {
+                               databaseCreationCallback: DatabaseCreationCallback? = null): FastDatabase {
+      fun makeDatabase(dbClass: Class<*>): FastDatabase {
         if (ClassUtil.hasAnnotation(dbClass, Database::class.java)) {
           val database = dbClass.getAnnotation(Database::class.java)!!
           if (dbCache.containsKey(name)) return dbCache[name] as ReactiveFastDatabase
@@ -516,8 +167,8 @@ open class FastDatabase internal constructor(
     @JvmOverloads
     @JvmStatic
     fun createInMemoryReactiveDatabase(dbClass: Class<*>,
-                                       databaseCreationCallback: DatabaseCreationCallback? = null): ReactiveFastDatabase {
-      fun makeDatabase(dbClass: Class<*>): ReactiveFastDatabase {
+                                       databaseCreationCallback: DatabaseCreationCallback? = null): FastDatabase {
+      fun makeDatabase(dbClass: Class<*>): FastDatabase {
         if (ClassUtil.hasAnnotation(dbClass, Database::class.java)) {
           val database = dbClass.getAnnotation(Database::class.java)!!
           val databaseObject = makeInstance(ReactiveFastDatabase::class,
@@ -536,12 +187,5 @@ open class FastDatabase internal constructor(
         makeDatabase(dbClass)
       }
     }
-
-    /*private static Map<IndexCreated, Table<, SQLiteDatabase>> indexCreatedTableHashMap;*/
-    private val TAG: String = LogUtil.makeTag(FastDatabase::class.java)
-  }
-
-  init {
-    LogUtil.d(TAG, "fast db init")
   }
 }
\ No newline at end of file
diff --git a/database/src/main/java/promise/db/FastDatabaseImpl.kt b/database/src/main/java/promise/db/FastDatabaseImpl.kt
new file mode 100644
index 0000000..382fe35
--- /dev/null
+++ b/database/src/main/java/promise/db/FastDatabaseImpl.kt
@@ -0,0 +1,290 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package promise.db
+
+import android.database.Cursor
+import androidx.collection.ArrayMap
+import androidx.sqlite.db.SupportSQLiteDatabase
+import promise.commons.createInstance
+import promise.commons.data.log.LogUtil
+import promise.commons.model.Identifiable
+import promise.commons.model.List
+import promise.commons.util.ClassUtil
+import promise.commons.util.Conditions
+import promise.database.Table
+import promise.model.IdentifiableList
+import promise.utils.Visitor
+import java.util.*
+
+@Suppress("UNCHECKED_CAST")
+open class FastDatabaseImpl constructor(
+    name: String?,
+    version: Int)
+  : FastDatabase(name, version) {
+
+  private var fallBackToDestructiveMigration: Boolean = false
+
+  override fun fallBackToDestructiveMigration() {
+    this.fallBackToDestructiveMigration = true
+  }
+
+  private val cacheMap: ArrayMap<String, Any> = ArrayMap()
+
+  private var migration: Migration? = null
+
+  private var databaseCreationCallback: DatabaseCreationCallback? = null
+
+  final override fun onCreate(db: SupportSQLiteDatabase) {
+    if (databaseCreationCallback != null) {
+      databaseCreationCallback!!.beforeCreate(db)
+      create(db)
+      databaseCreationCallback!!.afterCreate(db)
+    } else create(db)
+  }
+
+  final override fun onUpgrade(database: SupportSQLiteDatabase, oldVersion: Int, newVersion: Int) {
+    try {
+      if (newVersion - oldVersion == 1)
+        onUpgradeDatabase(database, oldVersion, newVersion)
+      else {
+        var i = oldVersion
+        while (i < newVersion) {
+          onUpgradeDatabase(database, i, i + 1)
+          i++
+        }
+      }
+      upgradeTables(database, oldVersion, newVersion)
+    } catch (e: Throwable) {
+      if (fallBackToDestructiveMigration) {
+        for (table in Conditions.checkNotNull(tables())) try {
+          drop(table, database)
+        } catch (tableError: TableError) {
+          LogUtil.e(TAG, tableError)
+        }
+        onCreate(database)
+      } else LogUtil.e(TAG, e)
+    }
+  }
+
+  private fun onUpgradeDatabase(database: SupportSQLiteDatabase, oldVersion: Int, newVersion: Int) {
+    if (migration != null) migration!!.onMigrate(this, database, oldVersion, newVersion)
+  }
+
+  override fun name(): String = this.databaseName
+
+  private var tables: List<out FastTable<*>>? = null
+
+  protected fun tables(): List<TableCrud<*, in SupportSQLiteDatabase>> =
+      Conditions.checkNotNull(tables, "tables not found for this database")
+          as List<TableCrud<*, in SupportSQLiteDatabase>>
+
+  override fun <T : TableCrud<*, in SupportSQLiteDatabase>> obtain(tableClass: Class<out TableCrud<*, in SupportSQLiteDatabase>>): T {
+    fun <T : TableCrud<*, in SupportSQLiteDatabase>> makeTable(tableClass: Class<out TableCrud<*, in SupportSQLiteDatabase>>): T {
+      if (ClassUtil.hasAnnotation(tableClass, Table::class.java)) {
+        val table = tableClass.getAnnotation(Table::class.java)!!
+        if (cacheMap.containsKey(table.tableName)) return cacheMap[table.tableName] as T
+        val tableObject: FastTable<*> = createInstance<FastTable<*>>(clazz = tableClass.kotlin, args = arrayOf(this))
+        tableObject.setNameOfTable(table.tableName)
+        tableObject.setArgs(ArrayMap<String, Any>().apply {
+          put(INDEXES, table.indices)
+          put(FOREIGN_kEYS, table.foreignKeys)
+          put(COMPOUND_INDEXES, table.compoundIndexes)
+        })
+        cacheMap[table.tableName] = tableObject
+        return tableObject as T
+      }
+      throw IllegalArgumentException("The class must be annotated with @Table")
+    }
+    return makeTable(tableClass)
+  }
+
+  internal fun <T : FastTable<*>> setTables(tablesClasses: List<out Class<out FastTable<*>>>) {
+    this.tables = tablesClasses.map {
+      return@map obtain<T>(it)
+    }
+  }
+
+  internal fun setMigration(migration: Migration?) {
+    this.migration = migration
+  }
+
+  fun setDatabaseCreationCallback(creationCallback: DatabaseCreationCallback?): FastDatabaseImpl {
+    this.databaseCreationCallback = creationCallback
+    return this
+  }
+
+  private fun create(database: SupportSQLiteDatabase) {
+    var created = true
+    for (table in Conditions.checkNotNull(tables())) created = try {
+      created && create(table, database)
+    } catch (dbError: DBError) {
+      LogUtil.e(TAG, dbError)
+      return
+    }
+  }
+
+  private fun upgradeTables(database: SupportSQLiteDatabase, v1: Int, v2: Int) {
+    for (table in Conditions.checkNotNull(tables())) try {
+      if (v2 - v1 == 1)
+        checkTableExist(table).onUpgrade(database, v1, v2)
+      else {
+        var i = v1
+        while (i < v2) {
+          checkTableExist(table).onUpgrade(database, i, i + 1)
+          i++
+        }
+      }
+    } catch (tableError: TableError) {
+      LogUtil.e(TAG, tableError)
+    }
+  }
+
+  @SafeVarargs
+  override fun add(database: SupportSQLiteDatabase, vararg tables: TableCrud<*, in SupportSQLiteDatabase>): Boolean {
+    var created = true
+    for (table in tables) {
+      created = try {
+        created && create(table, database)
+      } catch (dbError: DBError) {
+        LogUtil.e(TAG, dbError)
+        return false
+      }
+    }
+    return created
+  }
+
+  @Throws(DBError::class)
+  private fun create(tableCrud: TableCrud<*, in SupportSQLiteDatabase>, database: SupportSQLiteDatabase): Boolean {
+    try {
+      tableCrud.onCreate(database)
+    } catch (e: TableError) {
+      throw DBError(e)
+    }
+    return true
+  }
+
+  @Throws(DBError::class)
+  private fun drop(tableCrud: TableCrud<*, in SupportSQLiteDatabase>, database: SupportSQLiteDatabase): Boolean {
+    try {
+      checkTableExist(tableCrud).onDrop(database)
+    } catch (e: TableError) {
+      throw DBError(e)
+    }
+    return true
+  }
+
+  override fun writableDatabase(): SupportSQLiteDatabase = writableDatabase
+
+  override fun querySql(sql: String): Cursor {
+    LogUtil.d(TAG, "query: $sql")
+    return readableDatabase.query(sql, null)
+  }
+
+  override fun query(queryBuilder: QueryBuilder): Cursor {
+    val sql = queryBuilder.build()
+    val params = queryBuilder.buildParameters()
+    LogUtil.d(TAG, "query: $sql", " params: " + Arrays.toString(params))
+    return readableDatabase.query(sql, params)
+  }
+
+  override fun <T : Identifiable<Int>> find(tableCrud: TableCrud<T, in SupportSQLiteDatabase>): TableCrud.Extras<T> =
+      checkTableExist(tableCrud).accept(FetchExtrasVisitor(readableDatabase)) as TableCrud.Extras<T>
+  //return checkTableExist(tableCrud).onFind(readableDatabase)
+
+  override fun <T : Identifiable<Int>> findAll(tableCrud: TableCrud<T, in SupportSQLiteDatabase>): IdentifiableList<out T> =
+      checkTableExist(tableCrud).accept(FetchAllVisitor(readableDatabase, null)) as IdentifiableList<out T>
+
+  override fun <T : Identifiable<Int>> update(t: T, tableCrud: TableCrud<T, in SupportSQLiteDatabase>): Boolean =
+      checkTableExist(tableCrud).accept(UpdateVisitor(writableDatabase, t, null)) as Boolean
+
+  override fun <T : Identifiable<Int>> update(t: T, tableCrud: TableCrud<T, in SupportSQLiteDatabase>, column: Column<*>): Boolean =
+      try {
+        checkTableExist(tableCrud).accept(UpdateVisitor(writableDatabase, t, column)) as Boolean
+      } catch (tableError: TableError) {
+        LogUtil.e(TAG, "update error", tableError)
+        false
+      }
+
+  override fun <T : Identifiable<Int>> findAll(tableCrud: TableCrud<T, in SupportSQLiteDatabase>,
+                                               vararg columns: Column<*>): IdentifiableList<out T> =
+      checkTableExist(tableCrud).accept(FetchAllVisitor(readableDatabase, columns)) as IdentifiableList<out T>
+
+  override fun <T : Identifiable<Int>> delete(tableCrud: TableCrud<T, in SupportSQLiteDatabase>, t: T): Boolean =
+      checkTableExist(tableCrud).accept(DeleteVisitor(writableDatabase, t)) as Boolean
+
+  override fun delete(tableCrud: TableCrud<*, in SupportSQLiteDatabase>, column: Column<*>): Boolean =
+      checkTableExist(tableCrud).acceptErasure(DeleteErasureVisitor(writableDatabase, column)) as Boolean
+
+  override fun delete(tableCrud: TableCrud<*, in SupportSQLiteDatabase>): Boolean =
+      checkTableExist(tableCrud).acceptErasure(DeleteErasureVisitor(writableDatabase)) as Boolean
+
+  @SafeVarargs
+  override fun delete(vararg tableCruds: TableCrud<*, in SupportSQLiteDatabase>): Boolean {
+    var delete = true
+    for (table in tableCruds) delete = delete && delete(table)
+    return delete
+  }
+
+  override fun <T> delete(tableCrud: TableCrud<*, in SupportSQLiteDatabase>, column: Column<T>, list: List<out T>): Boolean =
+      checkTableExist(tableCrud).acceptErasure(DeleteListErasureVisitor(writableDatabase, column, list)) as Boolean
+
+  override fun <T : Identifiable<Int>> save(t: T, tableCrud: TableCrud<T, in SupportSQLiteDatabase>): Long =
+      checkTableExist(tableCrud).accept(SaveVisitor(UpdateVisitor(writableDatabase, t, null), writableDatabase, t)) as Long
+
+  override fun <T : Identifiable<Int>> save(list: IdentifiableList<out T>, tableCrud: TableCrud<T, in SupportSQLiteDatabase>): Boolean =
+      checkTableExist(tableCrud).accept(SaveListVisitor(writableDatabase, list)) as Boolean
+
+  override fun deleteAll(): Boolean = synchronized(FastDatabaseImpl::class.java) {
+    var deleted = true
+    try {
+      writableDatabase.execSQL("PRAGMA foreign_keys = FALSE")
+      transact {
+        for (table in Conditions.checkNotNull(tables())) deleted = deleted && delete(checkTableExist(table))
+      }
+      writableDatabase.execSQL("PRAGMA foreign_keys = TRUE")
+    } catch (e: Exception) {
+    }
+    return deleted
+  }
+
+  override fun getLastId(tableCrud: TableCrud<*, in SupportSQLiteDatabase>): Int =
+      checkTableExist(tableCrud).acceptErasure(FetchLastIdVisitor(readableDatabase)) as Int
+
+  override fun transact(block: FastDatabase.() -> Unit) = synchronized(this) {
+    val db = writableDatabase
+    try {
+      db.beginTransaction()
+      block.invoke(this)
+      db.setTransactionSuccessful()
+    } finally {
+      db.endTransaction()
+    }
+  }
+
+  override fun <R : Any> accept(visitor: Visitor<FastDatabase, R>): R = visitor.visit(this)
+
+/**
+incomplete function body
+TODO to be revisited
+ */
+  private fun <T : Identifiable<Int>> checkTableExist(tableCrud: TableCrud<T, in SupportSQLiteDatabase>): TableCrud<T, in SupportSQLiteDatabase> =
+      Conditions.checkNotNull(tableCrud)
+
+  companion object {
+    private val TAG: String = LogUtil.makeTag(FastDatabase::class.java)
+  }
+
+  init {
+    LogUtil.d(TAG, "fast db init")
+  }
+}
\ No newline at end of file
diff --git a/database/src/main/java/promise/db/FastDatabaseOpenHelper.java b/database/src/main/java/promise/db/FastDatabaseOpenHelper.java
index d2d7eb7..6105081 100644
--- a/database/src/main/java/promise/db/FastDatabaseOpenHelper.java
+++ b/database/src/main/java/promise/db/FastDatabaseOpenHelper.java
@@ -13,82 +13,68 @@
 
 package promise.db;
 
-import android.content.Context;
-import android.database.DatabaseErrorHandler;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.sqlite.db.SupportSQLiteDatabase;
+import androidx.sqlite.db.SupportSQLiteOpenHelper;
+import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory;
 
 import promise.commons.AndroidPromise;
 
+public abstract class FastDatabaseOpenHelper extends SupportSQLiteOpenHelper.Callback {
 
-public abstract class FastDatabaseOpenHelper extends SQLiteOpenHelper {
+  private SupportSQLiteOpenHelper helper;
 
-  private Context context;
+  private Corrupt errorHandler;
 
   public FastDatabaseOpenHelper(@Nullable String name,
-                                @Nullable SQLiteDatabase.CursorFactory factory,
-                                int version,
-                                @Nullable DatabaseErrorHandler errorHandler) {
-    super(AndroidPromise.instance().context(), name, factory, version, errorHandler);
-    this.context = AndroidPromise.instance().context();
-  }
-
-  @Override
-  public final void onConfigure(SQLiteDatabase db) {
-    super.onConfigure(db);
+                                int version) {
+    super(version);
+    SupportSQLiteOpenHelper.Factory factory = new FrameworkSQLiteOpenHelperFactory();
+    SupportSQLiteOpenHelper.Configuration configuration = SupportSQLiteOpenHelper.Configuration
+        .builder(AndroidPromise.instance().context())
+        .name(name)
+        .callback(this)
+        .build();
+
+    this.helper = factory.create(configuration);
+    // super(AndroidPromise.instance().context(), name, version, errorHandler);
   }
 
-  @Override
-  public final void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-    super.onDowngrade(db, oldVersion, newVersion);
-  }
-
-  @Override
-  public final void onOpen(SQLiteDatabase db) {
-    super.onOpen(db);
-    db.execSQL("PRAGMA foreign_keys = ON");
+  public void setErrorHandler(Corrupt errorHandler) {
+    this.errorHandler = errorHandler;
   }
 
-  @Override
-  public final void setIdleConnectionTimeout(long idleConnectionTimeoutMs) {
-    super.setIdleConnectionTimeout(idleConnectionTimeoutMs);
+  public void onCorruption(@NonNull SupportSQLiteDatabase db) {
+    if (this.errorHandler != null) this.errorHandler.onCorrupt(db);
   }
 
-  @Override
-  public final void setLookasideConfig(int slotSize, int slotCount) {
-    super.setLookasideConfig(slotSize, slotCount);
-  }
 
   @Override
-  public final void setOpenParams(@NonNull SQLiteDatabase.OpenParams openParams) {
-    super.setOpenParams(openParams);
+  public final void onConfigure(SupportSQLiteDatabase db) {
+    super.onConfigure(db);
   }
 
   @Override
-  public final void setWriteAheadLoggingEnabled(boolean enabled) {
-    super.setWriteAheadLoggingEnabled(enabled);
+  public final void onDowngrade(SupportSQLiteDatabase db, int oldVersion, int newVersion) {
+    super.onDowngrade(db, oldVersion, newVersion);
   }
 
   @Override
-  public final SQLiteDatabase getReadableDatabase() {
-    return super.getReadableDatabase();
+  public final void onOpen(@NonNull SupportSQLiteDatabase db) {
+    super.onOpen(db);
+    db.execSQL("PRAGMA foreign_keys = ON");
   }
 
-  @Override
-  public final SQLiteDatabase getWritableDatabase() {
-    return super.getWritableDatabase();
+  public final SupportSQLiteDatabase getReadableDatabase() {
+    return helper.getReadableDatabase();
   }
 
-  @Override
-  public final String getDatabaseName() {
-    return super.getDatabaseName();
+  public final SupportSQLiteDatabase getWritableDatabase() {
+    return helper.getWritableDatabase();
   }
 
-  @Override
-  public final synchronized void close() {
-    super.close();
+  public String getDatabaseName() {
+    return helper.getDatabaseName();
   }
 }
diff --git a/database/src/main/java/promise/db/FastTable.kt b/database/src/main/java/promise/db/FastTable.kt
index c7dc809..6200427 100644
--- a/database/src/main/java/promise/db/FastTable.kt
+++ b/database/src/main/java/promise/db/FastTable.kt
@@ -13,12 +13,9 @@
 package promise.db
 
 import android.annotation.SuppressLint
-import android.content.ContentValues
 import android.database.Cursor
 import android.database.SQLException
-import android.database.sqlite.SQLiteDatabase
-import android.database.sqlite.SQLiteException
-import android.text.TextUtils
+import androidx.sqlite.db.SupportSQLiteDatabase
 import io.reactivex.Maybe
 import io.reactivex.Single
 import promise.commons.data.log.LogUtil
@@ -26,10 +23,8 @@ import promise.commons.model.Identifiable
 import promise.commons.model.List
 import promise.commons.model.List.fromArray
 import promise.commons.util.Conditions
-import promise.commons.util.DoubleConverter
-import promise.db.criteria.Criteria
-import promise.db.projection.Projection
-import promise.db.model.ITimeStamped
+import promise.database.Table
+import promise.model.ITimeStamped
 import promise.model.IdentifiableList
 import java.util.*
 
@@ -42,14 +37,14 @@ internal const val FOREIGN_kEYS = "foreign_keys"
  *
  * @param <T> [Identifiable] instance to be persisted by the model
 </T> */
+@Suppress("UNCHECKED_CAST")
 abstract class FastTable<T : Identifiable<Int>>
 /**
  * @param database
  */(
-    /**
-     *
-     */
-    val database: FastDatabase) : TableCrud<T, SQLiteDatabase>, DMLFunctions<T> {
+
+    val database: FastDatabase) : TableCrud<T, SupportSQLiteDatabase>, DMLFunctions<T> {
+
   companion object {
     /**
      * The create prefix in a prefix for queries that create a table structure
@@ -97,6 +92,20 @@ abstract class FastTable<T : Identifiable<Int>>
 
   }
 
+  override fun single(cursor: Cursor): T {
+    cursor.moveToFirst()
+    return deserialize(cursor)
+  }
+
+  override fun collection(cursor: Cursor): IdentifiableList<out T> {
+    val collection = IdentifiableList<T>()
+    while (cursor.moveToNext() && !cursor.isClosed) {
+      collection.add(getWithId(cursor))
+    }
+    cursor.close()
+    return collection
+  }
+
   open fun createEntityInstance(): T {
     throw RuntimeException("STUB ONLY SUPPORTED FOR ACTIVE RECORD ENTITIES")
   }
@@ -115,7 +124,7 @@ abstract class FastTable<T : Identifiable<Int>>
   /**
    * The specific tag for logging in this table
    */
-  private val TAG: String = LogUtil.makeTag(FastTable::class.java) + name
+  override val TAG: String = LogUtil.makeTag(FastTable::class.java) + name
 
   /**
    * Temporary data holder for holding data during dangerous table structure changes
@@ -167,18 +176,17 @@ abstract class FastTable<T : Identifiable<Int>>
     var columnNames = ""
     var indexSql = "("
     val indexes = compoundIndex.indexes
-    indexes.forEachIndexed { i, index ->
+    indexes.forEachIndexed { i: Int, index: Table.Index ->
       columnNames = if (i == indexes.size - 1) columnNames + index.columnName else "$columnNames${index.columnName}_"
       indexSql = if (i == indexes.size - 1) indexSql + index.columnName else "$indexSql${index.columnName}, "
     }
     indexSql = "$indexSql);"
     return if (compoundIndex.unique) {
       "CREATE UNIQUE INDEX IF NOT EXISTS idx_$columnNames ON $nameOfTable $indexSql"
-    }
-    else "CREATE INDEX IF NOT EXISTS idx_$columnNames ON $nameOfTable $indexSql"
+    } else "CREATE INDEX IF NOT EXISTS idx_$columnNames ON $nameOfTable $indexSql"
   }
 
-  private fun generateIndexQuery(index: Table.Index): String {
+  private fun generateIndexQueryForTableIndex(index: Table.Index): String {
     val indexSql = "(${index.columnName});"
     return "CREATE INDEX IF NOT EXISTS idx_${index.columnName} ON $nameOfTable $indexSql"
   }
@@ -188,7 +196,7 @@ abstract class FastTable<T : Identifiable<Int>>
     return "CREATE INDEX IF NOT EXISTS idx_${index} ON $nameOfTable $indexSql"
   }
 
-  fun addForeignKet(x: SQLiteDatabase,
+  fun addForeignKet(x: SupportSQLiteDatabase,
                     column: Column<*>,
                     referenceTable: String,
                     referenceColumn: Column<*>) {
@@ -215,7 +223,7 @@ abstract class FastTable<T : Identifiable<Int>>
    * @throws TableError if theirs a query error
    */
   @Throws(TableError::class)
-  override fun onCreate(x: SQLiteDatabase): Boolean {
+  override fun onCreate(x: SupportSQLiteDatabase): Boolean {
     var sql = CREATE_PREFIX
     /*
      * add the opening braces after select prefix, see {@link FastTable#CREATE_PREFIX}
@@ -259,9 +267,9 @@ abstract class FastTable<T : Identifiable<Int>>
    * @throws TableError
    */
   @Throws(TableError::class)
-  override fun onUpgrade(x: SQLiteDatabase, v1: Int, v2: Int) {
+  override fun onUpgrade(x: SupportSQLiteDatabase, v1: Int, v2: Int) {
     val builder: QueryBuilder = queryBuilder()
-    @SuppressLint("Recycle") val c = x.rawQuery(builder.build(), builder.buildParameters())
+    @SuppressLint("Recycle") val c = x.query(builder.build(), builder.buildParameters())
     val set: Set<String> = HashSet(fromArray(*c.columnNames))
     if (!set.contains(createdAt.name)) addColumns(x, createdAt)
     if (!set.contains(updatedAt.name)) addColumns(x, updatedAt)
@@ -275,7 +283,7 @@ abstract class FastTable<T : Identifiable<Int>>
    * @throws TableError if theirs an sql error
    */
   @Throws(TableError::class)
-  fun addColumns(database: SQLiteDatabase, vararg columns: Column<*>) {
+  fun addColumns(database: SupportSQLiteDatabase, vararg columns: Column<*>) {
     for (column in columns) {
       val alterSql = "$ALTER_COMMAND `$name` ADD $column;"
       try {
@@ -288,7 +296,7 @@ abstract class FastTable<T : Identifiable<Int>>
   }
 
   @Throws(TableError::class)
-  private fun addCompoundIndices(database: SQLiteDatabase, indexes: Array<Table.CompoundIndex>) {
+  private fun addCompoundIndices(database: SupportSQLiteDatabase, indexes: Array<Table.CompoundIndex>) {
     indexes.forEach {
       val indexSql = generateCompoundIndexQuery(it)
       LogUtil.d(TAG, indexSql)
@@ -296,16 +304,16 @@ abstract class FastTable<T : Identifiable<Int>>
     }
   }
 
-  private fun addIndices(database: SQLiteDatabase, indexes: Array<Table.Index>) {
+  private fun addIndices(database: SupportSQLiteDatabase, indexes: Array<Table.Index>) {
     indexes.forEach {
-      val indexSql = generateIndexQuery(it)
+      val indexSql = generateIndexQueryForTableIndex(it)
       LogUtil.d(TAG, indexSql)
       database.execSQL(indexSql)
     }
   }
 
-  fun addIndex(database: SQLiteDatabase, index: String) {
-    val indexSql = generateIndexQuery(index)
+  fun addIndex(database: SupportSQLiteDatabase, index: String) {
+    val indexSql: String = generateIndexQuery(index)
     LogUtil.d(TAG, indexSql)
     database.execSQL(indexSql)
   }
@@ -319,9 +327,22 @@ abstract class FastTable<T : Identifiable<Int>>
    * @throws TableError if theirs an sql error
    */
   @Throws(TableError::class)
-  fun dropColumns(database: SQLiteDatabase, vararg columns: Column<*>): Boolean {
+  fun dropColumns(database: SupportSQLiteDatabase, vararg columns: String): Boolean {
+    for (column in columns) {
+      val alterSql = "$ALTER_COMMAND `$name` DROP COLUMN $column;"
+      try {
+        database.execSQL(alterSql)
+      } catch (e: SQLException) {
+        throw TableError(e)
+      }
+    }
+    return true
+  }
+
+  @Throws(TableError::class)
+  fun renameColumns(database: SupportSQLiteDatabase, vararg columns: Pair<String, String>): Boolean {
     for (column in columns) {
-      val alterSql = ALTER_COMMAND + " `" + name + "` " + "DROP COLUMN " + column.name + ";"
+      val alterSql = "$ALTER_COMMAND `$name` SET COLUMN ${column.first} ${column.second};"
       try {
         database.execSQL(alterSql)
       } catch (e: SQLException) {
@@ -393,12 +414,12 @@ abstract class FastTable<T : Identifiable<Int>>
   /**
    *
    */
-  override  fun query(queryBuilder: QueryBuilder): Cursor = database.query(queryBuilder)
+  override fun query(queryBuilder: QueryBuilder): Cursor = database.query(queryBuilder)
 
   /**
    *
    */
-  override  fun queryAsync(queryBuilder: QueryBuilder): Single<Cursor> =
+  override fun queryAsync(queryBuilder: QueryBuilder): Single<Cursor> =
       reactiveDatabase.queryAsync(queryBuilder)
 
   /**
@@ -409,41 +430,41 @@ abstract class FastTable<T : Identifiable<Int>>
   /**
    * @return
    */
-  override  fun findById(idLong: Long): T? = database.find(this).where(id.with(idLong.toInt())).first()
+  override fun findById(idLong: Long): T? = database.find(this).where(id.with(idLong.toInt())).first()
 
   /**
    * @return
    */
-  override  fun findOne(vararg columns: Column<*>): T? = database.find(this).where(*columns).first()
+  override fun findOne(vararg columns: Column<*>): T? = database.find(this).where(*columns).first()
 
   /**
    * @return
    * @throws TableError
    */
   @Throws(TableError::class)
-  override  fun findAsync(): ReactiveTable.Extras<T> = reactiveDatabase.readAsync(this)
+  override fun findAsync(): ReactiveTable.Extras<T> = reactiveDatabase.readAsync(this)
 
   /**
    * @return
    */
-  override  fun findAll(): IdentifiableList<out T> = database.findAll(this)
+  override fun findAll(): IdentifiableList<out T> = database.findAll(this)
 
   /**
    * @return
    */
-  override  fun findAllAsync(): Maybe<IdentifiableList<out T>> = reactiveDatabase.readAllAsync(this)
+  override fun findAllAsync(): Maybe<IdentifiableList<out T>> = reactiveDatabase.readAllAsync(this)
 
   /**
    * @param column
    * @return
    */
-  override  fun findAll(vararg column: Column<*>): IdentifiableList<out T> = database.findAll(this, *column)
+  override fun findAll(vararg column: Column<*>): IdentifiableList<out T> = database.findAll(this, *column)
 
   /**
    * @param column
    * @return
    */
-  override  fun findAllAsync(vararg column: Column<*>): Maybe<IdentifiableList<out T>> =
+  override fun findAllAsync(vararg column: Column<*>): Maybe<IdentifiableList<out T>> =
       reactiveDatabase.readAllAsync(this, *column)
 
   /**
@@ -456,19 +477,19 @@ abstract class FastTable<T : Identifiable<Int>>
    * @param column
    * @return
    */
-  override  fun deleteAsync(column: Column<*>): Maybe<Boolean> = reactiveDatabase.deleteAsync(this, column)
+  override fun deleteAsync(column: Column<*>): Maybe<Boolean> = reactiveDatabase.deleteAsync(this, column)
 
   /**
    * @param t
    * @return
    */
-  override  fun delete(t: T): Boolean = database.delete(this, t)
+  override fun delete(t: T): Boolean = database.delete(this, t)
 
   /**
    * @param t
    * @return
    */
-  override  fun deleteAsync(t: T): Maybe<Boolean> = reactiveDatabase.deleteAsync(this, t)
+  override fun deleteAsync(t: T): Maybe<Boolean> = reactiveDatabase.deleteAsync(this, t)
 
   /**
    * @param column
@@ -485,23 +506,23 @@ abstract class FastTable<T : Identifiable<Int>>
    * @param <C>
    * @return
   </C> */
-  override  fun <C> deleteAsync(column: Column<C>, list: List<out C>): Maybe<Boolean> =
+  override fun <C> deleteAsync(column: Column<C>, list: List<out C>): Maybe<Boolean> =
       reactiveDatabase.deleteAsync(this, column, list)
 
   /**
    * @return
    */
-  override  fun clear(): Boolean = database.delete(this)
+  override fun clear(): Boolean = database.delete(this)
 
   /**
    * @return
    */
-  override  fun clearAsync(): Maybe<Boolean> = reactiveDatabase.deleteAsync(this)
+  override fun clearAsync(): Maybe<Boolean> = reactiveDatabase.deleteAsync(this)
 
   /**
    * @return
    */
-  override  val lastId: Int
+  override val lastId: Int
     get() = database.getLastId(this)
 
   /**
@@ -513,7 +534,7 @@ abstract class FastTable<T : Identifiable<Int>>
   /**
    *
    */
-  inline fun transact(block: FastTable<T>.() -> Unit) = synchronized(this) {
+  override fun transact(block: FastTable<T>.() -> Unit) = synchronized(this) {
     val db = database.writableDatabase
     try {
       db.beginTransaction()
@@ -524,196 +545,6 @@ abstract class FastTable<T : Identifiable<Int>>
     }
   }
 
-  /**
-   * more verbose readAsync operation against the database
-   *
-   * @param x readable sql database
-   * @return an extras instance for more concise reads
-   */
-   override fun onFind(x: SQLiteDatabase): TableCrud.Extras<T> =
-      object : QueryExtras<T>(x) {
-        /**
-         *
-         */
-        override fun serialize(t: T): ContentValues = this@FastTable.serialize(t)
-
-        /**
-         *
-         */
-        override fun deserialize(e: Cursor): T = this@FastTable.deserialize(e)
-      }
-
-  /**
-   * readAsync all the rows in the database
-   *
-   * @param x readable sql database
-   * @param close    close the connection if this is true
-   * @return a list of records
-   */
-  override fun onFindAll(x: SQLiteDatabase, close: Boolean): IdentifiableList<out T> {
-    val builder: QueryBuilder = queryBuilder()
-    val cursor: Cursor
-    return try {
-      cursor = x.rawQuery(builder.build(), builder.buildParameters())
-      val ts = IdentifiableList<T>()
-      while (cursor.moveToNext() && !cursor.isClosed) ts.add(getWithId(cursor))
-      cursor.close()
-      /*if (close) database.close();*/ts
-    } catch (e: SQLiteException) {
-      IdentifiableList<T>()
-    }
-  }
-
-  /**
-   * readAsync the rows following the criteria specified in the column provided
-   * for each of the columns
-   * if [Column.value] is not null, filter with the value
-   * if [Column.order] is not null, order by that column too
-   *
-   * @param x readable sql database
-   * @param column  the fields to infer where and order by conditions
-   * @return list of records satisfying the criteria
-   */
-  override fun onFindAll(x: SQLiteDatabase, vararg column: Column<*>): IdentifiableList<out T> {
-    val builder: QueryBuilder = queryBuilder().takeAll()
-    column.forEach {
-      if (it.value() != null) builder.whereAnd(Criteria.equals(it, it.value()))
-      if (it.order() != null) {
-        if (it.order() == Column.DESCENDING) {
-          builder.orderByDescending(it)
-        } else builder.orderByAscending(it)
-      }
-    }
-    val cursor = x.rawQuery(builder.build(), builder.buildParameters())
-    val ts = IdentifiableList<T>()
-    while (cursor.moveToNext() && !cursor.isClosed) ts.add(getWithId(cursor))
-    cursor.close()
-    /*database.close();*/return ts
-  }
-
-  /**
-   * updateAsync a row in the table
-   *
-   * @param t        instance to updateAsync
-   * @param x writable sql database
-   * @param column   field with where condition to updateAsync
-   * @return true if instance is updated
-   */
-  @Throws(TableError::class)
-  override fun onUpdate(t: T, x: SQLiteDatabase, column: Column<*>): Boolean {
-    val whereArg: String = if (column.operand != null && column.value() != null)
-      column.name + column.operand + column.value()
-    else throw TableError("Cant update the record, missing updating information")
-    val values = serialize(t)
-    values.put(updatedAt.name, System.currentTimeMillis())
-    return x.update(name, values, whereArg, null) >= 0
-  }
-
-  /**
-   * updated an instance with an id value more than zero
-   *
-   * @param t        the instance to updateAsync
-   * @param x writable sql database
-   * @return true if updated
-   */
-  override fun onUpdate(t: T, x: SQLiteDatabase): Boolean = try {
-    onUpdate(t, x, id.with(t.getId()))
-  } catch (tableError: TableError) {
-    false
-  }
-
-  /**
-   * deletes multiple rows from the table where the column matches all the
-   * given values in list
-   *
-   * @param x writable sql database
-   * @param column   the matching column
-   * @param list     values to match with
-   * @param <C>      the type of matching, must not be derived data type
-   * @return true if all rows are deleted
-  </C> */
-  override fun <C> onDelete(x: SQLiteDatabase, column: Column<C>, list: List<out C>): Boolean {
-    val deleted: Boolean
-    var where = ""
-    var i = 0
-    val listSize = list.size
-    while (i < listSize) {
-      val c = list[i]
-      where = if (i == listSize - 1) {
-        column.name + " " + column.operand + " " + c
-      } else column.name + " " + column.operand + " " + c + " OR "
-      i++
-    }
-    deleted = x.delete(name, where, null) >= 0
-    return deleted
-  }
-
-  /**
-   * deleteAsync a row in the table matching condition in the column
-   *
-   * @param x writable sql database
-   * @param column   field to match
-   * @return true if row is deleted
-   */
-  override fun onDelete(x: SQLiteDatabase, column: Column<*>): Boolean {
-    val where = column.name + column.operand + column.value()
-    return x.delete(name, where, null) >= 0
-  }
-
-  /**
-   * deleteAsync an instance from the table
-   *
-   * @param t        instance to be removed must have an id more than zero
-   * @param x writable sql database
-   * @return true if item is deleted
-   */
-  override fun onDelete(t: T, x: SQLiteDatabase): Boolean =
-      onDelete(x, id.with(t.getId()))
-
-  /**
-   * deleteAsync all rows in the table
-   *
-   * @param x writable sql database
-   * @return true if all rows are deleted
-   */
-  override fun onDelete(x: SQLiteDatabase): Boolean =
-      !TextUtils.isEmpty(name) && x.delete(name, null, null) >= 0
-
-  /**
-   * saveAsync an instance to the database
-   * serialize it to content values
-   *
-   * @param t        instance to be saved
-   * @param x writable sql database
-   * @return id of the row affected
-   */
-  override fun onSave(t: T, x: SQLiteDatabase): Long {
-    if (t.getId() != 0 && onUpdate(t, x)) return t.getId().toLong()
-    val values = serialize(t)
-    values.put(createdAt.name, System.currentTimeMillis())
-    values.put(updatedAt.name, System.currentTimeMillis())
-    return x.insert(name, null, values)
-  }
-
-  /**
-   * saveAsync a list of items in the database
-   *
-   * @param list     items to be saved
-   * @param x writable sql database
-   * @return true if all the items are saved
-   */
-  override fun onSave(list: IdentifiableList<out T>, x: SQLiteDatabase): Boolean {
-    var saved = true
-    var i = 0
-    val listSize = list.size
-    while (i < listSize) {
-      val t = list[i]
-      saved = saved && onSave(t, x) > 0
-      i++
-    }
-    /*if (close) database.close();*/return saved
-  }
-
   /**
    * drop this table from the database
    *
@@ -722,7 +553,7 @@ abstract class FastTable<T : Identifiable<Int>>
    * @throws TableError if theirs an sql error
    */
   @Throws(TableError::class)
-  override fun onDrop(x: SQLiteDatabase): Boolean {
+  override fun onDrop(x: SupportSQLiteDatabase): Boolean {
     val sql = "$DROP_PREFIX$name;"
     try {
       x.execSQL(sql)
@@ -732,27 +563,14 @@ abstract class FastTable<T : Identifiable<Int>>
     return true
   }
 
-  /**
-   * get the last id of the last row in the table
-   * uses projection to count the id column as num
-   *
-   * @param x readable sql database
-   * @return the id
-   */
-  override fun onGetLastId(x: SQLiteDatabase): Int {
-    val builder: QueryBuilder = queryBuilder().select(Projection.count(id).`as`("num"))
-    @SuppressLint("Recycle") val cursor = x.rawQuery(builder.build(), builder.buildParameters())
-    return cursor.getInt(id.index)
-  }
-
   /**
    * backup all the items in the table during dangerous upgrdes
    *
    * @param database readable database instance
    */
-  fun backup(database: SQLiteDatabase) {
+  fun backup(database: SupportSQLiteDatabase) {
     backup = IdentifiableList()
-    backup!!.addAll(onFindAll(database, false))
+    backup!!.addAll(accept(FetchAllVisitor(database, null)) as IdentifiableList<T>)
   }
 
   /**
@@ -760,9 +578,9 @@ abstract class FastTable<T : Identifiable<Int>>
    *
    * @param database writable database
    */
-  fun restore(database: SQLiteDatabase) {
+  fun restore(database: SupportSQLiteDatabase) {
     if (backup != null && !backup!!.isEmpty()) {
-      onSave(backup!!, database)
+      accept(SaveListVisitor<T>(database, backup!!))
       backup!!.clear()
     }
     backup = null
@@ -787,323 +605,4 @@ abstract class FastTable<T : Identifiable<Int>>
     return t
   }
 
-  /**
-   * This class contains special queries for reading from the table
-   * see [TimeAware] for encapsulating id and timestamps
-   * see [DoubleConverter] for serializing and de-serializing
-   *
-   * @param <Q> The type of the items in the table
-  </Q> */
-  private abstract inner class QueryExtras<Q : Identifiable<Int>> internal constructor(
-      /**
-       * the database instance to readAsync fromm
-       */
-      private val database: SQLiteDatabase) : TableCrud.Extras<Q>, DoubleConverter<Q, Cursor, ContentValues> {
-
-    fun database(): SQLiteDatabase = database
-
-    /**
-     * get a record pre populated with id and timestamps from each readAsync
-     *
-     * @param cursor serialized version of Q
-     * @return Q the de-serialized output of reading the cursor
-     */
-    fun getWithId(cursor: Cursor): Q {
-      var t = deserialize(cursor)
-      t.setId(cursor.getInt(id.getIndex(cursor)))
-      if (t is ITimeStamped) {
-        val iTimeAware = t as ITimeStamped
-        iTimeAware.setCreatedAt(cursor.getInt(createdAt.getIndex(cursor)).toLong())
-        iTimeAware.setUpdatedAt(cursor.getInt(updatedAt.getIndex(cursor)).toLong())
-        t = iTimeAware as Q
-      }
-      if (t is ActiveRecord<*>) (t as ActiveRecord<T>).table = this@FastTable
-      return t
-    }
-
-    /**
-     * get the first record in the table
-     *
-     * @return the first records or null if theirs none in the table
-     */
-    override fun first(): Q? {
-      val cursor: Cursor
-      return try {
-        val builder: QueryBuilder = queryBuilder().take(1)
-        cursor = database.rawQuery(builder.build(), builder.buildParameters())
-        cursor.moveToFirst()
-        getWithId(cursor)
-      } catch (e: SQLiteException) {
-        LogUtil.e(TAG, e)
-        null
-      }
-    }
-
-    /**
-     * get the last record in the table
-     *
-     * @return an item or null if theirs none stored in the table
-     */
-    override fun last(): Q? {
-      val cursor: Cursor
-      return try {
-        val builder: QueryBuilder = queryBuilder().orderByDescending(id).take(1)
-        cursor = database.rawQuery(builder.build(), builder.buildParameters())
-        cursor.moveToFirst()
-        getWithId(cursor)
-      } catch (e: SQLiteException) {
-        LogUtil.e(TAG, e)
-        null
-      }
-    }
-
-    /**
-     * get all the items in the table
-     *
-     * @return the items or an empty list if theirs none
-     */
-    override fun all(): IdentifiableList<out Q> {
-      val cursor: Cursor
-      return try {
-        val builder: QueryBuilder = queryBuilder().takeAll()
-        cursor = database.rawQuery(builder.build(), builder.buildParameters())
-        val ts = IdentifiableList<Q>()
-        while (cursor.moveToNext() && !cursor.isClosed) ts.add(getWithId(cursor))
-        ts
-      } catch (e: SQLiteException) {
-        IdentifiableList<Q>()
-      }
-    }
-
-    /**
-     * readAsync the top items in the table
-     *
-     * @param limit the number of records to readAsync
-     * @return a list of the items
-     */
-    override fun limit(limit: Int): IdentifiableList<out Q> {
-      val cursor: Cursor
-      return try {
-        val builder: QueryBuilder = queryBuilder().take(limit)
-        cursor = database.rawQuery(builder.build(), builder.buildParameters())
-        val ts = IdentifiableList<Q>()
-        while (cursor.moveToNext() && !cursor.isClosed) ts.add(getWithId(cursor))
-        ts
-      } catch (e: SQLiteException) {
-        LogUtil.e(TAG, e)
-        IdentifiableList<Q>()
-      }
-    }
-
-    /**
-     * reads the records between the skip and limit in the table
-     *
-     * @param skip  of set from the top to not readAsync
-     * @param limit items to load after skip
-     * @return a list of records
-     */
-    override fun paginate(skip: Int, limit: Int): IdentifiableList<out Q> {
-      val cursor: Cursor
-      return try {
-        val builder: QueryBuilder = queryBuilder().take(limit).skip(skip)
-        cursor = database.rawQuery(builder.build(), builder.buildParameters())
-        val ts = IdentifiableList<Q>()
-        while (cursor.moveToNext() && !cursor.isClosed) ts.add(getWithId(cursor))
-        ts
-      } catch (e: SQLiteException) {
-        LogUtil.e(TAG, e)
-        IdentifiableList<Q>()
-      }
-    }
-
-    override fun paginateDescending(skip: Int, limit: Int): IdentifiableList<out Q> {
-      val cursor: Cursor
-      return try {
-        val builder: QueryBuilder = queryBuilder().orderByDescending(id).take(limit).skip(skip)
-        cursor = database.rawQuery(builder.build(), builder.buildParameters())
-        val ts = IdentifiableList<Q>()
-        while (cursor.moveToNext() && !cursor.isClosed) ts.add(getWithId(cursor))
-        ts
-      } catch (e: SQLiteException) {
-        LogUtil.e(TAG, e)
-        IdentifiableList<Q>()
-      }
-    }
-
-    /**
-     * gets all items that match in between the int left and right
-     *
-     * @param column column to match between
-     * @param a      lower between bound
-     * @param b      upper between bound
-     * @return a list of items
-     */
-    override fun between(column: Column<Number>, a: Number, b: Number): IdentifiableList<out Q> {
-      val cursor: Cursor
-      return try {
-        val builder: QueryBuilder = queryBuilder().takeAll().whereAnd(Criteria.between(column, a, b))
-        cursor = database.rawQuery(builder.build(), builder.buildParameters())
-        val ts = IdentifiableList<Q>()
-        while (cursor.moveToNext() && !cursor.isClosed) ts.add(getWithId(cursor))
-        ts
-      } catch (e: SQLiteException) {
-        LogUtil.e(TAG, e)
-        IdentifiableList<Q>()
-      }
-    }
-
-    /**
-     * gets all items matching the multiple columns
-     *
-     * @param column fields to match their values
-     * @return a list of items
-     */
-    override fun where(vararg column: Column<*>): IdentifiableList<out Q> {
-      val cursor: Cursor
-      return try {
-        val builder: QueryBuilder = queryBuilder().takeAll()
-        for (column1 in column) if (column1.value() != null) builder.whereAnd(Criteria.equals(column1, column1.value()))
-        cursor = database.rawQuery(builder.build(), builder.buildParameters())
-        val ts = IdentifiableList<Q>()
-        while (cursor.moveToNext() && !cursor.isClosed) ts.add(getWithId(cursor))
-        ts
-      } catch (e: SQLiteException) {
-        LogUtil.e(TAG, e)
-        IdentifiableList<Q>()
-      }
-    }
-
-    /**
-     * gets all the items matching not in any of the columns
-     *
-     * @param column field to match
-     * @param bounds not in bounds
-     * @return a list of items
-     */
-    @SafeVarargs
-    override fun notIn(column: Column<Number>, vararg bounds: Number): IdentifiableList<out Q> {
-      val cursor: Cursor
-      val items = arrayOfNulls<Any>(bounds.size)
-      System.arraycopy(bounds, 0, items, 0, bounds.size)
-      val builder: QueryBuilder = queryBuilder().takeAll()
-          .whereAnd(Criteria.notIn(column, items))
-      return try {
-        cursor = database.rawQuery(builder.build(), builder.buildParameters())
-        val ts = IdentifiableList<Q>()
-        while (cursor.moveToNext() && !cursor.isClosed) {
-          val t = getWithId(cursor)
-          ts.add(t)
-        }
-        cursor.close()
-        /*database.close();*/ts
-      } catch (e: SQLiteException) {
-        LogUtil.e(TAG, e)
-        IdentifiableList<Q>()
-      }
-    }
-
-    /**
-     * get all the rows where the column is like the columns values
-     *
-     * @param column the fields to compute like from
-     * @return a list of columns
-     */
-    override fun like(vararg column: Column<*>): IdentifiableList<out Q> {
-      val cursor: Cursor
-      val builder: QueryBuilder = queryBuilder().takeAll()
-      for (column1 in column) builder.whereAnd(Criteria.contains(column1, column1.value().toString()))
-      return try {
-        cursor = database.rawQuery(builder.build(), builder.buildParameters())
-        val ts = IdentifiableList<Q>()
-        while (cursor.moveToNext() && !cursor.isClosed) {
-          val t = getWithId(cursor)
-          ts.add(t)
-        }
-        cursor.close()
-        /*database.close();*/ts
-      } catch (e: SQLiteException) {
-        LogUtil.e(TAG, e)
-        IdentifiableList<Q>()
-      }
-    }
-
-    /**
-     * get all the rows in the oder specified by the column
-     *
-     * @param column field to order by
-     * @return a list of ordered items
-     */
-    override fun orderBy(column: Column<*>): IdentifiableList<out Q> {
-      val cursor: Cursor
-      val builder: QueryBuilder = queryBuilder().takeAll()
-      if (column.order() == Column.DESCENDING) {
-        builder.orderByDescending(column)
-      } else builder.orderByAscending(column)
-      return try {
-        cursor = database.rawQuery(builder.build(), builder.buildParameters())
-        val ts = IdentifiableList<Q>()
-        while (cursor.moveToNext() && !cursor.isClosed) {
-          val t = getWithId(cursor)
-          ts.add(t)
-        }
-        cursor.close()
-        /*database.close();*/ts
-      } catch (e: SQLiteException) {
-        LogUtil.e(TAG, e)
-        IdentifiableList<Q>()
-      }
-    }
-
-    /**
-     * gets all the items grouped by the column
-     *
-     * @param column field to group by
-     * @return a list of grouped items
-     */
-    override fun groupBy(column: Column<*>): IdentifiableList<out Q> {
-      val cursor: Cursor
-      val builder: QueryBuilder = queryBuilder().takeAll().groupBy(column)
-      return try {
-        cursor = database.rawQuery(builder.build(), builder.buildParameters())
-        val ts = IdentifiableList<Q>()
-        while (cursor.moveToNext() && !cursor.isClosed) {
-          val t = getWithId(cursor)
-          ts.add(t)
-        }
-        cursor.close()
-        /*database.close();*/ts
-      } catch (e: SQLiteException) {
-        LogUtil.e(TAG, e)
-        IdentifiableList<Q>()
-      }
-    }
-
-    /**
-     * gets all the items grouped and ordered by the two columns
-     *
-     * @param column  group by field
-     * @param column1 order by fields
-     * @return a list of items
-     */
-    override fun groupAndOrderBy(column: Column<*>, column1: Column<*>): IdentifiableList<out Q> {
-      val cursor: Cursor
-      val builder: QueryBuilder = queryBuilder().takeAll().groupBy(column)
-      if (column1.order() == Column.DESCENDING) {
-        builder.orderByDescending(column1)
-      } else builder.orderByAscending(column1)
-      return try {
-        cursor = database.rawQuery(builder.build(), builder.buildParameters())
-        val ts = IdentifiableList<Q>()
-        while (cursor.moveToNext() && !cursor.isClosed) {
-          val t = getWithId(cursor)
-          ts.add(t)
-        }
-        cursor.close()
-        /*database.close();*/ts
-      } catch (e: SQLiteException) {
-        LogUtil.e(TAG, e)
-        IdentifiableList<Q>()
-      }
-    }
-  }
 }
\ No newline at end of file
diff --git a/database/src/main/java/promise/db/FetchVisitors.kt b/database/src/main/java/promise/db/FetchVisitors.kt
new file mode 100644
index 0000000..323a24c
--- /dev/null
+++ b/database/src/main/java/promise/db/FetchVisitors.kt
@@ -0,0 +1,391 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.db
+
+import android.annotation.SuppressLint
+import android.content.ContentValues
+import android.database.Cursor
+import android.database.sqlite.SQLiteException
+import androidx.sqlite.db.SupportSQLiteDatabase
+import promise.commons.data.log.LogUtil
+import promise.commons.model.Identifiable
+import promise.commons.util.DoubleConverter
+import promise.db.criteria.Criteria
+import promise.db.projection.Projection
+import promise.model.ITimeStamped
+import promise.model.IdentifiableList
+import promise.utils.Visitor
+
+internal class FetchLastIdVisitor(private val x: SupportSQLiteDatabase) : Visitor<TableCrud<*, in SupportSQLiteDatabase>, Int> {
+  override fun visit(t: TableCrud<*, in SupportSQLiteDatabase>): Int {
+    val builder: QueryBuilder = t.queryBuilder().select(Projection.count(FastTable.id).`as`("num"))
+    @SuppressLint("Recycle") val cursor = x.query(builder.build(), builder.buildParameters())
+    return cursor.getInt(FastTable.id.index)
+  }
+}
+
+internal class FetchAllVisitor<T : Identifiable<Int>>(private val x: SupportSQLiteDatabase,
+                                             private val columns: Array<out Column<*>>? = null) : Visitor<TableCrud<T, in SupportSQLiteDatabase>, IdentifiableList<out T>> {
+
+  override fun visit(t: TableCrud<T, in SupportSQLiteDatabase>): IdentifiableList<out T> {
+    val builder: QueryBuilder = t.queryBuilder()
+    columns?.forEach {
+      if (it.value() != null) builder.whereAnd(Criteria.equals(it, it.value()))
+      if (it.order() != null) {
+        if (it.order() == Column.DESCENDING) {
+          builder.orderByDescending(it)
+        } else builder.orderByAscending(it)
+      }
+    }
+    val cursor: Cursor
+    return try {
+      cursor = x.query(builder.build(), builder.buildParameters())
+      t.collection(cursor)
+    } catch (e: SQLiteException) {
+      IdentifiableList()
+    }
+  }
+}
+
+@Suppress("KDocUnresolvedReference")
+internal class FetchExtrasVisitor<T : Identifiable<Int>>(private val x: SupportSQLiteDatabase) : Visitor<TableCrud<T, in SupportSQLiteDatabase>, TableCrud.Extras<T>> {
+
+  override fun visit(t: TableCrud<T, in SupportSQLiteDatabase>): TableCrud.Extras<T> =
+      object : QueryExtras<T>(x, t) {
+        override fun serialize(instance: T): ContentValues = t.serialize(instance)
+        override fun deserialize(e: Cursor): T = t.deserialize(e)
+      }
+
+  /**
+   * This class contains special queries for reading from the table
+   * see [TimeAware] for encapsulating id and timestamps
+   * see [DoubleConverter] for serializing and de-serializing
+   *
+   * @param <Q> The type of the items in the table
+  </Q> */
+  @Suppress("UNCHECKED_CAST")
+  private abstract inner class QueryExtras<Q : Identifiable<Int>> constructor(
+      /**
+       * the database instance to readAsync fromm
+       */
+      private val database: SupportSQLiteDatabase,
+      private val fastTable: TableCrud<T, in SupportSQLiteDatabase>) : TableCrud.Extras<Q>, DoubleConverter<Q, Cursor, ContentValues> {
+
+    fun database(): SupportSQLiteDatabase = database
+
+    /**
+     * get a record pre populated with id and timestamps from each readAsync
+     *
+     * @param cursor serialized version of Q
+     * @return Q the de-serialized output of reading the cursor
+     */
+    fun getWithId(cursor: Cursor): Q {
+      var t = deserialize(cursor)
+      t.setId(cursor.getInt(FastTable.id.getIndex(cursor)))
+      if (t is ITimeStamped) {
+        val iTimeAware = t as ITimeStamped
+        iTimeAware.setCreatedAt(cursor.getInt(FastTable.createdAt.getIndex(cursor)).toLong())
+        iTimeAware.setUpdatedAt(cursor.getInt(FastTable.updatedAt.getIndex(cursor)).toLong())
+        t = iTimeAware as Q
+      }
+      if (t is ActiveRecord<*>) (t as ActiveRecord<T>).table = fastTable as FastTable<T>
+      return t
+    }
+
+    /**
+     * get the first record in the table
+     *
+     * @return the first records or null if theirs none in the table
+     */
+    override fun first(): Q? {
+      val cursor: Cursor
+      return try {
+        val builder: QueryBuilder = fastTable.queryBuilder().take(1)
+        cursor = database.query(builder.build(), builder.buildParameters())
+        cursor.moveToFirst()
+        getWithId(cursor)
+      } catch (e: SQLiteException) {
+        LogUtil.e(fastTable.TAG, e)
+        null
+      }
+    }
+
+    /**
+     * get the last record in the table
+     *
+     * @return an item or null if theirs none stored in the table
+     */
+    override fun last(): Q? {
+      val cursor: Cursor
+      return try {
+        val builder: QueryBuilder = fastTable.queryBuilder().orderByDescending(FastTable.id).take(1)
+        cursor = database.query(builder.build(), builder.buildParameters())
+        cursor.moveToFirst()
+        getWithId(cursor)
+      } catch (e: SQLiteException) {
+        LogUtil.e(fastTable.TAG, e)
+        null
+      }
+    }
+
+    /**
+     * get all the items in the table
+     *
+     * @return the items or an empty list if theirs none
+     */
+    override fun all(): IdentifiableList<out Q> {
+      val cursor: Cursor
+      return try {
+        val builder: QueryBuilder = fastTable.queryBuilder().takeAll()
+        cursor = database.query(builder.build(), builder.buildParameters())
+        val ts = IdentifiableList<Q>()
+        while (cursor.moveToNext() && !cursor.isClosed) ts.add(getWithId(cursor))
+        ts
+      } catch (e: SQLiteException) {
+        IdentifiableList()
+      }
+    }
+
+    /**
+     * readAsync the top items in the table
+     *
+     * @param limit the number of records to readAsync
+     * @return a list of the items
+     */
+    override fun limit(limit: Int): IdentifiableList<out Q> {
+      val cursor: Cursor
+      return try {
+        val builder: QueryBuilder = fastTable.queryBuilder().take(limit)
+        cursor = database.query(builder.build(), builder.buildParameters())
+        val ts = IdentifiableList<Q>()
+        while (cursor.moveToNext() && !cursor.isClosed) ts.add(getWithId(cursor))
+        ts
+      } catch (e: SQLiteException) {
+        LogUtil.e(fastTable.TAG, e)
+        IdentifiableList()
+      }
+    }
+
+    /**
+     * reads the records between the skip and limit in the table
+     *
+     * @param skip  of set from the top to not readAsync
+     * @param limit items to load after skip
+     * @return a list of records
+     */
+    override fun paginate(skip: Int, limit: Int): IdentifiableList<out Q> {
+      val cursor: Cursor
+      return try {
+        val builder: QueryBuilder = fastTable.queryBuilder().take(limit).skip(skip)
+        cursor = database.query(builder.build(), builder.buildParameters())
+        val ts = IdentifiableList<Q>()
+        while (cursor.moveToNext() && !cursor.isClosed) ts.add(getWithId(cursor))
+        ts
+      } catch (e: SQLiteException) {
+        LogUtil.e(fastTable.TAG, e)
+        IdentifiableList()
+      }
+    }
+
+    override fun paginateDescending(skip: Int, limit: Int): IdentifiableList<out Q> {
+      val cursor: Cursor
+      return try {
+        val builder: QueryBuilder = fastTable.queryBuilder().orderByDescending(FastTable.id).take(limit).skip(skip)
+        cursor = database.query(builder.build(), builder.buildParameters())
+        val ts = IdentifiableList<Q>()
+        while (cursor.moveToNext() && !cursor.isClosed) ts.add(getWithId(cursor))
+        ts
+      } catch (e: SQLiteException) {
+        LogUtil.e(fastTable.TAG, e)
+        IdentifiableList()
+      }
+    }
+
+    /**
+     * gets all items that match in between the int left and right
+     *
+     * @param column column to match between
+     * @param a      lower between bound
+     * @param b      upper between bound
+     * @return a list of items
+     */
+    override fun between(column: Column<Number>, a: Number, b: Number): IdentifiableList<out Q> {
+      val cursor: Cursor
+      return try {
+        val builder: QueryBuilder = fastTable.queryBuilder().takeAll().whereAnd(Criteria.between(column, a, b))
+        cursor = database.query(builder.build(), builder.buildParameters())
+        val ts = IdentifiableList<Q>()
+        while (cursor.moveToNext() && !cursor.isClosed) ts.add(getWithId(cursor))
+        ts
+      } catch (e: SQLiteException) {
+        LogUtil.e(fastTable.TAG, e)
+        IdentifiableList()
+      }
+    }
+
+    /**
+     * gets all items matching the multiple columns
+     *
+     * @param column fields to match their values
+     * @return a list of items
+     */
+    override fun where(vararg column: Column<*>): IdentifiableList<out Q> {
+      val cursor: Cursor
+      return try {
+        val builder: QueryBuilder = fastTable.queryBuilder().takeAll()
+        for (column1 in column) if (column1.value() != null) builder.whereAnd(Criteria.equals(column1, column1.value()))
+        cursor = database.query(builder.build(), builder.buildParameters())
+        val ts = IdentifiableList<Q>()
+        while (cursor.moveToNext() && !cursor.isClosed) ts.add(getWithId(cursor))
+        ts
+      } catch (e: SQLiteException) {
+        LogUtil.e(fastTable.TAG, e)
+        IdentifiableList()
+      }
+    }
+
+    /**
+     * gets all the items matching not in any of the columns
+     *
+     * @param column field to match
+     * @param bounds not in bounds
+     * @return a list of items
+     */
+    @SafeVarargs
+    override fun notIn(column: Column<Number>, vararg bounds: Number): IdentifiableList<out Q> {
+      val cursor: Cursor
+      val items = arrayOfNulls<Any>(bounds.size)
+      System.arraycopy(bounds, 0, items, 0, bounds.size)
+      val builder: QueryBuilder = fastTable.queryBuilder().takeAll()
+          .whereAnd(Criteria.notIn(column, items))
+      return try {
+        cursor = database.query(builder.build(), builder.buildParameters())
+        val ts = IdentifiableList<Q>()
+        while (cursor.moveToNext() && !cursor.isClosed) {
+          val t = getWithId(cursor)
+          ts.add(t)
+        }
+        cursor.close()
+        /*database.close();*/ts
+      } catch (e: SQLiteException) {
+        LogUtil.e(fastTable.TAG, e)
+        IdentifiableList()
+      }
+    }
+
+    /**
+     * get all the rows where the column is like the columns values
+     *
+     * @param column the fields to compute like from
+     * @return a list of columns
+     */
+    override fun like(vararg column: Column<*>): IdentifiableList<out Q> {
+      val cursor: Cursor
+      val builder: QueryBuilder = fastTable.queryBuilder().takeAll()
+      for (column1 in column) builder.whereAnd(Criteria.contains(column1, column1.value().toString()))
+      return try {
+        cursor = database.query(builder.build(), builder.buildParameters())
+        val ts = IdentifiableList<Q>()
+        while (cursor.moveToNext() && !cursor.isClosed) {
+          val t = getWithId(cursor)
+          ts.add(t)
+        }
+        cursor.close()
+        /*database.close();*/ts
+      } catch (e: SQLiteException) {
+        LogUtil.e(fastTable.TAG, e)
+        IdentifiableList()
+      }
+    }
+
+    /**
+     * get all the rows in the oder specified by the column
+     *
+     * @param column field to order by
+     * @return a list of ordered items
+     */
+    override fun orderBy(column: Column<*>): IdentifiableList<out Q> {
+      val cursor: Cursor
+      val builder: QueryBuilder = fastTable.queryBuilder().takeAll()
+      if (column.order() == Column.DESCENDING) {
+        builder.orderByDescending(column)
+      } else builder.orderByAscending(column)
+      return try {
+        cursor = database.query(builder.build(), builder.buildParameters())
+        val ts = IdentifiableList<Q>()
+        while (cursor.moveToNext() && !cursor.isClosed) {
+          val t = getWithId(cursor)
+          ts.add(t)
+        }
+        cursor.close()
+        /*database.close();*/ts
+      } catch (e: SQLiteException) {
+        LogUtil.e(fastTable.TAG, e)
+        IdentifiableList()
+      }
+    }
+
+    /**
+     * gets all the items grouped by the column
+     *
+     * @param column field to group by
+     * @return a list of grouped items
+     */
+    override fun groupBy(column: Column<*>): IdentifiableList<out Q> {
+      val cursor: Cursor
+      val builder: QueryBuilder = fastTable.queryBuilder().takeAll().groupBy(column)
+      return try {
+        cursor = database.query(builder.build(), builder.buildParameters())
+        val ts = IdentifiableList<Q>()
+        while (cursor.moveToNext() && !cursor.isClosed) {
+          val t = getWithId(cursor)
+          ts.add(t)
+        }
+        cursor.close()
+        /*database.close();*/ts
+      } catch (e: SQLiteException) {
+        LogUtil.e(fastTable.TAG, e)
+        IdentifiableList()
+      }
+    }
+
+    /**
+     * gets all the items grouped and ordered by the two columns
+     *
+     * @param column  group by field
+     * @param column1 order by fields
+     * @return a list of items
+     */
+    override fun groupAndOrderBy(column: Column<*>, column1: Column<*>): IdentifiableList<out Q> {
+      val cursor: Cursor
+      val builder: QueryBuilder = fastTable.queryBuilder().takeAll().groupBy(column)
+      if (column1.order() == Column.DESCENDING) {
+        builder.orderByDescending(column1)
+      } else builder.orderByAscending(column1)
+      return try {
+        cursor = database.query(builder.build(), builder.buildParameters())
+        val ts = IdentifiableList<Q>()
+        while (cursor.moveToNext() && !cursor.isClosed) {
+          val t = getWithId(cursor)
+          ts.add(t)
+        }
+        cursor.close()
+        /*database.close();*/ts
+      } catch (e: SQLiteException) {
+        LogUtil.e(fastTable.TAG, e)
+        IdentifiableList()
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/database/src/main/java/promise/db/Migration.kt b/database/src/main/java/promise/db/Migration.kt
index eb6f625..4341d17 100644
--- a/database/src/main/java/promise/db/Migration.kt
+++ b/database/src/main/java/promise/db/Migration.kt
@@ -13,11 +13,11 @@
 
 package promise.db
 
-import android.database.sqlite.SQLiteDatabase
+import androidx.sqlite.db.SupportSQLiteDatabase
 
 interface Migration {
   fun onMigrate(database: FastDatabase,
-                sqLiteDatabase: SQLiteDatabase,
+                sqLiteDatabase: SupportSQLiteDatabase,
                 oldVersion: Int,
                 newVersion: Int)
 }
diff --git a/database/src/main/java/promise/db/PromiseDatabase.java b/database/src/main/java/promise/db/PromiseDatabase.kt
similarity index 57%
rename from database/src/main/java/promise/db/PromiseDatabase.java
rename to database/src/main/java/promise/db/PromiseDatabase.kt
index a0f6463..f3e54b0 100644
--- a/database/src/main/java/promise/db/PromiseDatabase.java
+++ b/database/src/main/java/promise/db/PromiseDatabase.kt
@@ -10,29 +10,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package promise.db
 
-package promise.db;
-
-import promise.commons.model.Identifiable;
+import promise.commons.model.Identifiable
+import promise.utils.Visitor
 
 /**
  * Base class for classes annotated with DatabaseEntity
  */
-public interface PromiseDatabase {
+abstract class PromiseDatabase(private val fastDatabase: FastDatabase?) {
 
   /**
    * @return an instance of FastDatabase
    */
-  FastDatabase getDatabaseInstance();
+  val databaseInstance: FastDatabase
+    get() {
+      checkNotNull(fastDatabase) { "Database not initialized or created yet" }
+      return fastDatabase
+    }
+
+  abstract fun <T : Identifiable<Int>> getEntityClassVisitor(): Visitor<Class<out T>, FastTable<T>>
 
   /**
    * returns the table associated with the entity class
+   *
    * @param entityClass class of the entity persisted
-   * @param <T> entity
+   * @param <T>         entity
    * @return FastTable of the entity
    * @throws IllegalArgumentException if entity is not registered with the database
-   */
-  <T extends Identifiable<Integer>> FastTable<T> tableOf(Class<? extends T> entityClass) throws IllegalArgumentException;
-}
-
+  </T> */
+  @Throws(IllegalArgumentException::class)
+  fun <T : Identifiable<Int>> tableOf(entityClass: Class<out T>): FastTable<T> {
+    val t: Visitor<Class<out T>, FastTable<T>> = getEntityClassVisitor()
+    return t.visit(entityClass)
+  }
 
+}
\ No newline at end of file
diff --git a/database/src/main/java/promise/db/ReactiveCrud.kt b/database/src/main/java/promise/db/ReactiveCrud.kt
index d968455..c228206 100644
--- a/database/src/main/java/promise/db/ReactiveCrud.kt
+++ b/database/src/main/java/promise/db/ReactiveCrud.kt
@@ -12,79 +12,41 @@
  */
 package promise.db
 
+import android.database.Cursor
 import io.reactivex.Maybe
 import io.reactivex.Single
 import promise.commons.model.Identifiable
 import promise.commons.model.List
 import promise.model.IdentifiableList
 
-/**
- *
- */
-internal interface ReactiveCrud<X> {
-  /**
-   *
-   */
+interface ReactiveCrud<X> : Crud<X> {
+
+  fun queryAsync(queryBuilder: QueryBuilder): Single<Cursor>
+
   @Throws(TableError::class)
   fun <T : Identifiable<Int>> readAsync(tableCrud: TableCrud<T, in X>): ReactiveTable.Extras<T>
 
-  /**
-   *
-   */
   fun <T : Identifiable<Int>> readAllAsync(tableCrud: TableCrud<T, in X>): Maybe<IdentifiableList<out T>>
 
-  /**
-   *
-   */
   fun <T : Identifiable<Int>> readAllAsync(tableCrud: TableCrud<T, in X>, vararg column: Column<*>): Maybe<IdentifiableList<out T>>
 
-  /**
-   *
-   */
   fun <T : Identifiable<Int>> updateAsync(t: T, tableCrud: TableCrud<T, in X>, column: Column<*>): Maybe<Boolean>
 
-  /**
-   *
-   */
   fun <T : Identifiable<Int>> updateAsync(t: T, tableCrud: TableCrud<T, in X>): Maybe<Boolean>
 
-  /**
-   *
-   */
   fun <T : Identifiable<Int>> deleteAsync(tableCrud: TableCrud<T, in X>, column: Column<*>): Maybe<Boolean>
 
-  /**
-   *
-   */
   fun <T : Identifiable<Int>> deleteAsync(tableCrud: TableCrud<T, in X>, t: T): Maybe<Boolean>
 
-  /**
-   *
-   */
   fun deleteAsync(tableCrud: TableCrud<*, in X>): Maybe<Boolean>
 
-  /**
-   *
-   */
   fun <C> deleteAsync(tableCrud: TableCrud<*, in X>, column: Column<C>, list: List<out C>): Maybe<Boolean>
 
-  /**
-   *
-   */
   fun <T : Identifiable<Int>> saveAsync(t: T, tableCrud: TableCrud<T, in X>): Single<Long>
 
-  /**
-   *
-   */
   fun <T : Identifiable<Int>> saveAsync(list: IdentifiableList<out T>, tableCrud: TableCrud<T, in X>): Single<Boolean>
 
-  /**
-   *
-   */
   fun deleteAllAsync(): Maybe<Boolean>
 
-  /**
-   *
-   */
   fun <T : Identifiable<Int>> getLastIdAsync(tableCrud: TableCrud<T, in X>): Maybe<Int>
 }
\ No newline at end of file
diff --git a/database/src/main/java/promise/db/ReactiveFastDatabase.kt b/database/src/main/java/promise/db/ReactiveFastDatabase.kt
index cfb8ed6..2b8b1a1 100644
--- a/database/src/main/java/promise/db/ReactiveFastDatabase.kt
+++ b/database/src/main/java/promise/db/ReactiveFastDatabase.kt
@@ -12,303 +12,117 @@
  */
 package promise.db
 
-import android.annotation.TargetApi
 import android.content.ContentValues
 import android.database.Cursor
-import android.database.DatabaseErrorHandler
-import android.database.sqlite.SQLiteDatabase
-import android.os.Build
+import androidx.sqlite.db.SupportSQLiteDatabase
 import io.reactivex.Maybe
 import io.reactivex.Single
-import promise.commons.data.log.LogUtil
 import promise.commons.model.Identifiable
 import promise.commons.model.List
 import promise.commons.util.DoubleConverter
 import promise.model.IdentifiableList
 
-/**
- *
- */
-
-class ReactiveFastDatabase private constructor(
+class ReactiveFastDatabase constructor(
     name: String?,
-    factory: SQLiteDatabase.CursorFactory?,
-    version: Int,
-    errorHandler: DatabaseErrorHandler) :
-    FastDatabase(name, factory, version, errorHandler),
-    ReactiveCrud<SQLiteDatabase> {
-  private val TAG: String = LogUtil.makeTag(ReactiveFastDatabase::class.java)
-
-  /**
-   * @param name
-   * @param version
-   * @param cursorListener
-   * @param listener
-   */
-  @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-  internal constructor(name: String?, version: Int, cursorListener: DatabaseCursorFactory.Listener?, listener: Corrupt?) : this(
-      name,
-      DatabaseCursorFactory(cursorListener),
-      version,
-      DatabaseErrorHandler {
-        assert(listener != null)
-        listener!!.onCorrupt()
-      })
-
-  /**
-   * @param version
-   */
+    version: Int) :
+    FastDatabaseImpl(name, version),
+    ReactiveCrud<SupportSQLiteDatabase> {
+
   internal constructor(version: Int) : this(DEFAULT_NAME, version)
 
-  constructor(name: String?, version: Int) : this(name, version, null, null)
-
-
-  /**
-   * @param tableCrud
-   * @param database
-   * @param <T>
-   * @return
-  </T> */
-  private fun <T : Identifiable<Int>> dropAsync(tableCrud: TableCrud<T, in SQLiteDatabase>,
-                                                database: SQLiteDatabase): Single<Boolean> =
-      Single.fromCallable { tableCrud.onDrop(database) }
-
-  /**
-   * @param builder
-   * @return
-   */
-  fun queryAsync(builder: QueryBuilder): Single<Cursor> = Single.fromCallable { query(builder) }
-
-  /**
-   * @param tableCrud
-   * @param <T>
-   * @return
-  </T> */
+  override fun queryAsync(queryBuilder: QueryBuilder): Single<Cursor> = Single.fromCallable { query(queryBuilder) }
+
   @Throws(TableError::class)
-  override fun <T : Identifiable<Int>> readAsync(tableCrud: TableCrud<T, in SQLiteDatabase>): ReactiveTable.Extras<T> =
-      object : QueryExtras<T>(tableCrud, readableDatabase) {
+  override fun <T : Identifiable<Int>> readAsync(tableCrud: TableCrud<T, in SupportSQLiteDatabase>): ReactiveTable.Extras<T> =
+      object : QueryExtras<T>(tableCrud) {
         override fun serialize(t: T): ContentValues = tableCrud.serialize(t)
         override fun deserialize(e: Cursor): T = tableCrud.deserialize(e)
       }
 
-
-  /**
-   * @param tableCrud
-   * @param <T>
-   * @return
-  </T> */
-  override fun <T : Identifiable<Int>> readAllAsync(tableCrud: TableCrud<T, in SQLiteDatabase>): Maybe<IdentifiableList<out T>> =
+  override fun <T : Identifiable<Int>> readAllAsync(tableCrud: TableCrud<T, in SupportSQLiteDatabase>): Maybe<IdentifiableList<out T>> =
       Maybe.fromCallable { findAll(tableCrud) }
 
-  /**
-   * @param tableCrud
-   * @param column
-   * @param <T>
-   * @return
-  </T> */
-  override fun <T : Identifiable<Int>> readAllAsync(tableCrud: TableCrud<T, in SQLiteDatabase>, vararg column: Column<*>): Maybe<IdentifiableList<out T>> =
-      Maybe.fromCallable { tableCrud.onFindAll(readableDatabase, *column) }
-
-  /**
-   * @param t
-   * @param tableCrud
-   * @param column
-   * @param <T>
-   * @return
-  </T> */
-  override fun <T : Identifiable<Int>> updateAsync(t: T, tableCrud: TableCrud<T, in SQLiteDatabase>, column: Column<*>): Maybe<Boolean> =
-      Maybe.fromCallable { tableCrud.onUpdate(t, writableDatabase, column) }
-
-  /**
-   * @param t
-   * @param tableCrud
-   * @param <T>
-   * @return
-  </T> */
-  override fun <T : Identifiable<Int>> updateAsync(t: T, tableCrud: TableCrud<T, in SQLiteDatabase>): Maybe<Boolean> =
-      Maybe.fromCallable { tableCrud.onUpdate(t, writableDatabase) }
-
-  /**
-   * @param tableCrud
-   * @param column
-   * @param <T>
-   * @return
-  </T> */
-  override fun <T : Identifiable<Int>> deleteAsync(tableCrud: TableCrud<T, in SQLiteDatabase>, column: Column<*>): Maybe<Boolean> =
-      Maybe.fromCallable { tableCrud.onDelete(writableDatabase, column) }
-
-  /**
-   * @param tableCrud
-   * @param t
-   * @param <T>
-   * @return
-  </T> */
-  override fun <T : Identifiable<Int>> deleteAsync(tableCrud: TableCrud<T, in SQLiteDatabase>, t: T): Maybe<Boolean> =
-      Maybe.fromCallable { tableCrud.onDelete(t, writableDatabase) }
-
-  /**
-   * @param tableCrud
-   * @return
-   */
-  override fun deleteAsync(tableCrud: TableCrud<*, in SQLiteDatabase>): Maybe<Boolean> =
-      Maybe.fromCallable { tableCrud.onDelete(writableDatabase) }
-
-  /**
-   * @param tableCrud
-   * @param column
-   * @param list
-   * @param <C>
-   * @return
-  </C> */
-  override fun <C> deleteAsync(tableCrud: TableCrud<*, in SQLiteDatabase>,
+  override fun <T : Identifiable<Int>> readAllAsync(tableCrud: TableCrud<T, in SupportSQLiteDatabase>, vararg column: Column<*>): Maybe<IdentifiableList<out T>> =
+      Maybe.fromCallable { findAll(tableCrud, *column) }
+
+  override fun <T : Identifiable<Int>> updateAsync(t: T, tableCrud: TableCrud<T, in SupportSQLiteDatabase>, column: Column<*>): Maybe<Boolean> =
+      Maybe.fromCallable { update(t, tableCrud, column) }
+
+  override fun <T : Identifiable<Int>> updateAsync(t: T, tableCrud: TableCrud<T, in SupportSQLiteDatabase>): Maybe<Boolean> =
+      Maybe.fromCallable { update(t, tableCrud) }
+
+  override fun <T : Identifiable<Int>> deleteAsync(tableCrud: TableCrud<T, in SupportSQLiteDatabase>, column: Column<*>): Maybe<Boolean> =
+      Maybe.fromCallable { delete(tableCrud, column) }
+
+  override fun <T : Identifiable<Int>> deleteAsync(tableCrud: TableCrud<T, in SupportSQLiteDatabase>, t: T): Maybe<Boolean> =
+      Maybe.fromCallable { delete(tableCrud, t) }
+
+  override fun deleteAsync(tableCrud: TableCrud<*, in SupportSQLiteDatabase>): Maybe<Boolean> =
+      Maybe.fromCallable { delete(tableCrud) }
+
+  override fun <C> deleteAsync(tableCrud: TableCrud<*, in SupportSQLiteDatabase>,
                                column: Column<C>,
                                list: List<out C>): Maybe<Boolean> =
-      Maybe.fromCallable { tableCrud.onDelete(writableDatabase, column, list) }
-
-  /**
-   * @param t
-   * @param tableCrud
-   * @param <T>
-   * @return
-  </T> */
-  override fun <T : Identifiable<Int>> saveAsync(t: T, tableCrud: TableCrud<T, in SQLiteDatabase>): Single<Long> =
-      Single.fromCallable { tableCrud.onSave(t, writableDatabase) }
-
-  /**
-   * @param list
-   * @param tableCrud
-   * @param <T>
-   * @return
-  </T> */
-  override fun <T : Identifiable<Int>> saveAsync(list: IdentifiableList<out T>, tableCrud: TableCrud<T, in SQLiteDatabase>): Single<Boolean> =
-      Single.fromCallable { tableCrud.onSave(list, writableDatabase) }
-
-  /**
-   * @return
-   */
+      Maybe.fromCallable { delete(tableCrud, column, list) }
+
+  override fun <T : Identifiable<Int>> saveAsync(t: T, tableCrud: TableCrud<T, in SupportSQLiteDatabase>): Single<Long> =
+      Single.fromCallable { save(t, tableCrud) }
+
+  override fun <T : Identifiable<Int>> saveAsync(list: IdentifiableList<out T>, tableCrud: TableCrud<T, in SupportSQLiteDatabase>): Single<Boolean> =
+      Single.fromCallable { save(list, tableCrud) }
+
   override fun deleteAllAsync(): Maybe<Boolean> =
-      Maybe.zip(tables().map { tableCrud: TableCrud<*, in SQLiteDatabase> -> this.deleteAsync(tableCrud) }
+      Maybe.zip(tables().map { tableCrud: TableCrud<*, in SupportSQLiteDatabase> -> this.deleteAsync(tableCrud) }
       ) { objects: Array<Any> ->
         List.fromArray<Any>(*objects).allMatch { aBoolean: Any ->
-          aBoolean is Boolean &&  aBoolean
+          aBoolean is Boolean && aBoolean
         }
       }
 
-  /**
-   * @param tableCrud
-   * @param <T>
-   * @return
-  </T> */
-  override fun <T : Identifiable<Int>> getLastIdAsync(tableCrud: TableCrud<T, in SQLiteDatabase>): Maybe<Int> =
-      Maybe.fromCallable { tableCrud.onGetLastId(readableDatabase) }
-
-  /**
-   * @param <T>
-  </T> */
-  private abstract inner class QueryExtras<T : Identifiable<Int>> internal constructor(private val tableCrud: TableCrud<T, in SQLiteDatabase>,
-                                                                                       private val database: SQLiteDatabase) :
+  override fun <T : Identifiable<Int>> getLastIdAsync(tableCrud: TableCrud<T, in SupportSQLiteDatabase>): Maybe<Int> =
+      Maybe.fromCallable { getLastId(tableCrud) }
+
+  private abstract inner class QueryExtras<T : Identifiable<Int>>
+  internal constructor(private val tableCrud: TableCrud<T, in SupportSQLiteDatabase>) :
       ReactiveTable.Extras<T>, DoubleConverter<T, Cursor, ContentValues> {
-    /**
-     * @return
-     */
-    override fun first(): Maybe<T> = Maybe.fromCallable { tableCrud.onFind(database).first() }
-
-    /**
-     * @return
-     */
-    override fun last(): Maybe<T> = Maybe.fromCallable { tableCrud.onFind(database).last() }
-
-    /**
-     * @return
-     */
+
+    override fun first(): Maybe<T> = Maybe.fromCallable { find(tableCrud).first() }
+
+    override fun last(): Maybe<T> = Maybe.fromCallable { find(tableCrud).last() }
+
     override fun all(): Maybe<IdentifiableList<out T>> =
-        Maybe.fromCallable { tableCrud.onFind(database).all() }
+        Maybe.fromCallable { find(tableCrud).all() }
 
-    /**
-     * @param limit
-     * @return
-     */
     override fun limit(limit: Int): Maybe<IdentifiableList<out T>> =
-        Maybe.fromCallable { tableCrud.onFind(database).limit(limit) }
+        Maybe.fromCallable { find(tableCrud).limit(limit) }
 
-    /**
-     * @param skip
-     * @param limit
-     * @return
-     */
     override fun paginate(skip: Int, limit: Int): Maybe<IdentifiableList<out T>> =
-        Maybe.fromCallable { tableCrud.onFind(database).paginate(skip, limit) }
+        Maybe.fromCallable { find(tableCrud).paginate(skip, limit) }
 
-    /**
-     * @param skip
-     * @param limit
-     * @return
-     */
     override fun paginateDescending(skip: Int, limit: Int): Maybe<IdentifiableList<out T>> =
-        Maybe.fromCallable { tableCrud.onFind(database).paginateDescending(skip, limit) }
-
-    /**
-     * @param column
-     * @param a
-     * @param b
-     * @return
-     */
+        Maybe.fromCallable { find(tableCrud).paginateDescending(skip, limit) }
+
     override fun between(column: Column<Number>, a: Number, b: Number): Maybe<IdentifiableList<out T>> =
-        Maybe.fromCallable { tableCrud.onFind(database).between(column, a, b) }
+        Maybe.fromCallable { find(tableCrud).between(column, a, b) }
 
-    /**
-     * @param column
-     * @return
-     */
     override fun where(vararg column: Column<*>): Maybe<IdentifiableList<out T>> =
-        Maybe.fromCallable { tableCrud.onFind(database).where(*column) }
+        Maybe.fromCallable { find(tableCrud).where(*column) }
 
-    /**
-     * @param column
-     * @param bounds
-     * @return
-     */
     @SafeVarargs
-    override fun  notIn(column: Column<Number>, vararg bounds: Number): Maybe<IdentifiableList<out T>> =
-        Maybe.fromCallable { tableCrud.onFind(database).notIn(column, *bounds) }
+    override fun notIn(column: Column<Number>, vararg bounds: Number): Maybe<IdentifiableList<out T>> =
+        Maybe.fromCallable { find(tableCrud).notIn(column, *bounds) }
 
-    /**
-     * @param column
-     * @return
-     */
     override fun like(vararg column: Column<String>): Maybe<IdentifiableList<out T>> =
-        Maybe.fromCallable { tableCrud.onFind(database).like(*column) }
+        Maybe.fromCallable { find(tableCrud).like(*column) }
 
-    /**
-     * @param column
-     * @return
-     */
     override fun orderBy(column: Column<*>): Maybe<IdentifiableList<out T>> =
-        Maybe.fromCallable { tableCrud.onFind(database).orderBy(column) }
+        Maybe.fromCallable { find(tableCrud).orderBy(column) }
 
-    /**
-     * @param column
-     * @return
-     */
     override fun groupBy(column: Column<*>): Maybe<IdentifiableList<out T>> =
-        Maybe.fromCallable { tableCrud.onFind(database).groupBy(column) }
+        Maybe.fromCallable { find(tableCrud).groupBy(column) }
 
-    /**
-     * @param column
-     * @param column1
-     * @return
-     */
     override fun groupAndOrderBy(column: Column<*>, column1: Column<*>): Maybe<IdentifiableList<out T>> =
-        Maybe.fromCallable { tableCrud.onFind(database).groupAndOrderBy(column, column1) }
+        Maybe.fromCallable { find(tableCrud).groupAndOrderBy(column, column1) }
   }
 
-  /**
-   * @param name
-   * @param factory
-   * @param version
-   * @param errorHandler
-   */
-  init {
-    LogUtil.d(TAG, "fast db init")
-  }
 }
\ No newline at end of file
diff --git a/database/src/main/java/promise/db/Store.java b/database/src/main/java/promise/db/Store.java
index 78195ee..49fab0e 100644
--- a/database/src/main/java/promise/db/Store.java
+++ b/database/src/main/java/promise/db/Store.java
@@ -13,116 +13,59 @@
 
 package promise.db;
 
-
-import androidx.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import promise.commons.model.List;
 import promise.commons.tx.PromiseResult;
 
-/**
- * @param <T>
- * @param <K>
- * @param <X>
- */
 public interface Store<T, K, X extends Throwable> {
 
-  /**
-   * @param k
-   * @param callBack
-   */
   void get(K k, PromiseResult<StoreExtra<T>, X> callBack);
 
-  /**
-   * @param k
-   * @param t
-   * @param callBack
-   */
   void delete(K k, T t, PromiseResult<Boolean, X> callBack);
 
-  /**
-   * @param k
-   * @param t
-   * @param callBack
-   */
   void update(K k, T t, PromiseResult<Boolean, X> callBack);
 
-  /**
-   * @param k
-   * @param t
-   * @param callBack
-   */
   void save(K k, T t, PromiseResult<Boolean, X> callBack);
 
-  /**
-   * @param k
-   * @param callBack
-   */
   void clear(K k, PromiseResult<Boolean, X> callBack);
 
-  /**
-   * @param callBack
-   */
   void clear(PromiseResult<Boolean, X> callBack);
 
   interface StoreFilter<T> {
     <X> List<? extends T> filter(List<? extends T> list, X... x);
   }
 
-  /**
-   * @param <T>
-   */
   abstract class StoreExtra<T> {
 
-    /**
-     * @param list
-     * @param callBack
-     * @param <E>
-     */
     static <T, E extends Throwable> void getExtras(final List<? extends T> list,
                                                    StoreFilter<T> storeFilter,
                                                    PromiseResult<StoreExtra<T>, E> callBack) {
       callBack.response(
           new StoreExtra<T>() {
-            /**
-             * @return
-             */
+
             @Nullable
             @Override
             public T first() {
               return list.first();
             }
 
-            /**
-             * @return
-             */
             @Nullable
             @Override
             public T last() {
               return list.last();
             }
 
-            /**
-             * @return
-             */
             @Override
             public List<? extends T> all() {
               return list;
             }
 
-            /**
-             * @param limit
-             * @return
-             */
             @Override
             public List<? extends T> limit(int limit) {
               return list.take(limit);
             }
 
-            /**
-             * @param x
-             * @param <X>
-             * @return
-             */
             @SafeVarargs
             @Override
             public final <X> List<? extends T> where(X... x) {
@@ -131,34 +74,16 @@ public final <X> List<? extends T> where(X... x) {
           });
     }
 
-    /**
-     * @return
-     */
     @Nullable
     abstract T first();
 
-    /**
-     * @return
-     */
     abstract @Nullable
     T last();
 
-    /**
-     * @return
-     */
     abstract List<? extends T> all();
 
-    /**
-     * @param limit
-     * @return
-     */
     abstract List<? extends T> limit(int limit);
 
-    /**
-     * @param x
-     * @param <X>
-     * @return
-     */
     abstract <X> List<? extends T> where(X... x);
   }
 
diff --git a/database/src/main/java/promise/db/TableCrud.kt b/database/src/main/java/promise/db/TableCrud.kt
index bd2f094..0a8d981 100644
--- a/database/src/main/java/promise/db/TableCrud.kt
+++ b/database/src/main/java/promise/db/TableCrud.kt
@@ -15,9 +15,10 @@ package promise.db
 import android.content.ContentValues
 import android.database.Cursor
 import promise.commons.model.Identifiable
-import promise.commons.model.List
 import promise.commons.util.DoubleConverter
 import promise.model.IdentifiableList
+import promise.utils.Acceptor
+import promise.utils.Visitor
 
 /**
  * the abstract implementation of all possible operations to be done on an table
@@ -31,125 +32,23 @@ import promise.model.IdentifiableList
  * @param <T> the type to be stored in this particular table must be a type of [Identifiable]
  * @param <X> the type of database that this table resides in
 </X></T> */
-interface TableCrud<T : Identifiable<Int>, X> : DoubleConverter<T, Cursor, ContentValues>, DDLFunctions<X> {
+interface TableCrud<T : Identifiable<Int>, X> : DoubleConverter<T, Cursor, ContentValues>,
+    DDLFunctions<X>,
+    Acceptor<TableCrud<T, X>, Any> {
 
-  /**
-   * provides concise readAsync from the table
-   * see [Extras]
-   *
-   * @param x the database instance
-   * @return an instance of extras with more concise methods for querying the data set
-   */
-  fun onFind(x: X): Extras<T>
-
-  /**
-   * gets all the records in the table
-   *
-   * @param x     the database instance
-   * @param close if the connection is to be closed
-   * @return a list if the records
-   */
-  fun onFindAll(x: X, close: Boolean): IdentifiableList<out T>
-
-  /**
-   * gets all the records matching the conditions specified in the columns
-   *
-   * @param x      database instance
-   * @param column specifies where or order by conditions
-   * @return a list if records
-   */
-  fun onFindAll(x: X, vararg column: Column<*>): IdentifiableList<out T>
-
-  /**
-   * updates an item in the table specified by the condition in the column
-   * see [Column.getOperand] for sample conditional operations
-   *
-   * @param t      record to updateAsync
-   * @param x      database instance
-   * @param column field specifying the updateAsync condition
-   * @return true id record is updated
-   * @throws TableError if there is missing updating information or error in sql script
-   */
-  @Throws(TableError::class)
-  fun onUpdate(t: T, x: X, column: Column<*>): Boolean
-
-  /**
-   * updates an item with an id with a value more that zero
-   * see [FastTable.id]
-   *
-   * @param t record to updateAsync
-   * @param x database instance
-   * @return true if record is updated otherwise false
-   */
-  fun onUpdate(t: T, x: X): Boolean
+  override fun accept(t: Visitor<TableCrud<T, X>, Any>): Any = t.visit(this)
 
-  /**
-   * deleteAsync a record from the table specified by the condition in the column
-   * see [Column.getOperand] for sample conditional operations
-   *
-   * @param x      database instance
-   * @param column field to infer where condition
-   * @return true if record deleted otherwise false
-   */
-  fun onDelete(x: X, column: Column<*>): Boolean
+  fun acceptErasure(t: Visitor<TableCrud<*, X>, Any>): Any = t.visit(this)
 
-  /**
-   * deletes an item with an id with a value more that zero
-   * see [FastTable.id]
-   *
-   * @param t record to updateAsync
-   * @param x database instance
-   * @return true if record is deleted otherwise false
-   */
-  fun onDelete(t: T, x: X): Boolean
-
-  /**
-   * truncates the table
-   *
-   * @param x database instance
-   * @return true if truncated otherwise false
-   */
-  fun onDelete(x: X): Boolean
+  fun queryBuilder(): QueryBuilder
 
-  /**
-   * deletes a number of rows where the column matches each item in list
-   *
-   * @param x      database instance
-   * @param column field to match each item in list
-   * @param list   matches to deleteAsync from
-   * @param <C>    type of match must not be derived
-   * @return true if deleted otherwise false
-  </C> */
-  fun <C> onDelete(x: X, column: Column<C>, list: List<out C>): Boolean
+  fun single(cursor: Cursor): T
 
-  /**
-   * saves an item in the table
-   * if it has an id more than zero, it updates it instead
-   *
-   * @param t item to saveAsync
-   * @param x database instance
-   * @return reference of affected row
-   */
-  fun onSave(t: T, x: X): Long
+  fun collection(cursor: Cursor): IdentifiableList<out T>
 
-  /**
-   * saveAsync multiple items to the table
-   *
-   * @param list items to saveAsync
-   * @param x    database instance
-   * @return true if all items are saved otherwise false
-   */
-  fun onSave(list: IdentifiableList<out T>, x: X): Boolean
 
-  /**
-   * @param x
-   * @return
-   * @throws TableError
-   */
-  @Throws(TableError::class)
-  fun onDrop(x: X): Boolean
+  val TAG: String
 
-  fun onGetLastId(x: X): Int
   /**
    * @return tableName of this table
    */
diff --git a/database/src/main/java/promise/db/Utils.java b/database/src/main/java/promise/db/Utils.java
index d8916fd..715d007 100644
--- a/database/src/main/java/promise/db/Utils.java
+++ b/database/src/main/java/promise/db/Utils.java
@@ -34,34 +34,6 @@ else if (value instanceof Double)
     else
       return String.valueOf(value);
   }
-	
-	/*public static String dateToString(LocalDate date, DateTimeFormatter format) {
-		if (date == null)
-			return null;
-		
-		if(format == null)
-			format = QueryBuildConfiguration.current().getDateFormat();
-
-		try {
-			return date.toString(format);
-		} catch (Exception e) {
-			return null;
-		}
-	}
-
-	public static String dateToString(LocalDateTime date, DateTimeFormatter format) {
-		if (date == null)
-			return null;
-
-		if(format == null)
-			format = QueryBuildConfiguration.current().getDateTimeFormat();
-		
-		try {
-			return date.toString(format);
-		} catch (Exception e) {
-			return null;
-		}
-	}*/
 
   public static boolean isNullOrEmpty(String string) {
     return (string == null || string.length() <= 0);
@@ -71,12 +43,9 @@ public static boolean isNullOrWhiteSpace(String string) {
     return (string == null || string.trim().length() <= 0);
   }
 
-  public static Projection[] buildColumnProjections(Column... columns) {
+  static Projection[] buildColumnProjections(Column... columns) {
     Projection[] projections = new Projection[columns.length];
-
-    for (int i = 0; i < columns.length; i++) {
-      projections[i] = Projection.column(columns[i]);
-    }
+    for (int i = 0; i < columns.length; i++) projections[i] = Projection.column(columns[i]);
     return projections;
   }
 }
diff --git a/database/src/main/java/promise/db/from/From.java b/database/src/main/java/promise/db/from/From.java
index fe08656..27eeb96 100644
--- a/database/src/main/java/promise/db/from/From.java
+++ b/database/src/main/java/promise/db/from/From.java
@@ -15,8 +15,8 @@
 
 import promise.commons.model.List;
 import promise.db.Column;
-import promise.db.TableCrud;
 import promise.db.QueryBuilder;
+import promise.db.TableCrud;
 import promise.db.criteria.Criteria;
 import promise.db.projection.Projection;
 
diff --git a/database/src/main/java/promise/db/management/DatabaseMigration.kt b/database/src/main/java/promise/db/management/DatabaseMigration.kt
new file mode 100644
index 0000000..5aa1d15
--- /dev/null
+++ b/database/src/main/java/promise/db/management/DatabaseMigration.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.db.management
+
+import android.annotation.SuppressLint
+import promise.db.ActiveRecord
+
+@SuppressLint("ParcelCreator")
+class DatabaseMigration : ActiveRecord<DatabaseMigration>() {
+
+  private var version: Int = 1
+
+  override fun getEntity(): DatabaseMigration = this
+}
\ No newline at end of file
diff --git a/database/src/main/java/promise/db/management/TableMetaData.kt b/database/src/main/java/promise/db/management/TableMetaData.kt
new file mode 100644
index 0000000..8b53834
--- /dev/null
+++ b/database/src/main/java/promise/db/management/TableMetaData.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.db.management
+
+import android.annotation.SuppressLint
+import promise.db.ActiveRecord
+
+@SuppressLint("ParcelCreator")
+class TableMetaData : ActiveRecord<TableMetaData>() {
+
+  private var version: Int = 1
+
+  override fun getEntity(): TableMetaData = this
+}
\ No newline at end of file
diff --git a/database/src/main/java/promise/db/projection/Projection.java b/database/src/main/java/promise/db/projection/Projection.java
index f566d6f..d4adfd8 100644
--- a/database/src/main/java/promise/db/projection/Projection.java
+++ b/database/src/main/java/promise/db/projection/Projection.java
@@ -15,8 +15,8 @@
 
 import promise.commons.model.List;
 import promise.db.Column;
-import promise.db.TableCrud;
 import promise.db.QueryBuilder;
+import promise.db.TableCrud;
 
 public abstract class Projection {
   // Simple column
diff --git a/commons/src/main/java/promise/db/model/ITimeStamped.java b/database/src/main/java/promise/model/ITimeStamped.java
similarity index 96%
rename from commons/src/main/java/promise/db/model/ITimeStamped.java
rename to database/src/main/java/promise/model/ITimeStamped.java
index 394dd89..3b07257 100644
--- a/commons/src/main/java/promise/db/model/ITimeStamped.java
+++ b/database/src/main/java/promise/model/ITimeStamped.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package promise.db.model;
+package promise.model;
 
 public interface ITimeStamped {
 
diff --git a/database/src/main/java/promise/model/IdentifiableList.java b/database/src/main/java/promise/model/IdentifiableList.java
index f414853..1957753 100644
--- a/database/src/main/java/promise/model/IdentifiableList.java
+++ b/database/src/main/java/promise/model/IdentifiableList.java
@@ -70,29 +70,26 @@ public boolean removeWithID(int id) {
   }
 
   public boolean remove(T t) {
-    if (t instanceof ActiveRecord<?>) {
-      try {
-        ((ActiveRecord) t).delete();
-      } catch (Exception ignored) {}
+    if (t instanceof ActiveRecord<?>) try {
+      ((ActiveRecord) t).delete();
+    } catch (Exception ignored) {
     }
     super.remove(getIndex(t));
     return true;
   }
 
   public void delete(T t) {
-    if (t instanceof ActiveRecord<?>) {
-      try {
-        ((ActiveRecord) t).delete();
-      } catch (Exception ignored) {}
+    if (t instanceof ActiveRecord<?>) try {
+      ((ActiveRecord) t).delete();
+    } catch (Exception ignored) {
     }
     removeWithID(t.getId());
   }
 
   public void update(T t) {
-    if (t instanceof ActiveRecord<?>) {
-      try {
-        ((ActiveRecord) t).update();
-      } catch (Exception ignored) {}
+    if (t instanceof ActiveRecord<?>) try {
+      ((ActiveRecord) t).update();
+    } catch (Exception ignored) {
     }
     super.set(getIndex(t), t);
   }
@@ -109,4 +106,5 @@ public IdentifiableList<T> sortWithID() {
             o1.getId() > o2.getId() ? -1 : 0);
     return this;
   }
+
 }
diff --git a/database/src/main/java/promise/model/TimeStamped.java b/database/src/main/java/promise/model/TimeStamped.java
index 9beb7dd..d7f3cbd 100644
--- a/database/src/main/java/promise/model/TimeStamped.java
+++ b/database/src/main/java/promise/model/TimeStamped.java
@@ -17,7 +17,6 @@
 import android.os.Parcelable;
 
 import promise.commons.model.Identifiable;
-import promise.db.model.ITimeStamped;
 
 public abstract class TimeStamped implements Identifiable<Integer>, ITimeStamped, Parcelable {
   private int id = 0;
diff --git a/database/src/main/java/promise/utils/Acceptor.kt b/database/src/main/java/promise/utils/Acceptor.kt
new file mode 100644
index 0000000..1f9d72a
--- /dev/null
+++ b/database/src/main/java/promise/utils/Acceptor.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.utils
+
+interface Acceptor<T, R> {
+  fun accept(t: Visitor<T, R>): R
+}
\ No newline at end of file
diff --git a/database/src/main/java/promise/utils/Visitor.kt b/database/src/main/java/promise/utils/Visitor.kt
new file mode 100644
index 0000000..d514473
--- /dev/null
+++ b/database/src/main/java/promise/utils/Visitor.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017, Peter Vincent
+ * Licensed under the Apache License, Version 2.0, Android Promise.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package promise.utils
+
+interface Visitor<in T, out R> {
+  fun visit(t: T): R
+}
\ No newline at end of file
diff --git a/database/src/test/java/promise/db/ExampleUnitTest.java b/database/src/test/java/promise/database/ExampleUnitTest.java
similarity index 92%
rename from database/src/test/java/promise/db/ExampleUnitTest.java
rename to database/src/test/java/promise/database/ExampleUnitTest.java
index b0610e1..53047e1 100644
--- a/database/src/test/java/promise/db/ExampleUnitTest.java
+++ b/database/src/test/java/promise/database/ExampleUnitTest.java
@@ -11,11 +11,11 @@
  * limitations under the License.
  */
 
-package promise.db;
+package promise.database;
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Example local unit test, which will execute on the development machine (host).
diff --git a/gradle.properties b/gradle.properties
index e8e4bfb..744620d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,7 +22,9 @@
 android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
-kapt.use.worker.api=true
+
+POM_LICENCE_URL=https\://opensource.org/licenses/MIT
+POM_LICENCE_NAME=The MIT License (MIT)
 
 # org.gradle.daemon=false
 # org.gradle.debug=true
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..e8ee5ed
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,886 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "@appnest/readme": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@appnest/readme/-/readme-1.2.7.tgz",
+      "integrity": "sha512-Gf60vp2sws3rIaz5SGUPmSBA49z/SC3qej0B83TvAttX5CXO26/QU49SfzKI8xNjU9HJCTgQ3mHm1vB2ZY5Mzg==",
+      "dev": true,
+      "requires": {
+        "@types/glob": "^7.1.1",
+        "check-links": "^1.1.8",
+        "colors": "^1.4.0",
+        "commander": "^5.0.0",
+        "fs-extra": "^9.0.0",
+        "glob": "^7.1.6",
+        "path": "^0.12.7",
+        "web-component-analyzer": "1.0.3"
+      }
+    },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
+      "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "2.0.3",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
+      "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
+      "dev": true
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
+      "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.3",
+        "fastq": "^1.6.0"
+      }
+    },
+    "@sindresorhus/is": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
+      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
+      "dev": true
+    },
+    "@szmarczak/http-timer": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
+      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
+      "dev": true,
+      "requires": {
+        "defer-to-connect": "^1.0.1"
+      }
+    },
+    "@types/color-name": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
+      "dev": true
+    },
+    "@types/glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
+      "dev": true,
+      "requires": {
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "14.6.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.6.0.tgz",
+      "integrity": "sha512-mikldZQitV94akrc4sCcSjtJfsTKt4p+e/s0AGscVA6XArQ9kFclP+ZiYUMnq987rc6QlYxXv/EivqlfSLxpKA==",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+      "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+      "dev": true,
+      "requires": {
+        "@types/color-name": "^1.1.1",
+        "color-convert": "^2.0.1"
+      }
+    },
+    "at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
+    "cacheable-request": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
+      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
+      "dev": true,
+      "requires": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^3.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^4.1.0",
+        "responselike": "^1.0.2"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "lowercase-keys": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+          "dev": true
+        }
+      }
+    },
+    "camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true
+    },
+    "check-links": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/check-links/-/check-links-1.1.8.tgz",
+      "integrity": "sha512-lxt1EeQ1CVkmiZzPfbPufperYK0t7MvhdLs3zlRH9areA6NVT1tcGymAdJONolNWQBdCFU/sek59RpeLmVHCnw==",
+      "dev": true,
+      "requires": {
+        "got": "^9.6.0",
+        "is-relative-url": "^2.0.0",
+        "p-map": "^2.0.0",
+        "p-memoize": "^2.1.0"
+      }
+    },
+    "cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "requires": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "clone-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "dev": true
+    },
+    "commander": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
+      "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "defer-to-connect": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
+      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
+      "dev": true
+    },
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+      "dev": true
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "fast-glob": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
+      "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.0",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.2",
+        "picomatch": "^2.2.1"
+      }
+    },
+    "fastq": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
+      "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
+      "dev": true,
+      "requires": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
+    "find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "requires": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      }
+    },
+    "fs-extra": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz",
+      "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==",
+      "dev": true,
+      "requires": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^1.0.0"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
+    "glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
+    "got": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
+      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
+      "dev": true,
+      "requires": {
+        "@sindresorhus/is": "^0.14.0",
+        "@szmarczak/http-timer": "^1.1.2",
+        "cacheable-request": "^6.0.0",
+        "decompress-response": "^3.3.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^4.1.0",
+        "lowercase-keys": "^1.0.1",
+        "mimic-response": "^1.0.1",
+        "p-cancelable": "^1.0.0",
+        "to-readable-stream": "^1.0.0",
+        "url-parse-lax": "^3.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+      "dev": true
+    },
+    "http-cache-semantics": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "is-absolute-url": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
+      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
+    "is-relative-url": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-relative-url/-/is-relative-url-2.0.0.tgz",
+      "integrity": "sha1-cpAtf+BLPUeS59sV+duEtyBMnO8=",
+      "dev": true,
+      "requires": {
+        "is-absolute-url": "^2.0.0"
+      }
+    },
+    "json-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
+      "dev": true
+    },
+    "jsonfile": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
+      "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.6",
+        "universalify": "^1.0.0"
+      }
+    },
+    "keyv": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
+      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
+      "dev": true,
+      "requires": {
+        "json-buffer": "3.0.0"
+      }
+    },
+    "locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "requires": {
+        "p-locate": "^4.1.0"
+      }
+    },
+    "lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "dev": true
+    },
+    "map-age-cleaner": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+      "dev": true,
+      "requires": {
+        "p-defer": "^1.0.0"
+      }
+    },
+    "mem": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+      "dev": true,
+      "requires": {
+        "map-age-cleaner": "^0.1.1",
+        "mimic-fn": "^2.0.0",
+        "p-is-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+          "dev": true
+        }
+      }
+    },
+    "merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+      "dev": true,
+      "requires": {
+        "braces": "^3.0.1",
+        "picomatch": "^2.0.5"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "dev": true
+    },
+    "mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "normalize-url": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
+      "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "p-cancelable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
+      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
+      "dev": true
+    },
+    "p-defer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
+      "dev": true
+    },
+    "p-is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "requires": {
+        "p-try": "^2.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "requires": {
+        "p-limit": "^2.2.0"
+      }
+    },
+    "p-map": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+      "dev": true
+    },
+    "p-memoize": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-memoize/-/p-memoize-2.1.0.tgz",
+      "integrity": "sha512-c6+a2iV4JyX0r4+i2IBJYO0r6LZAT2fg/tcB6GQbv1uzZsfsmKT7Ej5DRT1G6Wi7XUJSV2ZiP9+YEtluvhCmkg==",
+      "dev": true,
+      "requires": {
+        "mem": "^4.0.0",
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true
+    },
+    "path": {
+      "version": "0.12.7",
+      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
+      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
+      "dev": true,
+      "requires": {
+        "process": "^0.11.1",
+        "util": "^0.10.3"
+      }
+    },
+    "path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "dev": true
+    },
+    "prepend-http": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
+      "dev": true
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "responselike": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+      "dev": true,
+      "requires": {
+        "lowercase-keys": "^1.0.0"
+      }
+    },
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true
+    },
+    "run-parallel": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
+      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
+      "dev": true
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.0"
+      }
+    },
+    "to-readable-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
+      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
+      "dev": true
+    },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
+    "ts-simple-type": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/ts-simple-type/-/ts-simple-type-0.3.7.tgz",
+      "integrity": "sha512-bDXWURwpDpe1mA5E9eldmI0Mpt9zGprhtN/ZTLOJjsAMyeMy1UT7WvGRQghYewIYBYxDZurChhe4DrsPbcCVrA==",
+      "dev": true
+    },
+    "typescript": {
+      "version": "3.9.7",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz",
+      "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==",
+      "dev": true
+    },
+    "universalify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
+      "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
+      "dev": true
+    },
+    "url-parse-lax": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
+      "dev": true,
+      "requires": {
+        "prepend-http": "^2.0.0"
+      }
+    },
+    "util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        }
+      }
+    },
+    "web-component-analyzer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/web-component-analyzer/-/web-component-analyzer-1.0.3.tgz",
+      "integrity": "sha512-QA6GVVJrKRPHLVqPv4evY0H+du1yY+E1q8c82bdY5e10+pWsRfeYA+Hsh2r8yl1EGQVC55SeV3tGvJ6+CxaH/Q==",
+      "dev": true,
+      "requires": {
+        "fast-glob": "^3.1.0",
+        "ts-simple-type": "~0.3.6",
+        "typescript": "^3.5.3",
+        "yargs": "^15.0.2"
+      }
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "y18n": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "dev": true
+    },
+    "yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "requires": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      }
+    },
+    "yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    }
+  }
+}
diff --git a/schemas/promise.base.AppDatabase.yml b/schemas/promise.base.AppDatabase.yml
new file mode 100644
index 0000000..2a892fe
--- /dev/null
+++ b/schemas/promise.base.AppDatabase.yml
@@ -0,0 +1,87 @@
+---
+dbVersion: 1
+tableMetaData:
+- tableName: "likes"
+  fields:
+  - fieldName: "uId"
+    columnName: "uId"
+    nullable: true
+  - fieldName: "post"
+    columnName: "post"
+    nullable: true
+  migrations: []
+- tableName: "postComments"
+  fields:
+  - fieldName: "name"
+    columnName: "name"
+    nullable: true
+  - fieldName: "uId"
+    columnName: "uId"
+    nullable: true
+  - fieldName: "body"
+    columnName: "body"
+    nullable: true
+  - fieldName: "email"
+    columnName: "email"
+    nullable: true
+  - fieldName: "postCommentId"
+    columnName: "postCommentId"
+    nullable: true
+  - fieldName: "post"
+    columnName: "post"
+    nullable: true
+  migrations: []
+- tableName: "posts"
+  fields:
+  - fieldName: "uId"
+    columnName: "uId"
+    nullable: true
+  - fieldName: "title"
+    columnName: "title"
+    nullable: true
+  - fieldName: "body"
+    columnName: "body"
+    nullable: true
+  - fieldName: "userId"
+    columnName: "userId"
+    nullable: true
+  - fieldName: "publishedDate"
+    columnName: "publishedDate"
+    nullable: true
+  migrations: []
+- tableName: "todoes"
+  fields:
+  - fieldName: "uid"
+    columnName: "uid"
+    nullable: true
+  - fieldName: "completed"
+    columnName: "completed"
+    nullable: true
+  - fieldName: "title"
+    columnName: "title"
+    nullable: true
+  - fieldName: "description"
+    columnName: "description"
+    nullable: true
+  - fieldName: "photo"
+    columnName: "photo"
+    nullable: true
+  migrations: []
+- tableName: "photos"
+  fields:
+  - fieldName: "albumId"
+    columnName: "albumId"
+    nullable: true
+  - fieldName: "title"
+    columnName: "title"
+    nullable: true
+  - fieldName: "url"
+    columnName: "url"
+    nullable: true
+  - fieldName: "thumbnailUrl"
+    columnName: "thumbnailUrl"
+    nullable: true
+  - fieldName: "post"
+    columnName: "post"
+    nullable: true
+  migrations: []
diff --git a/settings.gradle b/settings.gradle
index fab9741..1455dc2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -11,9 +11,8 @@
  * limitations under the License.
  */
 
-
-include  'app'
-include 'database'
+include ':app'
+include ':database'
 include ':compiler'
 include ':commons'