diff --git a/.gitignore b/.gitignore
index 304eb638..d4b50149 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ build/
 gradle/
 app/AeAppsLibrary.iml
 sample/release/
+.kotlin/sessions/
 
 # Local configuration file (sdk path, etc)
 local.properties
diff --git a/build.gradle.kts b/build.gradle.kts
index c88d7ad0..947bfc37 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,6 +8,6 @@ plugins {
 
     id("com.android.application") version "8.5.0" apply false
     id("com.android.library") version "8.5.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.0.0-Beta5" apply false
+    id("org.jetbrains.kotlin.android") version "2.0.0" apply false
     id("maven-publish")
 }
diff --git a/buildSrc/src/main/java/com/ae/apps/lib/Dependencies.kt b/buildSrc/src/main/java/com/ae/apps/lib/Dependencies.kt
index 218bcb95..a46e4ef7 100644
--- a/buildSrc/src/main/java/com/ae/apps/lib/Dependencies.kt
+++ b/buildSrc/src/main/java/com/ae/apps/lib/Dependencies.kt
@@ -12,10 +12,6 @@ object Libs {
         const val CONSTRAINT_LAYOUT = "androidx.constraintlayout:constraintlayout:2.1.4"
     }
 
-    object Kotlin{
-        const val KTX_CORE = "androidx.core:core-ktx:1.13.1"
-    }
-
     object Google {
         const val GUAVA = "com.google.guava:guava:31.0.1-android"
     }
