diff --git a/app/build.gradle b/app/build.gradle
index 63f8faa..f09f254 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,6 @@ plugins {
     alias libs.plugins.android.application
     alias libs.plugins.hilt.android
     alias libs.plugins.kotlin.android
-    alias libs.plugins.kotlin.kapt
     alias libs.plugins.ksp
 }
 
@@ -38,7 +37,6 @@ android {
         }
     }
     buildFeatures {
-        buildConfig true
         compose true
     }
     buildTypes {
@@ -108,8 +106,7 @@ dependencies {
 
     testImplementation libs.junit
 
-    kapt libs.androidx.hilt.compiler
-    kapt libs.dagger.hiltAndroidCompiler
-
+    ksp libs.androidx.hilt.compiler
     ksp libs.androidx.room.compiler
+    ksp libs.dagger.hiltCompiler
 }
diff --git a/app/src/main/java/com/navi/uitron/demo/MainApplication.kt b/app/src/main/java/com/navi/uitron/demo/MainApplication.kt
index 0f6ed1b..5ecb9e7 100644
--- a/app/src/main/java/com/navi/uitron/demo/MainApplication.kt
+++ b/app/src/main/java/com/navi/uitron/demo/MainApplication.kt
@@ -14,7 +14,6 @@ import androidx.media3.datasource.cache.SimpleCache
 import coil.ImageLoader
 import coil.ImageLoaderFactory
 import coil.decode.SvgDecoder
-import coil.request.CachePolicy
 import com.navi.uitron.UiTronSdkManager
 import com.navi.uitron.demo.dazzledesignsystem.db.SharedPreferences
 import dagger.hilt.android.HiltAndroidApp
@@ -46,9 +45,6 @@ class MainApplication : Application(), ImageLoaderFactory {
     override fun newImageLoader(): ImageLoader {
         return ImageLoader.Builder(this.applicationContext)
             .components { add(SvgDecoder.Factory()) }
-            .respectCacheHeaders(enable = false)
-            .diskCachePolicy(CachePolicy.ENABLED)
-            .memoryCachePolicy(CachePolicy.ENABLED)
             .allowHardware(false)
             .build()
     }
diff --git a/build.gradle b/build.gradle
index 06e8e59..c34c8f6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,6 @@ plugins {
     alias libs.plugins.android.test apply false
     alias libs.plugins.hilt.android apply false
     alias libs.plugins.kotlin.android apply false
-    alias libs.plugins.kotlin.kapt apply false
     alias libs.plugins.kotlin.parcelize apply false
     alias libs.plugins.ksp apply false
     alias libs.plugins.spotless
diff --git a/gradle.properties b/gradle.properties
index 29c7133..9536612 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,8 +8,8 @@
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
 # org.gradle.parallel=true
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2ba130f..3e4dde4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,7 +26,7 @@ kotlin = "1.9.24"
 ksp = "1.9.24-1.0.20"
 lottie = "6.4.1"
 mvel2 = "2.4.15.Final"
-navi-alfred = "1.14.0"
+navi-alfred = "1.16.0"
 navigation-compose = "2.6.0"
 okhttp-bom = "4.12.0"
 retrofit = "2.11.0"
@@ -83,7 +83,7 @@ coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
 coil-svg = { module = "io.coil-kt:coil-svg", version.ref = "coil" }
 
 dagger-hiltAndroid = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
-dagger-hiltAndroidCompiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" }
+dagger-hiltCompiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" }
 
 firebase-analytics = { module = "com.google.firebase:firebase-analytics" }
 firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebase-bom" }
@@ -113,7 +113,6 @@ android-library = { id = "com.android.library", version.ref = "androidGradlePlug
 android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
 hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 maven-publish = { id = "maven-publish" }
diff --git a/navi-uitron/build.gradle b/navi-uitron/build.gradle
index 1abadf1..e380434 100644
--- a/navi-uitron/build.gradle
+++ b/navi-uitron/build.gradle
@@ -3,6 +3,7 @@ plugins {
     alias libs.plugins.kotlin.android
     alias libs.plugins.kotlin.parcelize
     alias libs.plugins.maven.publish
+    alias libs.plugins.ksp
 }
 
 def VERSION = "1.27.1"
@@ -20,7 +21,6 @@ android {
     }
 
     buildFeatures {
-        buildConfig true
         compose true
     }
     buildTypes {
@@ -117,7 +117,11 @@ dependencies {
     implementation libs.androidx.core.ktx
     implementation libs.androidx.hilt.navigation.compose
     implementation libs.androidx.lifecycle.runtime.ktx
+    implementation libs.dagger.hiltAndroid
     implementation libs.gson
     implementation libs.lottieCompose
     implementation libs.mvel2
+
+    ksp libs.androidx.hilt.compiler
+    ksp libs.dagger.hiltCompiler
 }
diff --git a/navi-uitron/src/main/java/com/navi/uitron/viewmodel/UiTronViewModel.kt b/navi-uitron/src/main/java/com/navi/uitron/viewmodel/UiTronViewModel.kt
index 91fb76e..f2f26e7 100644
--- a/navi-uitron/src/main/java/com/navi/uitron/viewmodel/UiTronViewModel.kt
+++ b/navi-uitron/src/main/java/com/navi/uitron/viewmodel/UiTronViewModel.kt
@@ -27,14 +27,12 @@ import com.navi.uitron.utils.getExtrasId
 import com.navi.uitron.utils.getGsonBuilders
 import com.navi.uitron.utils.getInputId
 import com.navi.uitron.utils.getPropertyId
-import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.launch
 
 @Suppress("unused")
-@HiltViewModel
 open class UiTronViewModel(
     val handle: SavedStateHandle = SavedStateHandle(),
     val stateHolder: ComposeStateHolder = ComposeStateHolder(),