diff --git a/README.md b/README.md
index 5ad932d..2596eb3 100644
--- a/README.md
+++ b/README.md
@@ -1,110 +1,304 @@
-# AndroidRust Gradle Plugin
+# Gradle Android Rust Plugin
 
-This plugin helps with building Rust JNI libraries with Cargo for use in Android projects.
+A Gradle plugin for building Rust libraries with Cargo for Android projects.
 
-Link to the plugin on the gradle repository:
-https://plugins.gradle.org/plugin/io.github.MatrixDev.android-rust
+## Version 0.8.0 - New Features
 
-# Usage
+### 🚀 New in 0.8.0
 
-Add dependencies to the root `build.gradle.kts` file
+#### **Cargo Clean Support**
+New `cargoClean` feature allows you to run `cargo clean` on your Rust modules:
+
+**Manual clean (always available):**
+```bash
+./gradlew cargoClean              # Clean all Rust modules
+./gradlew cargoCleanMyLib         # Clean specific module "mylib"
+```
+
+**Auto-clean with Gradle clean:**
+Enable `cargoClean` to automatically run `cargo clean` when you run `./gradlew clean`:
 
 ```kotlin
-buildscript {
-    repositories {
-        maven("https://plugins.gradle.org/m2/")
-    }
+androidRust {
+    module("mylib") {
+        path = file("src/main/jni")
+        cargoClean = true  // Enable auto-clean for this module
 
-    dependencies {
-        classpath("io.github.MatrixDev.android-rust:plugin:0.5.0")
+        buildType("release") {
+            cargoClean = true  // Or enable only for specific build types
+        }
     }
+
+    // Or enable globally for all modules
+    cargoClean = true
 }
 ```
 
-Add plugin to the module's `build.gradle.kts` file
+**New Tasks:**
+- `cargoClean` - Runs cargo clean for all Rust modules
+- `cargoClean<ModuleName>` - Runs cargo clean for a specific module
 
-```kotlin
-plugins {
-    id("io.github.MatrixDev.android-rust")
-}
-```
+---
+
+## Version 0.7.0 Features
 
-Add `androidRust` configuration
+### 🚀 Major Improvements
+
+#### 1. **cargo-ndk Integration**
+The plugin now uses `cargo-ndk` instead of raw `cargo` commands for building Android libraries. This eliminates common linking errors and simplifies the build process.
+
+**Benefits:**
+- Automatic NDK environment configuration
+- No manual environment variable setup needed
+- Fewer linking errors and build failures
+- Better compatibility with Android NDK
+- Automatic rust home finding
+- Fixed bugs
+
+The plugin will automatically install `cargo-ndk` if it's not already available.
+
+#### 2. **Full Windows Support**
+Complete support for Windows development environment:
+- Automatic rustup installation on Windows
+- Proper handling of Windows executable paths (.cmd wrappers)
+- Windows-specific rustup installation via PowerShell
+
+#### 3. **Gradle Build Cache Support**
+Proper Gradle task input/output annotations for intelligent caching:
+- `@InputFiles` - Tracks Rust source files (*.rs, Cargo.toml, Cargo.lock)
+- `@OutputDirectory` - Tracks JNI libs output directory
+- Incremental builds - Only rebuilds when Rust sources change
+- Better build performance in CI/CD environments
+
+#### 4. **Parallel ABI Builds**
+Multiple ABIs now build in parallel when using Gradle's `--parallel` flag:
+- Significantly faster builds when targeting multiple architectures
+- Optimal CPU utilization during compilation
+- No sequential dependency chains between ABI builds
+
+#### 5. **Enhanced Error Messages**
+Detailed, actionable error messages when builds fail:
+- Clear indication of what went wrong
+- Specific suggestions for common issues
+- Direct guidance on how to fix problems
+- Better developer experience
+
+#### 6. **Build Validation**
+Pre-build validation to catch configuration errors early:
+- Validates Rust project paths exist
+- Checks for Cargo.toml presence
+- Verifies NDK installation
+- Ensures module configurations are complete
+
+### 🔧 Configuration
+
+#### Basic Setup
 
 ```kotlin
 androidRust {
-    module("rust-library") {
-        path = file("src/rust_library")
+    module("mylib") {
+        path = file("../rust/mylib")
+        targets = listOf("arm", "arm64", "x86", "x86_64")
+        
+        buildType("debug") {
+            profile = "dev"
+            runTests = true
+        }
+        
+        buildType("release") {
+            profile = "release"
+        }
     }
 }
 ```
 
-# Additional configurations
-
-This is the list of some additional flags that can be configured:
+#### Advanced Options
 
 ```kotlin
 androidRust {
-    // MSRV, plugin will update rust if installed version is lower than requested
-    minimumSupportedRustVersion = "1.62.1"
+    minimumSupportedRustVersion = "1.70.0"
     
-    module("rust-library") {
-        // path to your rust library
-        path = file("src/rust_library")
-
-        // default rust profile
-        profile = "release"
-
-        // default abi targets
-        targets = listOf("arm", "arm64")
-
-        // "debug" build type specific configuration
+    module("mylib") {
+        path = file("../rust/mylib")
+        targets = listOf("arm64")
+        runTests = true
+        disableAbiOptimization = false
+        
         buildType("debug") {
-            // use "dev" profile in rust
             profile = "dev"
         }
-
-        // "release" build type specific configuration
+        
         buildType("release") {
-            // run rust tests before build
-            runTests = true
-
-            // build all supported abi versions
-            targets = listOf("arm", "arm64", "x86", "x86_64")
+            profile = "release"
         }
     }
-
-    // more than one library can be added 
-    module("additional-library") {
-        // ...
-    }
 }
 ```
 