@@ -24,6 +20,11 @@ object Libs {
         private const val  BILLING_VERSION = "6.2.0"
         const val BILLING_CLIENT = "com.android.billingclient:billing:$BILLING_VERSION"
         const val IN_APP_REVIEW = "com.google.android.play:review:2.0.1"
+
+        object Kotlin{
+            const val IN_APP_REVIEW = "com.google.android.play:review-ktx:2.0.1"
+            const val IN_APP_UPDATE = "com.google.android.play:app-update-ktx:2.1.0"
+        }
     }
 
     object Material {
diff --git a/buildSrc/src/main/java/com/ae/apps/lib/Publish.kt b/buildSrc/src/main/java/com/ae/apps/lib/Publish.kt
index 0370e772..e72267e2 100644
--- a/buildSrc/src/main/java/com/ae/apps/lib/Publish.kt
+++ b/buildSrc/src/main/java/com/ae/apps/lib/Publish.kt
@@ -2,7 +2,7 @@ package com.ae.apps.lib
 
 object Publish {
     const val GROUP_ID = "com.github.midhunhk.lib-aeapps"
-    const val VERSION_STRING = "5.0.0-alpha.20"
+    const val VERSION_STRING = "5.0.0-alpha.21"
 }
 
 object ArtifactId {
diff --git a/gradle.properties b/gradle.properties
index 06faf046..b03e6325 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,4 @@
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
-#org.gradle.unsafe.configuration-cache=false
-#android.enableJetifier=true
 android.useAndroidX=true
 android.nonTransitiveRClass=true
+org.gradle.configuration-cache=true
diff --git a/modules/billing-client/build.gradle.kts b/modules/billing-client/build.gradle.kts
index 6fcddb7d..22508cdc 100644
--- a/modules/billing-client/build.gradle.kts
+++ b/modules/billing-client/build.gradle.kts
@@ -64,7 +64,6 @@ dependencies {
     implementation (Libs.AndroidX.APPCOMPAT)
     implementation (Libs.GooglePlay.BILLING_CLIENT)
     implementation (Libs.Google.GUAVA)
-    implementation (Libs.Kotlin.KTX_CORE)
 
     testImplementation (Libs.Test.JUNIT)
     androidTestImplementation (Libs.Test.TEST_RUNNER)
diff --git a/modules/billing-client/consumer-rules.pro b/modules/billing-client/consumer-rules.pro
new file mode 100644
index 00000000..e69de29b
diff --git a/modules/database-helpers/build.gradle.kts b/modules/database-helpers/build.gradle.kts
index d828fc8c..b7befd25 100644
--- a/modules/database-helpers/build.gradle.kts
+++ b/modules/database-helpers/build.gradle.kts
@@ -66,7 +66,6 @@ kotlin {
 
 dependencies {
     api (project(":core"))
-    implementation(Libs.Kotlin.KTX_CORE)
 
     testImplementation(Libs.Test.JUNIT)
     testImplementation(Libs.Test.MOCKITO_CORE)
diff --git a/modules/database-helpers/consumer-rules.pro b/modules/database-helpers/consumer-rules.pro
new file mode 100644
index 00000000..e69de29b
diff --git a/modules/mocks/build.gradle.kts b/modules/mocks/build.gradle.kts
index 66b88349..8e7e6d37 100644
--- a/modules/mocks/build.gradle.kts
+++ b/modules/mocks/build.gradle.kts
@@ -6,6 +6,7 @@ import com.ae.apps.lib.Publish
 plugins {
     id ("com.android.library")
     id ("maven-publish")
+    id ("org.jetbrains.kotlin.android")
 }
 
 android {
@@ -36,8 +37,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }
 
@@ -56,10 +57,19 @@ afterEvaluate {
     }
 }
 
+kotlin {
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+
+    jvmToolchain(17)
+}
+
 dependencies {
     api (project(":core"))
 
     implementation(Libs.AndroidX.APPCOMPAT)
+    implementation("androidx.core:core-ktx:1.13.1")
 
     androidTestImplementation (Libs.Test.TEST_RUNNER)
     androidTestImplementation (Libs.Test.MOCKITO_CORE)
diff --git a/modules/multi-contact/consumer-rules.pro b/modules/multi-contact/consumer-rules.pro
new file mode 100644
index 00000000..e69de29b
diff --git a/modules/runtime-permissions/consumer-rules.pro b/modules/runtime-permissions/consumer-rules.pro
new file mode 100644
index 00000000..e69de29b
diff --git a/modules/sms-api/consumer-rules.pro b/modules/sms-api/consumer-rules.pro
new file mode 100644
index 00000000..e69de29b
diff --git a/modules/sms-api/src/test/java/com/ae/apps/lib/api/sms/MockSmsApiGateway.java b/modules/sms-api/src/test/java/com/ae/apps/lib/api/sms/MockSmsApiGateway.java
index 6629155c..c0180dbc 100644
--- a/modules/sms-api/src/test/java/com/ae/apps/lib/api/sms/MockSmsApiGateway.java
+++ b/modules/sms-api/src/test/java/com/ae/apps/lib/api/sms/MockSmsApiGateway.java
@@ -29,7 +29,7 @@ public class MockSmsApiGateway extends AbstractSmsApiGateway {
 
     public static final int MESSAGE_INFO_COUNT = 5;
 
-    public void setContentResoler(final ContentResolver contentResolver){
+    public void setContentResolver(final ContentResolver contentResolver){
         this.contentResolver = contentResolver;
     }
 
diff --git a/modules/sms-api/src/test/java/com/ae/apps/lib/api/sms/SmsApiGatewayTest.java b/modules/sms-api/src/test/java/com/ae/apps/lib/api/sms/SmsApiGatewayTest.java
index b6d2ae5d..f3140b38 100644
--- a/modules/sms-api/src/test/java/com/ae/apps/lib/api/sms/SmsApiGatewayTest.java
+++ b/modules/sms-api/src/test/java/com/ae/apps/lib/api/sms/SmsApiGatewayTest.java
@@ -36,7 +36,7 @@ public class SmsApiGatewayTest {
     @Before
     public void setUp() {
         MockSmsApiGateway mockSmsApiGateway = new MockSmsApiGateway();
-        mockSmsApiGateway.setContentResoler(contentResolver);
+        mockSmsApiGateway.setContentResolver(contentResolver);
         apiGateway = mockSmsApiGateway;
     }
 
diff --git a/modules/utilities/build.gradle.kts b/modules/utilities/build.gradle.kts
index 24fcfa30..8a987308 100644
--- a/modules/utilities/build.gradle.kts
+++ b/modules/utilities/build.gradle.kts
@@ -6,6 +6,7 @@ import com.ae.apps.lib.Publish
 plugins {
     id ("com.android.library")
     id ("maven-publish")
+    id ("org.jetbrains.kotlin.android")
 }
 android {
     namespace = "com.ae.apps.lib.utilities"