diff --git a/build.gradle.kts b/build.gradle.kts
index be74a3c..72a8671 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ tasks.withType<KotlinCompile> {
 
 dependencies {
     api(kotlin("stdlib-jdk8"))
-    api("com.gitlab.mvysny.jdbiorm:jdbi-orm:2.5")
+    api("com.gitlab.mvysny.jdbiorm:jdbi-orm:2.6")
 
     // logging
     implementation("org.slf4j:slf4j-api:$slf4jVersion")
diff --git a/src/main/kotlin/com/github/vokorm/ConditionBuilder.kt b/src/main/kotlin/com/github/vokorm/ConditionBuilder.kt
index 92e5c7b..1860510 100644
--- a/src/main/kotlin/com/github/vokorm/ConditionBuilder.kt
+++ b/src/main/kotlin/com/github/vokorm/ConditionBuilder.kt
@@ -4,6 +4,7 @@ import com.gitlab.mvysny.jdbiorm.condition.Condition
 import java.io.Serializable
 import kotlin.reflect.KProperty1
 import com.gitlab.mvysny.jdbiorm.condition.Expression
+import com.gitlab.mvysny.jdbiorm.condition.NativeSQL
 
 /**
  * Creates a [Condition] programmatically: `buildCondition { Person::age lt 25 }`
@@ -100,7 +101,7 @@ public class ConditionBuilder<T : Any>(public val clazz: Class<T>) {
      * Allows for a native SQL query: `"age < :age_p"("age_p" to 60)`
      */
     public operator fun String.invoke(vararg params: Pair<String, Any?>): Condition =
-        NativeSQLCondition(this, mapOf(*params))
+        NativeSQL(this, mapOf(*params))
 }
 
 public infix fun Condition.and(other: Condition): Condition = and(other)
diff --git a/src/main/kotlin/com/github/vokorm/NativeSQLCondition.kt b/src/main/kotlin/com/github/vokorm/NativeSQLCondition.kt
deleted file mode 100644
index 6286073..0000000
--- a/src/main/kotlin/com/github/vokorm/NativeSQLCondition.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.github.vokorm
-
-import com.gitlab.mvysny.jdbiorm.condition.Condition
-import com.gitlab.mvysny.jdbiorm.condition.ParametrizedSql
-
-/**
- * Just write any native SQL into [where], e.g. `age > 25 and name like :name`; don't forget to properly fill in the [params] map.
- *
- * Does not support in-memory filtering and will throw an exception.
- */
-public data class NativeSQLCondition(val where: String, val params: Map<String, Any?>) : Condition {
-    override fun toSql(): ParametrizedSql = ParametrizedSql(where, params)
-    override fun test(row: Any): Boolean = throw UnsupportedOperationException("Does not support in-memory filtering")
-    override fun toString(): String = "'$where'$params"
-}