+### Configuration Options
+
+| Option | Description | Default |
+|--------|-------------|---------|
+| `minimumSupportedRustVersion` | Minimum Rust version required | `""` (no check) |
+| `path` | Path to Rust project directory | **Required** |
+| `targets` | List of target ABIs | `["arm", "arm64", "x86", "x86_64"]` |
+| `profile` | Rust build profile | `"release"` |
+| `runTests` | Run `cargo test` before building | `null` (disabled) |
+| `disableAbiOptimization` | Disable IDE ABI injection | `null` (false) |
+| `cargoClean` | Run `cargo clean` with `./gradlew clean` | `null` (disabled) |
+
+### Supported ABIs
+
+| Rust Name | Android Name | Architecture |
+|-----------|--------------|--------------|
+| `arm` | `armeabi-v7a` | 32-bit ARM |
+| `arm64` | `arm64-v8a` | 64-bit ARM |
+| `x86` | `x86` | 32-bit x86 |
+| `x86_64` | `x86_64` | 64-bit x86 |
+
+### Requirements
+
+- Android Gradle Plugin 7.0+
+- Rust toolchain (will be auto-installed if missing)
+- cargo-ndk (will be auto-installed if missing)
+- Android NDK (install via Android Studio SDK Manager)
+
+### How It Works
+
+1. **Auto-Installation**: Plugin automatically installs rustup, Rust toolchain, cargo-ndk, and required target triples
+2. **Validation**: Pre-build validation ensures all paths and configurations are correct
+3. **Parallel Building**: cargo-ndk builds each target ABI, potentially in parallel
+4. **Output Placement**: Compiled .so files are automatically placed in jniLibs directories
+5. **Integration**: Android build system picks up the libraries automatically
+
+### How to install
+
+The puglin is avaiable here : https://plugins.gradle.org/plugin/io.github.rodroidmods.android-rust
+
+### Cargo.toml Requirements
+
+Your Rust library must be configured as a C dynamic library:
+
+```toml
+[package]
+name = "mylib"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+# your dependencies here
+```
+
+### Custom Rust Binary Paths
+
+If you have Rust installed in a custom location, create `local.properties`:
+
+```properties
+cargo.bin=/custom/path/to/cargo/bin
+```
 
-# Development support
-Plugin will check for a magic property `android.injected.build.abi` set by Android Studio when
-running application on device. This will limit ABI targets to only required by the device and
-should speedup development quite a bit.
+The plugin will look for `cargo`, `cargo-ndk`, `rustc`, and `rustup` in this directory.
 
-In theory this should behave the same as a built-in support for the NdkBuild / CMake.
+### Build Tasks
 
+The plugin creates tasks for each build type and ABI combination:
 
-# Goals
-- Building multiple rust libraries with ease
-- Allow builds to be configurable for common scenarios
+- `clean<BuildType>RustJniLibs` - Clean Rust build artifacts
+- `test<Module>Rust` - Run Rust tests (if enabled)
+- `build<BuildType><Module>Rust[<ABI>]` - Build specific ABI
+- `cargoClean` - Run cargo clean for all Rust modules
+- `cargoClean<Module>` - Run cargo clean for a specific module
 
+Example tasks:
+- `buildReleaseMyLibRust[arm64-v8a]`
+- `buildDebugMyLibRust[x86_64]`
+- `testMyLibRust`
+- `cargoClean`
+- `cargoCleanMyLib`
 
-# Non-goals
-- Supporting all Gradle versions
-- Allow builds to be configurable for exotic scenarios
+### Gradle Build Cache
 
+The plugin fully supports Gradle's build cache. To enable:
 
-# IDE Enviroment PATH Workaround
-On some systems (notably MacOS) gradle task might fail to locate rust binaries. At this moment there are multiple issues/discussions for both gradle and IntelliJ IDEs.
+```bash
+./gradlew build --build-cache
+```
 
-To solve this problem cargo path can be provided in `local.properties` file:
+Or add to `gradle.properties`:
 ```properties
-sdk.dir=...
-cargo.bin=/Users/{user}/.cargo/bin/
+org.gradle.caching=true
+```
+
+### Parallel Builds
+
+To build multiple ABIs in parallel:
+
+```bash
+./gradlew build --parallel
+```
+
+Or add to `gradle.properties`:
+```properties
+org.gradle.parallel=true
+```
+
+### Troubleshooting
+
+#### cargo-ndk not found
+The plugin will automatically install cargo-ndk, but if you see errors, manually install:
+```bash
+cargo install cargo-ndk
+
+and if you have issues with rust beign not founded, than just ad cargo.bin path in local.prop and problem will be fixed
 ```
+
+#### NDK not found
+Install NDK via Android Studio: Tools → SDK Manager → SDK Tools → NDK (Side by side)
+
+#### Library not found when running from Android Studio
+If you see "library not found" errors when running from Android Studio, set:
+```kotlin
+androidRust {
+    module("mylib") {
+        disableAbiOptimization = true
+    }
+}
+```
+
+This forces building all ABIs instead of just the IDE-injected target.
+
+#### Windows: rustup installation fails
+Ensure PowerShell execution policy allows running scripts:
+```powershell
+Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
+```
+
+### Migration from 0.6.0
+
+The plugin now uses `cargo-ndk` internally. No configuration changes are required, but you may need to install cargo-ndk:
+
+```bash
+cargo install cargo-ndk
+```
+
+All existing configurations will continue to work.
+
+### Note
+
+It is recommended to use the latest version 0.8.0, as previous versions have bugs that have been fixed.
+
+### Credits
+
++ Rodroid Mods
++ Matrix dev
+
+## License
+
+MIT License
+
+## Contributing
+
+Contributions welcome! Please open an issue or pull request on GitHub.
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 4bee0f6..55d0d74 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,18 +1,17 @@
 plugins {
     `java-gradle-plugin`
     `kotlin-dsl`
-    id("com.gradle.plugin-publish") version "1.3.0"
+    id("com.gradle.plugin-publish") version "2.0.0"
 }
 
-val pluginId = "io.github.MatrixDev.android-rust"
+val pluginId = "io.github.rodroidmods.android-rust"
 
 group = pluginId
-version = "0.5.0"
+version = "0.8.0"
 
-@Suppress("UnstableApiUsage")
 gradlePlugin {
-    website = "https://github.com/MatrixDev/GradleAndroidRustPlugin"
-    vcsUrl = "https://github.com/MatrixDev/GradleAndroidRustPlugin.git"
+    website = "https://github.com/rodroidmods/GradleAndroidRustPlugin"
+    vcsUrl = "https://github.com/rodroidmods/GradleAndroidRustPlugin.git"
 
     plugins {
         create("AndroidRust") {
@@ -44,4 +43,4 @@ dependencies {
 
     implementation(libs.agp)
     implementation(libs.agp.api)
-}
+}
\ No newline at end of file
diff --git a/example/app/build.gradle.kts b/example/app/build.gradle.kts
index 5b9247b..2500274 100644
--- a/example/app/build.gradle.kts
+++ b/example/app/build.gradle.kts
@@ -1,25 +1,34 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.android.rust)
 }
 
 android {
-    namespace = "dev.matrix.rust"
-    compileSdk = 33
+    namespace = "dev.rodroid.rust"
+    compileSdk = 36
     ndkVersion = "25.2.9519653"
 
     defaultConfig {
-        applicationId = "dev.matrix.rust"
-        minSdk = 21
-        targetSdk = 33
+        applicationId = "dev.rodroid.rust"
+        minSdk = 26
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0"
     }
 
+    buildFeatures {
+        compose = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.15"
+    }
+
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
             proguardFiles("proguard-rules.pro")
         }
