diff --git a/app/build.gradle b/app/build.gradle
index 1f2d889..fb83a2b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,7 +20,7 @@ android {
 
         release {
             minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt') ,
+            proguardFiles getDefaultProguardFile('proguard-android.txt'),
                     'proguard-rules.pro'
         }
     }
@@ -28,11 +28,15 @@ android {
     packagingOptions {
         exclude 'META-INF/androidx.legacy_legacy-support-core-utils.version'
     }
+
+    dynamicFeatures = []
+
 }
 
 dependencies {
     implementation project(':features:base')
     implementation project(':features:repositories')
+    implementation project(':features:repository')
 
     rootProject.app.each { item ->
         add(item.configuration, item.dependency, item.options)
diff --git a/build.gradle b/build.gradle
index 845bd57..b52538e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         classpath 'org.jacoco:org.jacoco.core:0.8.5'
         classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.0'
         classpath "com.github.ben-manes:gradle-versions-plugin:0.27.0"
diff --git a/buildsystem/android_commons.gradle b/buildsystem/android_commons.gradle
index 2f2c466..2ffccd8 100644
--- a/buildsystem/android_commons.gradle
+++ b/buildsystem/android_commons.gradle
@@ -27,4 +27,9 @@ android {
             }
         }
     }
+
+    packagingOptions {
+        //Bugfix for AutoValue 1.7rc1 and AutoFactory 1.0-beta7 in one project
+        exclude 'META-INF/gradle/incremental.annotation.processors'
+    }
 }
\ No newline at end of file
diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle
index 1f66239..91f0229 100644
--- a/buildsystem/dependencies.gradle
+++ b/buildsystem/dependencies.gradle
@@ -4,12 +4,13 @@ ext {
     //
 
     //Annotation processor dependencies
-    daggerVersion = '2.24'
+    daggerVersion = '2.25.2'
     autoFactoryVersion = '1.0-beta7'
+    autoValueVersion = "1.7"
     butterknifeVersion = '10.2.0'
 
     //Standard dependencies
-    supportLibraryVersion = '1.0.0'
+    supportLibraryVersion = '1.1.0'
     javaxAnnotationsVersion = '10.0-b28'
     autoFactoryVersion = '1.0-beta7'
     rxAndroidVersion = '1.2.1'
@@ -17,12 +18,12 @@ ext {
     rxBindingVersion = '1.0.1'
     timberVersion = '4.7.1'
     retrofitVersion = '2.6.2'
-    gsonVersion = '2.3.0'
+    gsonVersion = '2.6.2'
     okhttpVersion = '4.2.2'
     guavaVersion = '28.1-android'
 
     // Testing dependencies
-    junitVersion = '4.13-beta-3'
+    junitVersion = '4.13-rc-1'
     mockitoVersion = '3.1.0'
 
     //Functional/end-to-end testing dependencies
@@ -41,12 +42,14 @@ ext {
 
     //Standard dependencies
     appCompat = "androidx.appcompat:appcompat:${supportLibraryVersion}"
-    recyclerView = "androidx.recyclerview:recyclerview:${supportLibraryVersion}"
+    recyclerView = "androidx.recyclerview:recyclerview:1.1.0-rc01"
 
     butterknife = "com.jakewharton:butterknife:${butterknifeVersion}"
     dagger = "com.google.dagger:dagger:${daggerVersion}"
     javaxAnnotations = "org.glassfish:javax.annotation:${javaxAnnotationsVersion}"
     autoFactory = "com.google.auto.factory:auto-factory:${autoFactoryVersion}"
+    autoValue = "com.google.auto.value:auto-value:${autoValueVersion}"
+    autoValueAnnotations = "com.google.auto.value:auto-value-annotations:${autoValueVersion}"
     rxAndroid = "io.reactivex:rxandroid:${rxAndroidVersion}"
     rxJava = "io.reactivex:rxjava:${rxJavaVersion}"
     rxBinding = "com.jakewharton.rxbinding:rxbinding:${rxBindingVersion}"
@@ -96,6 +99,8 @@ ext {
             [configuration: "api", dependency: dagger],
             [configuration: "api", dependency: javaxAnnotations],
             [configuration: "api", dependency: autoFactory],
+            [configuration: "api", dependency: autoValue],
+            [configuration: "api", dependency: autoValueAnnotations],
             [configuration: "api", dependency: rxAndroid],
             [configuration: "api", dependency: rxJava],
             [configuration: "api", dependency: rxBinding],
@@ -128,5 +133,6 @@ ext {
             [configuration: "annotationProcessor", dependency: autoFactoryCompiler],
             [configuration: "annotationProcessor", dependency: daggerCompiler],
             [configuration: "annotationProcessor", dependency: butterknifeCompiler],
+            [configuration: "annotationProcessor", dependency: autoValue],
     ]
 }
diff --git a/features/base/build.gradle b/features/base/build.gradle
index 927732b..abe1b50 100644
--- a/features/base/build.gradle
+++ b/features/base/build.gradle
@@ -1,11 +1,9 @@
-apply plugin: 'com.android.feature'
+apply plugin: 'com.android.library'
 apply plugin: 'jacoco'
 
 apply from: '../../buildsystem/android_commons.gradle'
 
 android {
-    baseFeature true
-
     buildTypes {
         all {
             consumerProguardFiles 'feature-base-proguard-rules.pro'
@@ -14,10 +12,6 @@ android {
 }
 
 dependencies {
-    application project(':app')
-    feature project(":features:repositories")
-    feature project(":features:repository")
-
     rootProject.base.each { item ->
         add(item.configuration, item.dependency, item.options)
     }
diff --git a/features/base/src/main/java/com/frogermcs/multimodulegithubclient/base/data/api/NetworkingModule.java b/features/base/src/main/java/com/frogermcs/multimodulegithubclient/base/data/api/NetworkingModule.java
index a3f71ef..3f65321 100644
--- a/features/base/src/main/java/com/frogermcs/multimodulegithubclient/base/data/api/NetworkingModule.java
+++ b/features/base/src/main/java/com/frogermcs/multimodulegithubclient/base/data/api/NetworkingModule.java
@@ -41,7 +41,7 @@ public OkHttpClient provideOkHttpClient(HttpLoggingInterceptor httpLoggingInterc
     @Singleton
     public HttpLoggingInterceptor provideHttpLoggingInterceptor() {
         HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
-        logging.setLevel(BuildConfig.DEBUG ? HttpLoggingInterceptor.Level.BODY : HttpLoggingInterceptor.Level.NONE);
+        logging.level(BuildConfig.DEBUG ? HttpLoggingInterceptor.Level.BODY : HttpLoggingInterceptor.Level.NONE);
         return logging;
     }
 
diff --git a/features/repositories/build.gradle b/features/repositories/build.gradle
index f670ec0..1ca6bb6 100644
--- a/features/repositories/build.gradle
+++ b/features/repositories/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'com.android.feature'
+apply plugin: 'com.android.library'
 apply plugin: 'com.jakewharton.butterknife'
 apply plugin: 'jacoco'
 
diff --git a/features/repository/build.gradle b/features/repository/build.gradle
index 366b864..8f83821 100644
--- a/features/repository/build.gradle
+++ b/features/repository/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'com.android.feature'
+apply plugin: 'com.android.library'
 apply plugin: 'com.jakewharton.butterknife'
 apply plugin: 'jacoco'