diff --git a/app/build.gradle b/app/build.gradle
index b02fb92754..2532b7b2db 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,6 @@ android {
     compileSdkVersion config["compile_sdk"]
     buildToolsVersion config["build_tools"]
 
-    ndkVersion "21.3.6528147"
-
     defaultConfig {
         applicationId config["application_id"]
         minSdkVersion config["min_sdk"]
@@ -67,7 +65,6 @@ android {
     androidExtensions {
         experimental = true
     }
-
 }
 
 ext {
diff --git a/app/src/main/java/com/anytypeio/anytype/ui/database/table/TableBoardFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/database/table/TableBoardFragment.kt
index 90cc755d81..5457af2089 100644
--- a/app/src/main/java/com/anytypeio/anytype/ui/database/table/TableBoardFragment.kt
+++ b/app/src/main/java/com/anytypeio/anytype/ui/database/table/TableBoardFragment.kt
@@ -36,17 +36,16 @@ class DatabaseViewFragment : ViewStateFragment<ViewState<Table>>(R.layout.fragme
     override fun render(state: ViewState<Table>) {
         when (state) {
             is ViewState.Init -> {
-                tableView.setAdapter(
+                tableView.adapter =
                     TableAdapter(
                         requireContext()
                     )
-                )
                 vm.getDatabaseView(id = TEST_ID)
             }
 
             is ViewState.Success -> {
-                tableView.adapter?.setColumnHeaderItems(state.data.column)
-                tableView.adapter?.setCellItems(state.data.cell)
+                tableView.adapter.setColumnHeaderItems(state.data.column)
+                tableView.adapter.setCellItems(state.data.cell)
             }
         }
     }
diff --git a/app/src/main/java/com/anytypeio/anytype/ui/database/table/adapter/TableAdapter.kt b/app/src/main/java/com/anytypeio/anytype/ui/database/table/adapter/TableAdapter.kt
index b89d871391..bef5bc15ea 100644
--- a/app/src/main/java/com/anytypeio/anytype/ui/database/table/adapter/TableAdapter.kt
+++ b/app/src/main/java/com/anytypeio/anytype/ui/database/table/adapter/TableAdapter.kt
@@ -15,7 +15,7 @@ import com.evrencoskun.tableview.adapter.recyclerview.holder.AbstractViewHolder
 const val VIEW_TYPE_DEFAULT = 0
 
 class TableAdapter(context: Context) :
-    AbstractTableAdapter<ColumnView, RowView, CellView>() {
+    AbstractTableAdapter<ColumnView, RowView, CellView>(context) {
 
     // -------------- Cell --------------------
 
@@ -77,6 +77,14 @@ class TableAdapter(context: Context) :
             }
         }
 
+    override fun onBindCellViewHolder(
+        holder: AbstractViewHolder?,
+        cellItemModel: Any?,
+        columnPosition: Int,
+        rowPosition: Int
+    ) {
+    }
+
     // -------------- Column --------------------
 
     override fun getColumnHeaderItemViewType(position: Int): Int =
@@ -153,11 +161,35 @@ class TableAdapter(context: Context) :
         }
     }
 
+    override fun onBindColumnHeaderViewHolder(
+        holder: AbstractViewHolder?,
+        columnHeaderItemModel: Any?,
+        columnPosition: Int
+    ) {
+    }
+
     // -------------- Row --------------------
 
     override fun getRowHeaderItemViewType(position: Int): Int =
         VIEW_TYPE_DEFAULT
 
+    override fun onBindRowHeaderViewHolder(
+        holder: AbstractViewHolder?,
+        rowHeaderItemModel: Any?,
+        rowPosition: Int
+    ) = Unit
+
+    override fun onCreateRowHeaderViewHolder(
+        parent: ViewGroup?,
+        viewType: Int
+    ): AbstractViewHolder {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun onCreateCornerView(): View {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
     companion object {
 
         val VIEW_TYPE_TITLE = 1
@@ -174,39 +206,6 @@ class TableAdapter(context: Context) :
         val VIEW_TYPE_PHONE = 12
         val VIEW_TYPE_NEW = 13
     }
-
-    override fun onBindCellViewHolder(
-        holder: AbstractViewHolder,
-        cellItemModel: CellView?,
-        columnPosition: Int,
-        rowPosition: Int
-    ) {
-        TODO("Not yet implemented")
-    }
-
-    override fun onBindColumnHeaderViewHolder(
-        holder: AbstractViewHolder,
-        columnHeaderItemModel: ColumnView?,
-        columnPosition: Int
-    ) {
-        TODO("Not yet implemented")
-    }
-
-    override fun onBindRowHeaderViewHolder(
-        holder: AbstractViewHolder,
-        rowHeaderItemModel: RowView?,
-        rowPosition: Int
-    ) {
-        TODO("Not yet implemented")
-    }
-
-    override fun onCreateRowHeaderViewHolder(parent: ViewGroup, viewType: Int): AbstractViewHolder {
-        TODO("Not yet implemented")
-    }
-
-    override fun onCreateCornerView(parent: ViewGroup): View {
-        TODO("Not yet implemented")
-    }
 }
 
 fun LayoutInflater.toView(id: Int, parent: ViewGroup): View = this.inflate(id, parent, false)
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 42c82b4e7b..f04acdaece 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 apply from: './dependencies.gradle'
 
 buildscript {
-    ext.kotlin_version = '1.4.10'
+    ext.kotlin_version = '1.4.0'
     ext.gradle_tools = '3.1.3'
     ext.build_tools = '29.0.0'
     ext.nav_version = '2.3.0'
@@ -25,12 +25,12 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
-        classpath 'com.google.gms:google-services:4.3.4'
+        classpath 'com.google.gms:google-services:4.3.3'
         classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.12"
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.0'
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}"
     }
 }
diff --git a/dependencies.gradle b/dependencies.gradle
index b58276acaa..c4f34dfa77 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -41,7 +41,7 @@ ext {
     gson_version = '2.8.6'
     rxrelay_version = '2.1.0'
     better_link_method_version = '2.2.0'
-    table_view_version = '0.8.9.2'
+    table_view_version = '0.8.8'
     rxbinding_version = '3.0.0'
     permission_disp_version = '4.6.0'
     pickt_version = "0.1.11"
diff --git a/gradle.properties b/gradle.properties
index f122713bd7..77748dbf1b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,6 +17,7 @@ org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
 android.enableR8=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=false
+android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
+kotlin.code.style=official
+android.enableUnitTestBinaryResources=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bf96239ead..52d29e0216 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 07 17:40:32 MSK 2020
+#Mon Apr 13 21:05:02 MSK 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/lib-middleware/.gitignore b/lib-middleware/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/lib-middleware/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/middleware-lib/.gitignore b/middleware-lib/.gitignore
deleted file mode 100644
index ecf1eaeda7..0000000000
--- a/middleware-lib/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build
-/lib.aar
\ No newline at end of file
diff --git a/middleware-lib/build.gradle b/middleware-lib/build.gradle
deleted file mode 100644
index 89d4171d41..0000000000
--- a/middleware-lib/build.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-configurations.maybeCreate("default")
-artifacts.add("default", file('lib.aar'))
\ No newline at end of file
diff --git a/middleware.sh b/middleware.sh
index 1e6590a7c6..ee07ed21bc 100755
--- a/middleware.sh
+++ b/middleware.sh
@@ -4,7 +4,7 @@ TOKEN=$1
 
 PROPERTY_PATH="middleware.path"
 PROPERTY_VERSION="middleware.version"
-LIBRARY_PATH="middleware-lib/lib.aar"
+LIBRARY_PATH="libs/lib.aar"
 
 REPO="anytypeio/go-anytype-middleware"
 FILE="lib.tar.gz"
@@ -39,7 +39,8 @@ printf "Done\n"
 
 printf "Preparing files\n"
 
-mv /tmp/lib/lib.aar middleware-lib/
+mkdir -p libs/
+mv /tmp/lib/lib.aar libs/
 
 rm -rf /tmp/lib
 rm -rf $FILE
diff --git a/middleware/build.gradle b/middleware/build.gradle
index 90ba1cafe9..d0bf20ecdf 100644
--- a/middleware/build.gradle
+++ b/middleware/build.gradle
@@ -26,7 +26,11 @@ android {
 
 dependencies {
 
-    implementation project(':middleware-lib')
+    def props = new Properties()
+    project.rootProject.file('configuration.properties').withDataInputStream { props.load(it) }
+    def libraryPath = project.rootProject.file(props.getProperty('middleware.path'))
+    implementation(files(libraryPath))
+
     implementation project(':protobuf')
     implementation project(':data')
 
diff --git a/settings.gradle b/settings.gradle
index 87c77bcb46..de23aa5028 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,5 +14,4 @@ include ':app',
         ':library-emojifier',
         ':sample',
         ':clipboard',
-        ':analytics',
-        ':middleware-lib'
+        ':analytics'