@@ -27,24 +36,25 @@ android {
 
     sourceSets {
         getByName("main") {
-            java.srcDir("src/rust_library")
+            java.srcDir("src/main/jni")
         }
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
-    kotlinOptions {
-        jvmTarget = "1.8"
+    kotlin {
+        jvmToolchain(21)
     }
 }
 
 androidRust {
     module("library") {
-        path = file("src/rust_library")
-
+        path = file("src/main/jni")
+        //targets = listOf("arm64", "x86_64", "arm", "x86")
+        targets = listOf("arm64")
         buildType("release") {
             runTests = true
         }
@@ -53,10 +63,22 @@ androidRust {
 }
 
 dependencies {
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.5.3")
-    implementation("androidx.navigation:navigation-ui-ktx:2.5.3")
-    implementation("com.google.android.material:material:1.8.0")
+    implementation(platform(libs.androidx.compose.bom))
+
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.constraintlayout)
+    implementation(libs.google.material)
+
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.compose.ui.graphics)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+    implementation(libs.androidx.compose.material3)
+    implementation(libs.androidx.compose.foundation)
+    implementation(libs.androidx.compose.animation)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.lifecycle.runtime.compose)
+
+    debugImplementation(libs.androidx.compose.ui.tooling)
+    debugImplementation(libs.androidx.compose.ui.test.manifest)
 }
diff --git a/example/app/src/main/AndroidManifest.xml b/example/app/src/main/AndroidManifest.xml
index 1493687..1868b0d 100644
--- a/example/app/src/main/AndroidManifest.xml
+++ b/example/app/src/main/AndroidManifest.xml
@@ -4,7 +4,6 @@
 
     <application
         android:allowBackup="true"
-        android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -13,7 +12,7 @@
         android:theme="@style/Theme.GradlePlugin"
         tools:targetApi="31">
         <activity
-            android:name="dev.matrix.rust.MainActivity"
+            android:name="dev.rodroid.rust.MainActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.GradlePlugin.NoActionBar">
diff --git a/example/app/src/main/java/dev/matrix/rust/MainActivity.kt b/example/app/src/main/java/dev/matrix/rust/MainActivity.kt
deleted file mode 100644
index 94a5867..0000000
--- a/example/app/src/main/java/dev/matrix/rust/MainActivity.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package dev.matrix.rust
-
-import android.os.Bundle
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-
-class MainActivity : AppCompatActivity() {
-    private external fun callRustCode(): String
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        System.loadLibrary("rust_library")
-
-        Toast.makeText(this, callRustCode(), Toast.LENGTH_LONG).show()
-
-        finish()
-    }
-}
diff --git a/example/app/src/main/java/dev/rodroid/rust/MainActivity.kt b/example/app/src/main/java/dev/rodroid/rust/MainActivity.kt
new file mode 100644
index 0000000..badca4e
--- /dev/null
+++ b/example/app/src/main/java/dev/rodroid/rust/MainActivity.kt
@@ -0,0 +1,50 @@
+package dev.rodroid.rust
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import kotlinx.coroutines.delay
+import androidx.compose.ui.text.style.TextAlign
+
+class MainActivity : ComponentActivity() {
+
+    private external fun callRustCode(): String
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        System.loadLibrary("rust_library")
+
+        setContent {
+            MaterialTheme {
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    color = Color.Black
+                ) {
+                    Box(
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .background(Color.Black),
+                        contentAlignment = Alignment.Center
+                    ) {
+                        Text(
+                            text = callRustCode(),
+                            color = Color.Red,
+                            style = MaterialTheme.typography.headlineLarge,
+                            textAlign = TextAlign.Center
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/example/app/src/rust_library/.gitignore b/example/app/src/main/jni/.gitignore
similarity index 100%
rename from example/app/src/rust_library/.gitignore
rename to example/app/src/main/jni/.gitignore
diff --git a/example/app/src/main/jni/Cargo.toml b/example/app/src/main/jni/Cargo.toml
new file mode 100644
index 0000000..0dc9dac
--- /dev/null
+++ b/example/app/src/main/jni/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "rust_library"
+version = "0.1.0"
+edition = "2024"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+jni = "0.19.0"
+
+[profile.release]
+opt-level = "z"
+lto = true
+codegen-units = 1
+panic = "abort"
+strip = "symbols"
+debug = false
+overflow-checks = false
+incremental = false
+
+[profile.release.package."*"]
+opt-level = "z"
+codegen-units = 1
+strip = true
+debug = false
+overflow-checks = false
\ No newline at end of file
diff --git a/example/app/src/main/jni/src/lib.rs b/example/app/src/main/jni/src/lib.rs
new file mode 100644
index 0000000..fb07cc5
--- /dev/null
+++ b/example/app/src/main/jni/src/lib.rs
@@ -0,0 +1,12 @@
+use jni::{JNIEnv, objects::JObject};
+use jni::sys::jstring;
+
+#[unsafe(no_mangle)]
+pub extern "C" fn Java_dev_rodroid_rust_MainActivity_callRustCode(
+    env: JNIEnv,
+    _: JObject,
+) -> jstring {
+    let message = "Hello from Rust";
+    let java_string = env.new_string(message).expect("Couldn't create java string!");
+    java_string.into_inner()
+}
\ No newline at end of file
diff --git a/example/app/src/main/res/layout/activity_main.xml b/example/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 1968bd8..0000000
--- a/example/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="dev.matrix.rust.MainActivity">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/Theme.GradlePlugin.AppBarOverlay">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/Theme.GradlePlugin.PopupOverlay" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <include layout="@layout/content_main" />
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_marginEnd="@dimen/fab_margin"
-        android:layout_marginBottom="16dp"
-        app:srcCompat="@android:drawable/ic_dialog_email" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/example/app/src/main/res/layout/content_main.xml b/example/app/src/main/res/layout/content_main.xml
deleted file mode 100644
index e416e1c..0000000
--- a/example/app/src/main/res/layout/content_main.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-    <fragment
-        android:id="@+id/nav_host_fragment_content_main"
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:defaultNavHost="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:navGraph="@navigation/nav_graph" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/example/app/src/main/res/layout/fragment_first.xml b/example/app/src/main/res/layout/fragment_first.xml
deleted file mode 100644
index fb44a3d..0000000
--- a/example/app/src/main/res/layout/fragment_first.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".FirstFragment">
-
-    <TextView
-        android:id="@+id/textview_first"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/hello_first_fragment"
-        app:layout_constraintBottom_toTopOf="@id/button_first"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <Button
-        android:id="@+id/button_first"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/next"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/textview_first" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/example/app/src/main/res/layout/fragment_second.xml b/example/app/src/main/res/layout/fragment_second.xml
deleted file mode 100644
index bd90524..0000000
--- a/example/app/src/main/res/layout/fragment_second.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".SecondFragment">
-
-    <TextView
-        android:id="@+id/textview_second"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/button_second"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <Button
-        android:id="@+id/button_second"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/previous"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/textview_second" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/example/app/src/main/res/menu/menu_main.xml b/example/app/src/main/res/menu/menu_main.xml
deleted file mode 100644
index 9fd6d7c..0000000
--- a/example/app/src/main/res/menu/menu_main.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="dev.matrix.gradleplugin.dev.matrix.rust.MainActivity">
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:title="@string/action_settings"
-        app:showAsAction="never" />
-</menu>
\ No newline at end of file
diff --git a/example/app/src/main/res/navigation/nav_graph.xml b/example/app/src/main/res/navigation/nav_graph.xml
deleted file mode 100644
index 32744ff..0000000
--- a/example/app/src/main/res/navigation/nav_graph.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/nav_graph"
-    app:startDestination="@id/FirstFragment">
-
-    <fragment
-        android:id="@+id/FirstFragment"
-        android:name="dev.matrix.gradleplugin.FirstFragment"
-        android:label="@string/first_fragment_label"
-        tools:layout="@layout/fragment_first">
-
-        <action
-            android:id="@+id/action_FirstFragment_to_SecondFragment"
-            app:destination="@id/SecondFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/SecondFragment"
-        android:name="dev.matrix.gradleplugin.SecondFragment"
-        android:label="@string/second_fragment_label"
-        tools:layout="@layout/fragment_second">
-
-        <action
-            android:id="@+id/action_SecondFragment_to_FirstFragment"
-            app:destination="@id/FirstFragment" />
-    </fragment>
-</navigation>
\ No newline at end of file
diff --git a/example/app/src/main/res/values-land/dimens.xml b/example/app/src/main/res/values-land/dimens.xml
deleted file mode 100644
index 22d7f00..0000000
--- a/example/app/src/main/res/values-land/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="fab_margin">48dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/example/app/src/main/res/values-w1240dp/dimens.xml b/example/app/src/main/res/values-w1240dp/dimens.xml
deleted file mode 100644
index d73f4a3..0000000
--- a/example/app/src/main/res/values-w1240dp/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="fab_margin">200dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/example/app/src/main/res/values-w600dp/dimens.xml b/example/app/src/main/res/values-w600dp/dimens.xml
deleted file mode 100644
index 22d7f00..0000000
--- a/example/app/src/main/res/values-w600dp/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="fab_margin">48dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/example/app/src/main/res/values/dimens.xml b/example/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 125df87..0000000
--- a/example/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="fab_margin">16dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/example/app/src/main/res/values/strings.xml b/example/app/src/main/res/values/strings.xml
index 26febf0..e0b48fe 100644
--- a/example/app/src/main/res/values/strings.xml
+++ b/example/app/src/main/res/values/strings.xml
@@ -1,12 +1,3 @@
 <resources>
-    <string name="app_name">GradlePlugin</string>
-    <string name="action_settings">Settings</string>
-    <!-- Strings used for fragments for navigation -->
-    <string name="first_fragment_label">First Fragment</string>
-    <string name="second_fragment_label">Second Fragment</string>
-    <string name="next">Next</string>
-    <string name="previous">Previous</string>
-
-    <string name="hello_first_fragment">Hello first fragment</string>
-    <string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
+    <string name="app_name">Rodroid Rust App</string>
 </resources>
\ No newline at end of file
diff --git a/example/app/src/rust_library/Cargo.toml b/example/app/src/rust_library/Cargo.toml
deleted file mode 100644
index 81a227e..0000000
--- a/example/app/src/rust_library/Cargo.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[package]
-name = "rust_library"
-version = "0.1.0"
-edition = "2021"
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-jni = "0.19.0"
diff --git a/example/app/src/rust_library/src/lib.rs b/example/app/src/rust_library/src/lib.rs
deleted file mode 100644
index bad34cb..0000000
--- a/example/app/src/rust_library/src/lib.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use jni::JNIEnv;
-use jni::objects::JObject;
-use jni::sys::jstring;
-
-#[no_mangle]
-extern "C" fn Java_dev_matrix_rust_MainActivity_callRustCode(env: JNIEnv, _: JObject) -> jstring {
-    env.new_string("Hello from rust!").unwrap().into_inner()
-}
-
-#[cfg(test)]
-mod test {
-    #[test]
-    fn test() {
-        println!("Hello from rust test!")
-    }
-}
diff --git a/example/build.gradle.kts b/example/build.gradle.kts
index 48fb013..6a8f8ce 100644
--- a/example/build.gradle.kts
+++ b/example/build.gradle.kts
@@ -2,5 +2,6 @@
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.android.rust) apply false
 }
diff --git a/example/gradle/libs.versions.toml b/example/gradle/libs.versions.toml
index 398972b..5b7cb65 100644
--- a/example/gradle/libs.versions.toml
+++ b/example/gradle/libs.versions.toml
@@ -1,31 +1,36 @@
 [versions]
-agp = "8.7.3"
-kotlin = "2.0.0"
-coreKtx = "1.15.0"
-junit = "4.13.2"
-junitVersion = "1.1.5"
-espressoCore = "3.5.1"
-lifecycleRuntimeKtx = "2.8.7"
-activityCompose = "1.9.3"
-composeBom = "2024.04.01"
+agp = "8.13.0"
+kotlin = "2.2.21"
+coreKtx = "1.17.0"
+composeBom = "2025.11.01"
+appcompat = "1.7.1"
+constraintlayout = "2.2.1"
+material = "1.13.0"
+activityCompose = "1.12.0"
+lifecycleCompose = "2.10.0"
+android-rust = "0.7.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
-junit = { group = "junit", name = "junit", version.ref = "junit" }
-androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
-androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
-androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
-androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
+google-material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
-androidx-ui = { group = "androidx.compose.ui", name = "ui" }
-androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
-androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
-androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
-androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
-androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
-androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
+androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" }
+androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
+androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
+androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
+androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
+androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
+androidx-compose-animation = { group = "androidx.compose.animation", name = "animation" }
+androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
+
+androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
+androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleCompose" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-android-rust = { id = "io.github.MatrixDev.android-rust", version = "0.5.0" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+android-rust = { id = "io.github.rodroidmods.android-rust", version.ref = "android-rust" }
\ No newline at end of file
diff --git a/example/gradle/wrapper/gradle-wrapper.properties b/example/gradle/wrapper/gradle-wrapper.properties
index ff0956a..d08858a 100644
--- a/example/gradle/wrapper/gradle-wrapper.properties
+++ b/example/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Dec 04 11:21:35 EET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/example/settings.gradle.kts b/example/settings.gradle.kts
index beebae3..c628873 100644
--- a/example/settings.gradle.kts
+++ b/example/settings.gradle.kts
@@ -8,6 +8,7 @@ pluginManagement {
             }
         }
         mavenCentral()
+        mavenLocal() 
         gradlePluginPortal()
     }
 }
