diff --git a/build-logic/plugins/src/main/kotlin/io/github/smyrgeorge/sqlx4k/multiplatform/MultiplatformExamplesConventions.kt b/build-logic/plugins/src/main/kotlin/io/github/smyrgeorge/sqlx4k/multiplatform/MultiplatformExamplesConventions.kt
index 590f9c2..0837e9b 100644
--- a/build-logic/plugins/src/main/kotlin/io/github/smyrgeorge/sqlx4k/multiplatform/MultiplatformExamplesConventions.kt
+++ b/build-logic/plugins/src/main/kotlin/io/github/smyrgeorge/sqlx4k/multiplatform/MultiplatformExamplesConventions.kt
@@ -12,12 +12,12 @@ class MultiplatformExamplesConventions : Plugin<Project> {
         project.extensions.configure<KotlinMultiplatformExtension> {
             val availableTargets = mapOf(
                 Pair("iosArm64") { iosArm64 { binaries { executable() } } },
-//                Pair("androidNativeArm64") { androidNativeArm64 { binaries { executable() } } },
-//                Pair("androidNativeX64") { androidNativeX64 { binaries { executable() } } },
+                Pair("androidNativeArm64") { androidNativeArm64 { binaries { executable() } } },
+                Pair("androidNativeX64") { androidNativeX64 { binaries { executable() } } },
                 Pair("macosArm64") { macosArm64 { binaries { executable() } } },
                 Pair("macosX64") { macosX64 { binaries { executable() } } },
-//                Pair("linuxArm64") { linuxArm64 { binaries { executable() } } },
-//                Pair("linuxX64") { linuxX64 { binaries { executable() } } },
+                Pair("linuxArm64") { linuxArm64 { binaries { executable() } } },
+                Pair("linuxX64") { linuxX64 { binaries { executable() } } },
 //                Pair("mingwX64") { mingwX64 { binaries { executable() } } },
             )
 
diff --git a/build.gradle.kts b/build.gradle.kts
index c4a7d00..403a2fe 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,5 @@
 group = "io.github.smyrgeorge"
-version = "0.20.0"
+version = "0.21.0"
 
 plugins {
     alias(libs.plugins.dokka)
diff --git a/examples/postgres-sqldelight/build.gradle.kts b/examples/postgres-sqldelight/build.gradle.kts
index 735eef5..aa53d10 100644
--- a/examples/postgres-sqldelight/build.gradle.kts
+++ b/examples/postgres-sqldelight/build.gradle.kts
@@ -15,6 +15,7 @@ kotlin {
 }
 
 sqldelight {
+    linkSqlite = false
     databases.register("Database") {
         generateAsync = true
         packageName = "db.entities"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 35ed4ac..3a049c3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ assertk = "0.28.1"
 # https://github.com/touchlab/Stately
 stately = "2.1.0"
 # https://github.com/smyrgeorge/sqlx4k
-sqlx4k = "0.20.0"
+sqlx4k = "0.21.0"
 
 [libraries]
 gradle-kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
diff --git a/sqlx4k-sqldelight/src/nativeMain/kotlin/io/github/smyrgeorge/sqlx4k/sqldelight/SqlDelightCursor.kt b/sqlx4k-sqldelight/src/nativeMain/kotlin/io/github/smyrgeorge/sqlx4k/sqldelight/SqlDelightCursor.kt
index 5ac19a4..649fbda 100644
--- a/sqlx4k-sqldelight/src/nativeMain/kotlin/io/github/smyrgeorge/sqlx4k/sqldelight/SqlDelightCursor.kt
+++ b/sqlx4k-sqldelight/src/nativeMain/kotlin/io/github/smyrgeorge/sqlx4k/sqldelight/SqlDelightCursor.kt
@@ -25,7 +25,7 @@ class SqlDelightCursor(
     }
 
     override fun getBoolean(index: Int): Boolean? = getString(index)?.toBoolean()
-    override fun getBytes(index: Int): ByteArray? = current.get(index).valueAsByteArray()
+    override fun getBytes(index: Int): ByteArray? = error("This feature is not yes supported.")
     override fun getDouble(index: Int): Double? = getString(index)?.toDouble()
     fun getShort(index: Int): Short? = getString(index)?.toShort()
     fun getInt(index: Int): Int? = getString(index)?.toInt()
diff --git a/sqlx4k-sqldelight/src/nativeMain/kotlin/io/github/smyrgeorge/sqlx4k/sqldelight/SqlDelightPreparedStatement.kt b/sqlx4k-sqldelight/src/nativeMain/kotlin/io/github/smyrgeorge/sqlx4k/sqldelight/SqlDelightPreparedStatement.kt
index 7241b65..28b4484 100644
--- a/sqlx4k-sqldelight/src/nativeMain/kotlin/io/github/smyrgeorge/sqlx4k/sqldelight/SqlDelightPreparedStatement.kt
+++ b/sqlx4k-sqldelight/src/nativeMain/kotlin/io/github/smyrgeorge/sqlx4k/sqldelight/SqlDelightPreparedStatement.kt
@@ -1,7 +1,7 @@
 package io.github.smyrgeorge.sqlx4k.sqldelight
 
 import app.cash.sqldelight.db.SqlPreparedStatement
-import io.github.smyrgeorge.sqlx4k.impl.ExtendedStatement
+import io.github.smyrgeorge.sqlx4k.impl.statement.ExtendedStatement
 import kotlinx.datetime.DateTimePeriod
 import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDate