diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
index 4dc74bd..c8382d2 100644
--- a/androidApp/build.gradle.kts
+++ b/androidApp/build.gradle.kts
@@ -45,4 +45,6 @@ dependencies {
     implementation(libs.compose.material3)
     implementation(libs.androidx.activity.compose)
     debugImplementation(libs.compose.ui.tooling)
-}
\ No newline at end of file
+
+    implementation(project(":androidModules:utils"))
+}
diff --git a/gradle.properties b/gradle.properties
index 7f53ad4..866770b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,11 +1,11 @@
-#Gradle
-org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
-org.gradle.caching=true
-org.gradle.configuration-cache=true
-
 #Kotlin
 kotlin.code.style=official
-
+kotlin.mpp.enableCInteropCommonization=true
+kotlin.native.ignoreDisabledTargets=true
+#Gradle
+org.gradle.jvmargs=-Xms2G -Xmx8G -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC
 #Android
 android.useAndroidX=true
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.useTransitiveRClass=true
+#Development
+development=true
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index b30c99e..b1adf30 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -4,6 +4,10 @@ plugins {
 }
 
 kotlin {
+    kotlin.applyDefaultHierarchyTemplate()
+
+    androidTarget()
+
     androidTarget {
         compilations.all {
             kotlinOptions {
@@ -24,12 +28,23 @@ kotlin {
     }
 
     sourceSets {
-        commonMain.dependencies {
-            //put your multiplatform dependencies here
+        val commonMain by getting {
+            //Fix for: https://stackoverflow.com/a/69626787
+            all {
+                languageSettings.optIn("io.ktor.util.InternalAPI")
+            }
+
+            dependencies {
+
+            }
+            kotlin.srcDir(layout.buildDirectory.dir("/generate-resources/main/src/"))
         }
-        commonTest.dependencies {
-            implementation(libs.kotlin.test)
+        val commonTest by getting {
+            dependencies {
+                implementation(libs.kotlin.test)
+            }
         }
+        logger.info("${commonMain.name} ${commonTest.name}")
     }
 }