@@ -16,6 +17,7 @@ dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
         mavenCentral()
+        mavenLocal() 
         google()
         maven("https://plugins.gradle.org/m2/")
     }
@@ -26,6 +28,6 @@ include(":app")
 
 includeBuild("..") {
     dependencySubstitution {
-        substitute(module("io.github.MatrixDev.android-rust:plugin"))
+        substitute(module("io.github.rodroidmods:android-rust-plugin")).using(project(":"))
     }
-}
+}
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1217ee6..ea88a47 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.7.2"
+agp = "8.13.0"
 
 [libraries]
 agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }
diff --git a/src/main/kotlin/dev/matrix/agp/rust/AndroidRustExtension.kt b/src/main/kotlin/dev/matrix/agp/rust/AndroidRustExtension.kt
index ebc9ebd..f6d7316 100644
--- a/src/main/kotlin/dev/matrix/agp/rust/AndroidRustExtension.kt
+++ b/src/main/kotlin/dev/matrix/agp/rust/AndroidRustExtension.kt
@@ -8,26 +8,10 @@ annotation class AndroidRustDslMarker
 @AndroidRustDslMarker
 @Suppress("unused")
 open class AndroidRustExtension : AndroidRustConfiguration() {
-    /**
-     * Specify minimum supported Rust version.
-     *
-     * Plugin will automatically use `rustup update` command to
-     * update rust version in case installed versions is not high enough.
-     */
     var minimumSupportedRustVersion = ""
 
-    /**
-     * Configuration map of all Rust libraries to build.
-     *
-     * Keys of this map are Rust crates names.
-     */
     var modules = mutableMapOf<String, AndroidRustModule>()
 
-    /**
-     * Configure Rust module/library to build.
-     *
-     * @param name Rust crate name.
-     */
     fun module(name: String, configure: AndroidRustModule.() -> Unit) {
         modules.getOrPut(name, ::AndroidRustModule).configure()
     }
@@ -36,18 +20,8 @@ open class AndroidRustExtension : AndroidRustConfiguration() {
 @AndroidRustDslMarker
 @Suppress("unused")
 class AndroidRustModule : AndroidRustConfiguration() {
-    /**
-     * Path to the Rust project folder.
-     *
-     * This is the folder containing `Cargo.toml` file.
-     */
     lateinit var path: File
 
-    /**
-     * All supported build type configurations.
-     *
-     * Keys of this map should correspond to the current project build variants.
-     */
     var buildTypes = hashMapOf(
         "debug" to AndroidRustBuildType().also {
             it.profile = "dev"
@@ -57,11 +31,6 @@ class AndroidRustModule : AndroidRustConfiguration() {
         },
     )
 
-    /**
-     * Configure Rust build options.
-     *
-     * @param name current project build variant.
-     */
     fun buildType(name: String, configure: AndroidRustBuildType.() -> Unit) {
         buildTypes.getOrPut(name, ::AndroidRustBuildType).configure()
     }
@@ -74,32 +43,13 @@ class AndroidRustBuildType : AndroidRustConfiguration()
 @AndroidRustDslMarker
 @Suppress("unused")
 open class AndroidRustConfiguration {
-    /**
-     * Rust profile (dev, release, etc.).
-     *
-     * See: https://doc.rust-lang.org/cargo/reference/profiles.html
-     */
     var profile = ""
 
-    /**
-     * List of ABIs to build.
-     */
     var targets = listOf<String>()
 
-    /**
-     * Run tests after the build.
-     *
-     * This will run `cargo test` command and check its result.
-     */
     var runTests: Boolean? = null
 
-    /**
-     * Disable IDE ABI injection optimization.
-     * - When `true`, all requested ABIs will be built regardless of IDE deployment target.
-     * - When `false` (default), only the IDE target ABI will be built to speed up development builds.
-     *
-     * Set to `true` if you experience "library not found" errors when running from Android Studio.
-     * See: https://github.com/MatrixDev/GradleAndroidRustPlugin/issues/3
-     */
     var disableAbiOptimization: Boolean? = null
-}
+
+    var cargoClean: Boolean? = null
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/matrix/agp/rust/AndroidRustPlugin.kt b/src/main/kotlin/dev/matrix/agp/rust/AndroidRustPlugin.kt
index af5ea63..2d57f08 100644
--- a/src/main/kotlin/dev/matrix/agp/rust/AndroidRustPlugin.kt
+++ b/src/main/kotlin/dev/matrix/agp/rust/AndroidRustPlugin.kt
@@ -11,13 +11,8 @@ import org.gradle.api.Project
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.process.ExecOperations
 import java.io.File
-import java.util.Locale
 import javax.inject.Inject
 
-//
-// TODO: migrate to variant API with artifacts when JNI will be supported
-// https://developer.android.com/studio/build/extend-agp#access-modify-artifacts
-//
 @Suppress("unused")
 abstract class AndroidRustPlugin @Inject constructor(
     private val execOperations: ExecOperations,
@@ -29,13 +24,81 @@ abstract class AndroidRustPlugin @Inject constructor(
         val androidComponents = project.getAndroidComponentsExtension()
         val tasksByBuildType = HashMap<String, ArrayList<TaskProvider<RustBuildTask>>>()
 
-        androidComponents.finalizeDsl { dsl ->
+        androidComponents.finalizeDsl { _ ->
+            for ((moduleName, module) in extension.modules) {
+                try {
+                    val modulePath = module.path
+                    require(modulePath.exists()) {
+                        "Rust module '$moduleName': path does not exist: $modulePath"
+                    }
+
+                    val cargoToml = File(modulePath, "Cargo.toml")
+                    require(cargoToml.exists()) {
+                        "Rust module '$moduleName': Cargo.toml not found at $modulePath"
+                    }
+                } catch (e: UninitializedPropertyAccessException) {
+                    throw IllegalStateException("Rust module '$moduleName': path must be specified")
+                }
+            }
+
+            // Register cargoClean tasks for each module
+            val cargoCleanTasks = mutableListOf<TaskProvider<CargoCleanTask>>()
+            val modulesWithAutoCargoClean = mutableListOf<String>()
+
+            for ((moduleName, module) in extension.modules) {
+                val moduleNameCap = moduleName.replaceFirstChar(Char::titlecase)
+                val cargoCleanTaskName = "cargoClean${moduleNameCap}"
+
+                val cargoCleanTask = project.tasks.register(cargoCleanTaskName, CargoCleanTask::class.java) {
+                    this.rustBinaries.set(rustBinaries)
+                    this.rustProjectDirectory.set(module.path)
+                    this.moduleName.set(moduleName)
+                    this.description = "Runs cargo clean for Rust module '$moduleName'"
+                    this.group = "rust"
+                }
+                cargoCleanTasks.add(cargoCleanTask)
+
+                // Check if any build type has cargoClean enabled
+                val hasCargoCleanEnabled = module.buildTypes.values.any { it.cargoClean == true }
+                    || module.cargoClean == true
+                    || extension.cargoClean == true
+
+                if (hasCargoCleanEnabled) {
+                    modulesWithAutoCargoClean.add(moduleName)
+                }
+            }
+
+            // Register aggregate cargoClean task that runs all module cargo cleans
+            if (cargoCleanTasks.isNotEmpty()) {
+                project.tasks.register("cargoClean") {
+                    this.description = "Runs cargo clean for all Rust modules"
+                    this.group = "rust"
+                    this.dependsOn(cargoCleanTasks)
+                }
+            }
+
+            // Hook cargoClean to Gradle clean task for modules with cargoClean enabled
+            project.afterEvaluate {
+                val gradleCleanTask = project.tasks.findByName("clean")
+                if (gradleCleanTask != null && modulesWithAutoCargoClean.isNotEmpty()) {
+                    for ((moduleName, _) in extension.modules) {
+                        if (modulesWithAutoCargoClean.contains(moduleName)) {
+                            val moduleNameCap = moduleName.replaceFirstChar(Char::titlecase)
+                            val cargoCleanTask = project.tasks.findByName("cargoClean${moduleNameCap}")
+                            if (cargoCleanTask != null) {
+                                gradleCleanTask.dependsOn(cargoCleanTask)
+                            }
+                        }
+                    }
+                }
+            }
+
             val allRustAbiSet = mutableSetOf<Abi>()
             val ndkDirectory = androidExtension.ndkDirectory
             val ndkVersion = SemanticVersion(androidExtension.ndkVersion)
             val extensionBuildDirectory = project.layout.buildDirectory.dir("intermediates/rust").get().asFile
 
-            for (buildType in dsl.buildTypes) {
+            for (buildType in androidExtension.buildTypes) {
                 val buildTypeNameCap = buildType.name.replaceFirstChar(Char::titlecase)
 
                 val variantBuildDirectory = File(extensionBuildDirectory, buildType.name)
@@ -74,20 +137,29 @@ abstract class AndroidRustPlugin @Inject constructor(
                         val buildTask = project.tasks.register(buildTaskName, RustBuildTask::class.java) {
                             this.rustBinaries.set(rustBinaries)
                             this.abi.set(rustAbi)
-                            this.apiLevel.set(dsl.defaultConfig.minSdk ?: 21)
+                            this.apiLevel.set(androidExtension.defaultConfig.minSdk ?: 21)
                             this.ndkVersion.set(ndkVersion)
                             this.ndkDirectory.set(ndkDirectory)
                             this.rustProfile.set(rustConfiguration.profile)
                             this.rustProjectDirectory.set(module.path)
                             this.cargoTargetDirectory.set(moduleBuildDirectory)
                             this.variantJniLibsDirectory.set(variantJniLibsDirectory)
+                            this.cargoToml.set(project.layout.projectDirectory.file("${module.path.absolutePath}/Cargo.toml"))
+                            this.sourceFiles.from(project.fileTree(module.path) {
+                                include("**/*.rs")
+                                include("**/Cargo.toml")
+                                include("**/Cargo.lock")
+                            })
+                            this.outputDirectory.set(variantJniLibsDirectory)
+                        }
+                        buildTask.configure {
+                            mustRunAfter(testTask ?: cleanTask)
                         }
-                        buildTask.dependsOn(testTask ?: cleanTask)
                         tasksByBuildType.getOrPut(buildType.name, ::ArrayList).add(buildTask)
                     }
                 }
 
-                dsl.sourceSets.findByName(buildType.name)?.jniLibs?.srcDir(variantJniLibsDirectory)
+                androidExtension.sourceSets.findByName(buildType.name)?.jniLibs?.srcDir(variantJniLibsDirectory)
             }
 
             val minimumSupportedRustVersion = SemanticVersion(extension.minimumSupportedRustVersion)
@@ -115,12 +187,10 @@ abstract class AndroidRustPlugin @Inject constructor(
     private fun resolveAbiList(project: Project, config: AndroidRustConfiguration): Collection<Abi> {
         val requestedAbi = Abi.fromRustNames(config.targets)
 
-        // If optimization is disabled, build all requested ABIs
         if (config.disableAbiOptimization == true) {
             return requestedAbi
         }
 
-        // Otherwise, use IDE ABI injection optimization for faster development builds
         val injectedAbi = Abi.fromInjectedBuildAbi(project)
         if (injectedAbi.isEmpty()) {
             return requestedAbi
@@ -131,20 +201,16 @@ abstract class AndroidRustPlugin @Inject constructor(
             "ABIs requested by IDE ($injectedAbi) are not supported by the build config (${config.targets})"
         }
 
-        // Return all intersecting ABIs, not just one
-        // The original logic only returned a single ABI which caused deployment issues
         return intersectionAbi.toList()
     }
 
-    /**
-     * Merge configurations with the first one having the highest priority
-     */
     private fun mergeRustConfigurations(vararg configurations: AndroidRustConfiguration?): AndroidRustConfiguration {
         val defaultConfiguration = AndroidRustConfiguration().also {
             it.profile = "release"
             it.targets = Abi.values().mapTo(ArrayList(), Abi::rustName)
             it.runTests = null
             it.disableAbiOptimization = null
+            it.cargoClean = null
         }
 
         return configurations.asSequence()
@@ -163,7 +229,10 @@ abstract class AndroidRustPlugin @Inject constructor(
                 if (result.disableAbiOptimization == null) {
                     result.disableAbiOptimization = base.disableAbiOptimization
                 }
+                if (result.cargoClean == null) {
+                    result.cargoClean = base.cargoClean
+                }
                 result
             }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/matrix/agp/rust/CargoCleanTask.kt b/src/main/kotlin/dev/matrix/agp/rust/CargoCleanTask.kt
new file mode 100644
index 0000000..4f3df07
--- /dev/null
+++ b/src/main/kotlin/dev/matrix/agp/rust/CargoCleanTask.kt
@@ -0,0 +1,60 @@
+package dev.matrix.agp.rust
+
+import dev.matrix.agp.rust.utils.RustBinaries
+import dev.matrix.agp.rust.utils.log
+import org.gradle.api.DefaultTask
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.TaskAction
+import org.gradle.process.ExecOperations
+import java.io.File
+import javax.inject.Inject
+
+internal abstract class CargoCleanTask : DefaultTask() {
+    @get:Inject
+    abstract val execOperations: ExecOperations
+
+    @get:Input
+    abstract val rustBinaries: Property<RustBinaries>
+
+    @get:Input
+    abstract val rustProjectDirectory: Property<File>
+
+    @get:Input
+    abstract val moduleName: Property<String>
+
+    @TaskAction
+    fun taskAction() {
+        val rustBinaries = rustBinaries.get()
+        val rustProjectDirectory = rustProjectDirectory.get()
+        val moduleName = moduleName.get()
+
+        if (!rustProjectDirectory.exists()) {
+            log("Skipping cargo clean for '$moduleName': directory does not exist: $rustProjectDirectory")
+            return
+        }
+
+        val cargoTomlFile = File(rustProjectDirectory, "Cargo.toml")
+        if (!cargoTomlFile.exists()) {
+            log("Skipping cargo clean for '$moduleName': Cargo.toml not found in: $rustProjectDirectory")
+            return
+        }
+
+        log("Running cargo clean for '$moduleName' in $rustProjectDirectory")
+
+        try {
+            execOperations.exec {
+                standardOutput = System.out
+                errorOutput = System.out
+                workingDir = rustProjectDirectory
+
+                commandLine(rustBinaries.cargo)
+                args("clean")
+            }.assertNormalExitValue()
+
+            log("Cargo clean completed for '$moduleName'")
+        } catch (e: Exception) {
+            log("Warning: cargo clean failed for '$moduleName': ${e.message}")
+        }
+    }
+}
diff --git a/src/main/kotlin/dev/matrix/agp/rust/RustBuildTask.kt b/src/main/kotlin/dev/matrix/agp/rust/RustBuildTask.kt
index 18d73af..96ec7dc 100644
--- a/src/main/kotlin/dev/matrix/agp/rust/RustBuildTask.kt
+++ b/src/main/kotlin/dev/matrix/agp/rust/RustBuildTask.kt
@@ -1,12 +1,21 @@
 package dev.matrix.agp.rust
 
 import dev.matrix.agp.rust.utils.Abi
-import dev.matrix.agp.rust.utils.Os
 import dev.matrix.agp.rust.utils.RustBinaries
 import dev.matrix.agp.rust.utils.SemanticVersion
+import dev.matrix.agp.rust.utils.log
 import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
 import org.gradle.process.ExecOperations
 import java.io.File
@@ -43,64 +52,81 @@ internal abstract class RustBuildTask : DefaultTask() {
     @get:Input
     abstract val variantJniLibsDirectory: Property<File>
 
+    @get:InputFiles
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    abstract val sourceFiles: ConfigurableFileCollection
+    
+    @get:InputFile
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    abstract val cargoToml: RegularFileProperty
+    
+    @get:OutputDirectory
+    abstract val outputDirectory: DirectoryProperty
+
     @TaskAction
     fun taskAction() {
         val rustBinaries = rustBinaries.get()
         val abi = abi.get()
         val apiLevel = apiLevel.get()
-        val ndkVersion = ndkVersion.get()
         val ndkDirectory = ndkDirectory.get()
         val rustProfile = rustProfile.get()
         val rustProjectDirectory = rustProjectDirectory.get()
-        val cargoTargetDirectory = cargoTargetDirectory.get()
         val variantJniLibsDirectory = variantJniLibsDirectory.get()
 
-        val platform = when (Os.current) {
-            Os.Linux -> "linux-x86_64"
-            Os.MacOs -> "darwin-x86_64"
-            Os.Windows -> "windows-x86_64"
-            Os.Unknown -> throw Exception("OS is not supported")
+        require(rustProjectDirectory.exists()) {
+            "Rust project directory not found: $rustProjectDirectory"
+        }
+        
+        val cargoTomlFile = File(rustProjectDirectory, "Cargo.toml")
+        require(cargoTomlFile.exists()) {
+            "Cargo.toml not found in: $rustProjectDirectory"
+        }
+        
+        require(ndkDirectory.exists()) {
+            """
+            Android NDK not found at: $ndkDirectory
+            Please install NDK via Android Studio SDK Manager or set android.ndkDirectory
+            """.trimIndent()
         }
 
-        val toolchainFolder = File(ndkDirectory, "toolchains/llvm/prebuilt/$platform/bin")
-        val cc = File(toolchainFolder, abi.cc(apiLevel))
-        val cxx = File(toolchainFolder, abi.ccx(apiLevel))
-        val ar = File(toolchainFolder, abi.ar(ndkVersion.major))
-
-        val cargoTargetTriplet = abi.rustTargetTriple
-            .replace('-', '_')
-            .uppercase()
-
-        execOperations.exec {
-            standardOutput = System.out
-            errorOutput = System.out
-            workingDir = rustProjectDirectory
-
-            environment("CC_${abi.rustTargetTriple}", cc)
-            environment("CXX_${abi.rustTargetTriple}", cxx)
-            environment("AR_${abi.rustTargetTriple}", ar)
-            environment("CARGO_TARGET_DIR", cargoTargetDirectory.absolutePath)
-            environment("CARGO_TARGET_${cargoTargetTriplet}_LINKER", cc)
-
-            commandLine(rustBinaries.cargo)
-
-            args("build")
-            args("--lib")
-            args("--target", abi.rustTargetTriple)
-
-            if (rustProfile.isNotEmpty()) {
-                args("--profile", rustProfile)
-            }
-        }.assertNormalExitValue()
-
-        project.copy {
-            val dir = when (rustProfile == "dev") {
-                true -> "debug"
-                else -> rustProfile
-            }
-            include("*.so")
-            from(File(cargoTargetDirectory, "${abi.rustTargetTriple}/${dir}/"))
-            into(File(variantJniLibsDirectory, abi.androidName))
+        log("Building ${cargoTomlFile.parentFile.name} for ${abi.androidName} (API $apiLevel)")
+
+        try {
+            execOperations.exec {
+                standardOutput = System.out
+                errorOutput = System.out
+                workingDir = rustProjectDirectory
+
+                environment("ANDROID_NDK_HOME", ndkDirectory.absolutePath)
+
+                commandLine(rustBinaries.cargo)
+                
+                args("ndk")
+                args("-o", variantJniLibsDirectory.absolutePath)
+                args("--platform", apiLevel)
+                args("-t", abi.androidName)
+                args("build")
+                
+                if (rustProfile.isNotEmpty() && rustProfile != "dev") {
+                    args("--profile", rustProfile)
+                }
+            }.assertNormalExitValue()
+        } catch (e: Exception) {
+            throw GradleException(
+                """
+                Rust build failed for ${abi.androidName}
+                
+                Possible solutions:
+                - Check that your Cargo.toml has [lib] crate-type = ["cdylib"]
+                - Ensure NDK version ${ndkVersion.get()} is properly installed
+                - Ensure cargo-ndk is installed: cargo install cargo-ndk
+                - Set ANDROID_NDK_HOME environment variable to: $ndkDirectory
+                - Try running: cargo ndk -t ${abi.androidName} build
+                
+                Error: ${e.message}
+                """.trimIndent(),
+                e
+            )
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/matrix/agp/rust/RustInstaller.kt b/src/main/kotlin/dev/matrix/agp/rust/RustInstaller.kt
index 3614366..1b1cee7 100644
--- a/src/main/kotlin/dev/matrix/agp/rust/RustInstaller.kt
+++ b/src/main/kotlin/dev/matrix/agp/rust/RustInstaller.kt
@@ -8,6 +8,7 @@ import dev.matrix.agp.rust.utils.SemanticVersion
 import dev.matrix.agp.rust.utils.log
 import org.gradle.process.ExecOperations
 import java.io.ByteArrayOutputStream
+import java.io.File
 
 internal fun installRustComponentsIfNeeded(
     execOperations: ExecOperations,
@@ -15,10 +16,6 @@ internal fun installRustComponentsIfNeeded(
     abiSet: Collection<Abi>,
     rustBinaries: RustBinaries,
 ) {
-    if (Os.current.isWindows) {
-        return
-    }
-
     if (minimalVersion != null && minimalVersion.isValid) {
         val actualVersion = readRustCompilerVersion(execOperations, rustBinaries)
         if (actualVersion < minimalVersion) {
@@ -29,6 +26,7 @@ internal fun installRustComponentsIfNeeded(
 
     if (abiSet.isNotEmpty()) {
         installRustUp(execOperations, rustBinaries)
+        installCargoNdk(execOperations, rustBinaries)
 
         val installedAbiSet = readRustUpInstalledTargets(execOperations, rustBinaries)
         for (abi in abiSet) {
@@ -57,10 +55,54 @@ private fun installRustUp(execOperations: ExecOperations, rustBinaries: RustBina
 
     log("installing rustup")
 
+    when (Os.current.isWindows) {
+        true -> {
+            val tempFile = File.createTempFile("rustup-init", ".exe")
+            try {
+                execOperations.exec {
+                    commandLine("powershell", "-Command",
+                        "Invoke-WebRequest -Uri 'https://win.rustup.rs/x86_64' -OutFile '${tempFile.absolutePath}'")
+                }.assertNormalExitValue()
+                
+                execOperations.exec {
+                    commandLine(tempFile.absolutePath, "-y", "--default-toolchain", "stable")
+                }.assertNormalExitValue()
+            } finally {
+                tempFile.delete()
+            }
+        }
+        else -> {
+            execOperations.exec {
+                standardOutput = NullOutputStream
+                errorOutput = NullOutputStream
+                commandLine("bash", "-c", "\"curl\" --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y")
+            }.assertNormalExitValue()
+        }
+    }
+}
+
+private fun installCargoNdk(execOperations: ExecOperations, rustBinaries: RustBinaries) {
+    try {
+        val result = execOperations.exec {
+            standardOutput = NullOutputStream
+            errorOutput = NullOutputStream
+            executable(rustBinaries.cargoNdk)
+            args("--version")
+        }
+
+        if (result.exitValue == 0) {
+            return
+        }
+    } catch (_: Exception) {
+    }
+
+    log("installing cargo-ndk")
+    
     execOperations.exec {
         standardOutput = NullOutputStream
         errorOutput = NullOutputStream
-        commandLine("bash", "-c", "\"curl\" --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y")
+        executable(rustBinaries.cargo)
+        args("install", "cargo-ndk")
     }.assertNormalExitValue()
 }
 
@@ -119,4 +161,4 @@ private fun readRustUpInstalledTargets(execOperations: ExecOperations, rustBinar
             Abi.values().find { it.rustTargetTriple == target.groupValues[1] }
         }
         .toSet()
-}
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/matrix/agp/rust/RustTestTask.kt b/src/main/kotlin/dev/matrix/agp/rust/RustTestTask.kt
index 15787ba..dad1dea 100644
--- a/src/main/kotlin/dev/matrix/agp/rust/RustTestTask.kt
+++ b/src/main/kotlin/dev/matrix/agp/rust/RustTestTask.kt
@@ -40,4 +40,4 @@ internal abstract class RustTestTask : DefaultTask() {
             args("test")
         }.assertNormalExitValue()
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/matrix/agp/rust/utils/RustBinaries.kt b/src/main/kotlin/dev/matrix/agp/rust/utils/RustBinaries.kt
index 769a9ab..6c7e5e7 100644
--- a/src/main/kotlin/dev/matrix/agp/rust/utils/RustBinaries.kt
+++ b/src/main/kotlin/dev/matrix/agp/rust/utils/RustBinaries.kt
@@ -8,29 +8,52 @@ import java.util.Properties
 @Suppress("SpellCheckingInspection")
 internal data class RustBinaries(
     val cargo: String = "cargo",
+    val cargoNdk: String = "cargo-ndk",
     val rustc: String = "rustc",
     val rustup: String = "rustup",
 ) : Serializable {
     companion object {
         operator fun invoke(project: Project): RustBinaries {
             var path = RustBinaries()
-            try {
+            
+            val customBinPath = try {
                 val file = project.rootProject.file("local.properties")
                 val properties = Properties().also {
                     it.load(file.inputStream())
                 }
-
-                val bin = File(properties.getProperty("cargo.bin").orEmpty())
-                if (bin.exists()) {
-                    path = path.copy(
-                        cargo = File(bin, path.cargo).absolutePath,
-                        rustc = File(bin, path.rustc).absolutePath,
-                        rustup = File(bin, path.rustup).absolutePath,
-                    )
-                }
+                properties.getProperty("cargo.bin")?.let { File(it) }
             } catch (ignore: Exception) {
+                null
+            }
+
+            val binDirectory = customBinPath ?: detectCargoHome()
+
+            if (binDirectory?.exists() == true) {
+                path = path.copy(
+                    cargo = File(binDirectory, path.cargo).absolutePath,
+                    cargoNdk = File(binDirectory, path.cargoNdk).absolutePath,
+                    rustc = File(binDirectory, path.rustc).absolutePath,
+                    rustup = File(binDirectory, path.rustup).absolutePath,
+                )
             }
+            
             return path
         }
+
+        private fun detectCargoHome(): File? {
+            val cargoHome = System.getenv("CARGO_HOME")
+            if (cargoHome != null) {
+                return File(cargoHome, "bin")
+            }
+
+            val home = System.getProperty("user.home") ?: return null
+            val defaultCargoHome = File(home, ".cargo/bin")
+            
+            if (defaultCargoHome.exists()) {
+                return defaultCargoHome
+            }
+
+            return null
+        }
     }
-}
+}
\ No newline at end of file