diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 25a8b87..145366a 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -34,31 +34,6 @@
         <AndroidXmlCodeStyleSettings>
           <option name="USE_CUSTOM_SETTINGS" value="true" />
         </AndroidXmlCodeStyleSettings>
-        <Objective-C-extensions>
-          <file>
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-          </file>
-          <class>
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-          </class>
-          <extensions>
-            <pair source="cpp" header="h" />
-            <pair source="c" header="h" />
-          </extensions>
-        </Objective-C-extensions>
         <XML>
           <option name="XML_KEEP_LINE_BREAKS" value="false" />
           <option name="XML_ALIGN_ATTRIBUTES" value="false" />
diff --git a/build.gradle b/build.gradle
index b605ec5..789411b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 project.ext {
-    supportLibrary = '26.1.0'
+    supportLibrary = '27.1.1'
     butterKnife = '8.8.1'
     rxbinding = '2.0.0'
     okhttpVersion = '3.9.1'
@@ -30,17 +30,17 @@ project.ext {
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.2.0'
+    ext.kotlin_version = '1.2.51'
     repositories {
         jcenter()
         google()
         mavenCentral()
         maven {
-            url "https://plugins.gradle.org/m2/" // error-prone
+            url "https://plugins.gradle.org/m2/"
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath "com.android.tools.build:gradle:3.1.3"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 //        classpath 'com.google.gms:google-services:3.1.0'
         classpath 'io.realm:realm-gradle-plugin:4.2.0'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f16d266..7b3fb3c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Jul 06 07:56:05 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/sampleApp/build.gradle b/sampleApp/build.gradle
index c17a566..886e165 100644
--- a/sampleApp/build.gradle
+++ b/sampleApp/build.gradle
@@ -3,16 +3,17 @@ apply plugin: 'kotlin-android'
 apply plugin: 'realm-android'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         applicationId "com.zeyad.usecase.accesslayer"
         minSdkVersion 21
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "com.zeyad.usecases.app.UseCasesTestRunner"
+        multiDexEnabled true
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     signingConfigs {
@@ -94,70 +95,70 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':usecases')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':usecases')
     // Support
-//    compile 'com.android.support:multidex:1.0.1'
-    compile "com.android.support:appcompat-v7:$supportLibrary"
-    compile "com.android.support:support-v4:$supportLibrary"
-    compile "com.android.support:recyclerview-v7:$supportLibrary"
-    compile "com.android.support:design:$supportLibrary"
-    compile "com.android.support:cardview-v7:$supportLibrary"
-    compile "com.android.support:palette-v7:$supportLibrary"
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+//    implementation 'com.android.support:multidex:1.0.1'
+    implementation "com.android.support:appcompat-v7:$supportLibrary"
+    implementation "com.android.support:support-v4:$supportLibrary"
+    implementation "com.android.support:recyclerview-v7:$supportLibrary"
+    implementation "com.android.support:design:$supportLibrary"
+    implementation "com.android.support:cardview-v7:$supportLibrary"
+    implementation "com.android.support:palette-v7:$supportLibrary"
+    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
 
     // Bootstrap
-    compile "com.github.Zeyad-37:GenericRecyclerViewAdapter:$genericRecyclerViewAdapter"
-    compile "com.github.Zeyad-37:RxRedux:$rxredux"
+    implementation "com.github.Zeyad-37:GenericRecyclerViewAdapter:$genericRecyclerViewAdapter"
+    implementation "com.github.Zeyad-37:RxRedux:$rxredux"
 
-//    compile "android.arch.lifecycle:runtime:$archComp"
-//    compile "android.arch.lifecycle:extensions:$archComp"
-//    compile "android.arch.lifecycle:reactivestreams:$archComp"
+//    implementation "android.arch.lifecycle:runtime:$archComp"
+//    implementation "android.arch.lifecycle:extensions:$archComp"
+//    implementation "android.arch.lifecycle:reactivestreams:$archComp"
     // Network
-    compile 'com.github.bumptech.glide:glide:3.7.0'
+    implementation 'com.github.bumptech.glide:glide:4.0.0'
     // Rx
 //    def withoutRx = { exclude group: "io.reactivex.rxjava2" }
-    compile "com.jakewharton.rxbinding2:rxbinding:$rxbinding"//, withoutRx
-    compile "com.jakewharton.rxbinding2:rxbinding-appcompat-v7:$rxbinding"
-    compile "com.jakewharton.rxbinding2:rxbinding-design:$rxbinding"
-    compile "com.jakewharton.rxbinding2:rxbinding-recyclerview-v7:$rxbinding"
-//    compile "com.trello.rxlifecycle2:rxlifecycle:$rxLifeCycle"
-//    compile "com.trello.rxlifecycle2:rxlifecycle-components:$rxLifeCycle"
+    implementation "com.jakewharton.rxbinding2:rxbinding:$rxbinding"//, withoutRx
+    implementation "com.jakewharton.rxbinding2:rxbinding-appcompat-v7:$rxbinding"
+    implementation "com.jakewharton.rxbinding2:rxbinding-design:$rxbinding"
+    implementation "com.jakewharton.rxbinding2:rxbinding-recyclerview-v7:$rxbinding"
+//    implementation "com.trello.rxlifecycle2:rxlifecycle:$rxLifeCycle"
+//    implementation "com.trello.rxlifecycle2:rxlifecycle-components:$rxLifeCycle"
     // Injection
-    compile "com.jakewharton:butterknife:$butterKnife"
-    annotationProcessor "com.jakewharton:butterknife-compiler:$butterKnife"
+    implementation "com.jakewharton:butterknife:$butterKnife"
+    annotationProcessor "com.jakewharton:butterknife-implementationr:$butterKnife"
     // Utilities
-    compile "nl.littlerobots.rxlint:rxlint:$rxlint"
-    compile 'com.airbnb.android:lottie:2.2.0'
-    debugCompile "com.squareup.leakcanary:leakcanary-android:$leakCanary"
-    releaseCompile "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanary"
-    testCompile "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanary"
-    compile 'org.parceler:parceler-api:1.1.9'
+    implementation "nl.littlerobots.rxlint:rxlint:$rxlint"
+    implementation 'com.airbnb.android:lottie:2.2.0'
+    debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanary"
+    releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanary"
+    testImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanary"
+    implementation 'org.parceler:parceler-api:1.1.9'
     annotationProcessor 'org.parceler:parceler:1.1.9'
-//    compile("io.flowup:android-sdk:0.2.4") {
+//    implementation("io.flowup:android-sdk:0.2.4") {
 //        exclude group: 'com.google.android.gms'
 //    }
-//    testCompile 'io.flowup:android-sdk-no-op:0.2.4'
+//    testImplementation 'io.flowup:android-sdk-no-op:0.2.4'
     // Testing
-    androidTestCompile "com.android.support.test:runner:$androidSupportTest"
-    androidTestCompile "com.android.support.test:rules:$androidSupportTest"
-    androidTestCompile "com.android.support:support-annotations:$supportLibrary"
-    androidTestCompile "com.android.support.test.espresso:espresso-core:$espressoCore"
-    androidTestCompile 'junit:junit:4.12'
-    androidTestCompile 'org.hamcrest:hamcrest-library:1.3'
-    androidTestCompile "org.mockito:mockito-core:$mockito"
-    androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
-    androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
-    androidTestCompile('com.jakewharton.espresso:okhttp3-idling-resource:1.0.0') {
+    androidTestImplementation "com.android.support.test:runner:$androidSupportTest"
+    androidTestImplementation "com.android.support.test:rules:$androidSupportTest"
+    androidTestImplementation "com.android.support:support-annotations:$supportLibrary"
+    androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoCore"
+    androidTestImplementation 'junit:junit:4.12'
+    androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
+    androidTestImplementation "org.mockito:mockito-core:$mockito"
+    androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
+    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
+    androidTestImplementation('com.jakewharton.espresso:okhttp3-idling-resource:1.0.0') {
         exclude group: 'com.android.support'
     }
-    androidTestCompile "com.squareup.okhttp3:mockwebserver:$okhttpVersion"
-    androidTestCompile "com.github.andrzejchm.RESTMock:android:$restMock"
+    androidTestImplementation "com.squareup.okhttp3:mockwebserver:$okhttpVersion"
+    androidTestImplementation "com.github.andrzejchm.RESTMock:android:$restMock"
 
-    testCompile 'junit:junit:4.12'
-    testCompile "org.mockito:mockito-core:$mockito"
-    debugCompile 'com.21buttons:fragment-test-rule:1.0.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    testImplementation 'junit:junit:4.12'
+    testImplementation "org.mockito:mockito-core:$mockito"
+    debugImplementation 'com.21buttons:fragment-test-rule:1.0.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 //apply from: "$project.rootDir/tools/script-git-version.gradle"
diff --git a/usecases/build.gradle b/usecases/build.gradle
index d447401..66acb5b 100644
--- a/usecases/build.gradle
+++ b/usecases/build.gradle
@@ -3,11 +3,11 @@ apply plugin: 'realm-android'
 apply plugin: "net.ltgt.errorprone"
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 27
+    buildToolsVersion "27.0.3"
     defaultConfig {
         minSdkVersion 17
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "com.zeyad.usecases.integration.AndroidRobolectricRunner"
@@ -67,42 +67,42 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
     //Job Dispatcher
-    compile 'com.firebase:firebase-jobdispatcher:0.7.0'
+    implementation 'com.firebase:firebase-jobdispatcher:0.7.0'
     // Network
-    compile "com.squareup.retrofit2:retrofit:$retrofit"
-    compile "com.squareup.retrofit2:converter-gson:$retrofit"
-    compile "com.squareup.retrofit2:adapter-rxjava2:$retrofit"
-    compile "com.squareup.okhttp3:okhttp:$okhttpVersion"
-    compile "com.squareup.okhttp3:logging-interceptor:$okhttpVersion"
-    compile "com.android.support:support-annotations:$supportLibrary"
+    implementation "com.squareup.retrofit2:retrofit:$retrofit"
+    implementation "com.squareup.retrofit2:converter-gson:$retrofit"
+    implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit"
+    implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
+    implementation "com.squareup.okhttp3:logging-interceptor:$okhttpVersion"
+    implementation "com.android.support:support-annotations:$supportLibrary"
     // Rx
-    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    compile 'io.reactivex.rxjava2:rxjava:2.1.7'
-    testCompile 'io.reactivex:rxandroid:1.2.1'
+    api 'io.reactivex.rxjava2:rxandroid:2.0.2'
+    api 'io.reactivex.rxjava2:rxjava:2.1.16'
+    testImplementation 'io.reactivex:rxandroid:1.2.1'
     // Cache
-    compile('com.github.Zeyad-37:Storo:2.1.0') {
+    implementation('com.github.Zeyad-37:Storo:2.1.0') {
         transitive = true
     }
-    compile 'com.rollbar:rollbar-android:0.2.1'
-    compile "nl.littlerobots.rxlint:rxlint:$rxlint"
+    implementation 'com.rollbar:rollbar-android:0.2.1'
+    implementation "nl.littlerobots.rxlint:rxlint:$rxlint"
     // Testing
-    testCompile 'junit:junit:4.12'
-    testCompile "com.android.support:support-annotations:$supportLibrary"
-    testCompile "org.mockito:mockito-core:$mockito"
-    testCompile "org.robolectric:robolectric:$robolectric"
-//    testCompile "org.robolectric:shadows-support-v4:$robolectric"
+    testImplementation 'junit:junit:4.12'
+    testImplementation "com.android.support:support-annotations:$supportLibrary"
+    testImplementation "org.mockito:mockito-core:$mockito"
+    testImplementation "org.robolectric:robolectric:$robolectric"
+//    testImplementation "org.robolectric:shadows-support-v4:$robolectric"
 
-    testCompile "org.powermock:powermock-module-junit4:$powerMock"
-    testCompile "org.powermock:powermock-module-junit4-rule:$powerMock"
-    testCompile "org.powermock:powermock-api-mockito:$powerMock"
-    testCompile "org.powermock:powermock-classloading-xstream:$powerMock"
+    testImplementation "org.powermock:powermock-module-junit4:$powerMock"
+    testImplementation "org.powermock:powermock-module-junit4-rule:$powerMock"
+    testImplementation "org.powermock:powermock-api-mockito:$powerMock"
+    testImplementation "org.powermock:powermock-classloading-xstream:$powerMock"
 
-//    testCompile "com.squareup.okhttp3:mockwebserver:$okhttpVersion"
-    testCompile 'com.github.andrzejchm.RESTMock:android:0.2.2'
+//    testImplementation "com.squareup.okhttp3:mockwebserver:$okhttpVersion"
+    testImplementation 'com.github.andrzejchm.RESTMock:android:0.2.2'
     //required to resolve robolectric test problems
-    testCompile("com.jakewharton.espresso:okhttp3-idling-resource:$okhttpIdelingResource") {
+    testImplementation("com.jakewharton.espresso:okhttp3-idling-resource:$okhttpIdelingResource") {
         exclude group: 'com.android.support'
     }
 }