diff --git a/build.gradle.kts b/build.gradle.kts
index f9efecf..01923f5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,13 +1,12 @@
 import nl.littlerobots.vcu.plugin.versionCatalogUpdate
+import nl.littlerobots.vcu.plugin.versionSelector
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.detekt)
     alias(libs.plugins.gradleDoctor)
-    alias(libs.plugins.versions)
     alias(libs.plugins.version.catalog.update)
     alias(libs.plugins.dokka)
     alias(libs.plugins.dependencyAnalysis)
@@ -19,7 +18,6 @@ buildscript {
     dependencies {
         classpath(libs.android.gradle)
         classpath(libs.kotlin.gradle)
-        classpath(libs.version.gradle)
         classpath(libs.detekt.gradle)
     }
 }
@@ -87,12 +85,14 @@ dependencies {
 }
 
 versionCatalogUpdate {
-    sortByKey.set(true)
+    sortByKey = true
+
+    versionSelector { stabilityLevel(it.candidate.version) >= Config.minStabilityLevel }
 
     keep {
-        keepUnusedVersions.set(true)
-        keepUnusedLibraries.set(true)
-        keepUnusedPlugins.set(true)
+        keepUnusedVersions = true
+        keepUnusedLibraries = true
+        keepUnusedPlugins = true
     }
 }
 
@@ -129,22 +129,6 @@ tasks {
         autoCorrect = false
     }
 
-    withType<com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask>().configureEach {
-        outputFormatter = "json"
-
-        fun stabilityLevel(version: String): Int {
-            Config.stabilityLevels.forEachIndexed { index, postfix ->
-                val regex = """.*[.\-]$postfix[.\-\d]*""".toRegex(RegexOption.IGNORE_CASE)
-                if (version.matches(regex)) return index
-            }
-            return Config.stabilityLevels.size
-        }
-
-        rejectVersionIf {
-            stabilityLevel(currentVersion) > stabilityLevel(candidate.version)
-        }
-    }
-
     wrapper {
         distributionType = Wrapper.DistributionType.BIN
     }
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 195fc6c..da19709 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -18,7 +18,7 @@ object Config {
 
     const val majorRelease = 1
     const val minorRelease = 3
-    const val patch = 1
+    const val patch = 2
     const val postfix = ""
     const val versionName = "$majorRelease.$minorRelease.$patch$postfix"
 
@@ -67,6 +67,7 @@ object Config {
 
     // build scripts
     val stabilityLevels = listOf("preview", "eap", "dev", "alpha", "beta", "m", "cr", "rc")
+    val minStabilityLevel = stabilityLevels.indexOf("beta")
 
     object Detekt {
 
diff --git a/buildSrc/src/main/kotlin/ConfigureMultiplatform.kt b/buildSrc/src/main/kotlin/ConfigureMultiplatform.kt
index 0375c19..fa6bab7 100644
--- a/buildSrc/src/main/kotlin/ConfigureMultiplatform.kt
+++ b/buildSrc/src/main/kotlin/ConfigureMultiplatform.kt
@@ -4,7 +4,10 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.getValue
 import org.gradle.kotlin.dsl.getting
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
+@OptIn(ExperimentalWasmDsl::class)
+@Suppress("LongParameterList", "CyclomaticComplexMethod")
 fun Project.configureMultiplatform(
     ext: KotlinMultiplatformExtension,
     jvm: Boolean = true,
@@ -14,7 +17,8 @@ fun Project.configureMultiplatform(
     js: Boolean = true,
     tvOs: Boolean = true,
     macOs: Boolean = true,
-    watchOs: Boolean = true
+    watchOs: Boolean = true,
+    wasmJs: Boolean = true,
 ) = ext.apply {
     val libs by versionCatalog
     explicitApi()
@@ -41,6 +45,13 @@ fun Project.configureMultiplatform(
 
     if (jvm) jvm()
 
+    if (wasmJs) wasmJs {
+        moduleName = this@configureMultiplatform.name
+        nodejs()
+        browser()
+        binaries.library()
+    }
+
     sequence {
         if (iOs) {
             yield(iosX64())
diff --git a/buildSrc/src/main/kotlin/Util.kt b/buildSrc/src/main/kotlin/Util.kt
index ccef2f7..32d89d8 100644
--- a/buildSrc/src/main/kotlin/Util.kt
+++ b/buildSrc/src/main/kotlin/Util.kt
@@ -60,3 +60,11 @@ val Project.localProperties
             load(FileInputStream(File(rootProject.rootDir, "local.properties")))
         }
     }
+
+fun stabilityLevel(version: String): Int {
+    Config.stabilityLevels.forEachIndexed { index, postfix ->
+        val regex = """.*[.\-]$postfix[.\-\d]*""".toRegex(RegexOption.IGNORE_CASE)
+        if (version.matches(regex)) return index
+    }
+    return Config.stabilityLevels.size
+}
diff --git a/common/src/commonMain/kotlin/pro/respawn/kmmutils/common/CollectionExt.kt b/common/src/commonMain/kotlin/pro/respawn/kmmutils/common/CollectionExt.kt
index 0eb485f..cd09474 100644
--- a/common/src/commonMain/kotlin/pro/respawn/kmmutils/common/CollectionExt.kt
+++ b/common/src/commonMain/kotlin/pro/respawn/kmmutils/common/CollectionExt.kt
@@ -1,4 +1,5 @@
 @file:OptIn(ExperimentalContracts::class)
+@file:Suppress("TooManyFunctions")
 
 package pro.respawn.kmmutils.common
 
@@ -88,6 +89,7 @@ public inline fun <T, R> Iterable<T>.reorderBy(order: List<R>, crossinline selec
 
 /**
  * Swaps values [index1] with [index2] in place.
+ * Throws [IndexOutOfBoundsException] when one or both indices are not present in the collection
  */
 public fun <T> MutableList<T>.swap(index1: Int, index2: Int): MutableList<T> {
     val tmp = this[index1]
@@ -96,15 +98,36 @@ public fun <T> MutableList<T>.swap(index1: Int, index2: Int): MutableList<T> {
     return this
 }
 
+/**
+ * Swaps values [index1] with [index2] in place.
+ * Returns the original collection if either [index1] or [index2] are not resent
+ */
+public fun <T : Any> MutableList<T>.trySwap(index1: Int, index2: Int): MutableList<T> {
+    val tmp = getOrNull(index1) ?: return this
+    this[index1] = getOrNull(index2) ?: return this
+    this[index2] = tmp
+    return this
+}
+
 /**
  *
  * Returns a shallow copy of this list with the items at [index1] and [index2] swapped.
+ * Throws [IndexOutOfBoundsException] when one or both indices are not present in the collection
  */
 public fun <T> List<T>.swapped(index1: Int, index2: Int): List<T> {
     val list = toMutableList()
     return list.swap(index1, index2)
 }
 
+/**
+ * Returns a shallow copy of this list with the items at [index1] and [index2] swapped.
+ * Returns the original collection if either [index1] or [index2] are not resent
+ */
+public fun <T : Any> List<T>.swappedOrDefault(index1: Int, index2: Int): List<T> {
+    val list = toMutableList()
+    return list.trySwap(index1, index2)
+}
+
 /**
  * Returns a list of pairs, where each value corresponds to all possible pairings with values from [other].
  * this: A, B, C
@@ -157,6 +180,83 @@ public fun Collection<Float>.chunkedAverage(chunkSize: Int): List<Double> = ifEm
 public fun Iterable<String>.filterBySubstring(
     substring: String?,
     ignoreCase: Boolean = false
-): List<String> = if (!substring.isValid) toList() else asSequence()
-    .filter { it.contains(substring!!, ignoreCase) }
+): List<String> = if (!substring.isValid()) toList() else asSequence()
+    .filter { it.contains(substring, ignoreCase) }
     .toList()
+
+/**
+ * A [sumOf] variation that returns a float instead of Double
+ */
+public inline fun <T> Collection<T>.sumOf(selector: (T) -> Float): Float {
+    var sum = 0f
+    for (element in this) {
+        sum += selector(element)
+    }
+    return sum
+}
+
+/**
+ * Consume this iterator by taking the first [count] elements
+ */
+public fun <T> Iterator<T>.take(count: Int): List<T> = List(count) { next() }
+
+/**
+ * Returns a [Map] containing key-value pairs provided by [key] and [value] functions
+ * applied to elements of the given sequence.
+ *
+ * If any of two pairs would have the same key the first one gets added to the map.
+ *
+ * The returned map preserves the entry iteration order of the original sequence.
+ *
+ * The operation is _terminal_.
+ */
+public inline fun <T, K, V> Sequence<T>.associateFirst(
+    key: (T) -> K,
+    value: (T) -> V,
+): Map<K, V> {
+    val dst = LinkedHashMap<K, V>()
+    for (element in this) {
+        val newKey = key(element)
+        if (!dst.containsKey(newKey)) {
+            dst[newKey] = value(element)
+        }
+    }
+    return dst
+}
+
+/**
+ * Returns a [Map] containing key-value pairs provided by [key] and [value] functions
+ * applied to elements of the given collection.
+ *
+ * If any of two pairs would have the same key the first one gets added to the map.
+ *
+ * The returned map preserves the entry iteration order of the original collection.
+ */
+public inline fun <T, K, V> Iterable<T>.associateFirst(
+    key: (T) -> K,
+    value: (T) -> V,
+): Map<K, V> {
+    val dst = LinkedHashMap<K, V>()
+    for (element in this) {
+        val newKey = key(element)
+        if (!dst.containsKey(newKey)) {
+            dst[newKey] = value(element)
+        }
+    }
+    return dst
+}
+
+/**
+ * Filters the values in this map, leaving only non-null entries
+ */
+@Suppress("UNCHECKED_CAST")
+public fun <K, V> Map<K, V?>.filterNotNullValues(): Map<K, V & Any> = filterValues { it != null } as Map<K, V & Any>
+
+/**
+ * The same as a regular [mapNotNull], but [transform] block contains the previous value of the list.
+ */
+public fun <T, R> List<T>.mapNotNull(transform: (prev: R?, value: T) -> R?): List<R> {
+    val dst = ArrayList<R>()
+    forEach { value -> transform(dst.lastOrNull(), value)?.let { dst.add(it) } }
+    return dst
+}
diff --git a/common/src/commonMain/kotlin/pro/respawn/kmmutils/common/CommonExt.kt b/common/src/commonMain/kotlin/pro/respawn/kmmutils/common/CommonExt.kt
index 894f059..a21904d 100644
--- a/common/src/commonMain/kotlin/pro/respawn/kmmutils/common/CommonExt.kt
+++ b/common/src/commonMain/kotlin/pro/respawn/kmmutils/common/CommonExt.kt
@@ -1,8 +1,10 @@
-@file:Suppress("unused")
+@file:Suppress("unused", "NOTHING_TO_INLINE")
 
 package pro.respawn.kmmutils.common
 
+import kotlin.contracts.contract
 import kotlin.enums.enumEntries
+import kotlin.jvm.JvmName
 
 /**
  * @return Whether this string is valid
@@ -14,14 +16,33 @@ import kotlin.enums.enumEntries
  * - "NULL" -> false
  * - "  " -> false
  */
+@Deprecated("Use the function version as it allows for smart-casting", ReplaceWith("this.isValid()"))
+@get:JvmName("getIsValid")
 public val String?.isValid: Boolean
     get() = !isNullOrBlank() && !equals("null", true)
 
+/**
+ * @return Whether this string is valid
+ *
+ * Examples:
+ * - null -> false
+ * - "null" -> false
+ * - "" -> false
+ * - "NULL" -> false
+ * - "  " -> false
+ */
+public inline fun String?.isValid(): Boolean {
+    contract {
+        returns(true) implies (this@isValid != null)
+    }
+    return !isNullOrBlank() && !equals("null", true)
+}
+
 /**
  * Takes this string only if it [isValid]
  * @see isValid
  */
-public fun String?.takeIfValid(): String? = if (isValid) this else null
+public fun String?.takeIfValid(): String? = if (isValid()) this else null
 
 /**
  * Check if this String has length in [range]
@@ -78,3 +99,24 @@ public inline val <reified T : Enum<T>> Enum<T>.previous: T
  */
 @ExperimentalStdlibApi
 public inline val <reified T : Enum<T>> Enum<T>.previousOrNull: T? get() = enumEntries<T>().getOrNull(ordinal - 1)
+
+/**
+ * Calls [requireNotNull] on this value and returns it
+ */
+public fun <T> T?.requireNotNull(): T & Any = requireNotNull(this)
+
+/**
+ * Calls [requireNotNull] on this value and returns it
+ */
+public inline fun <T> T?.requireNotNull(lazyMessage: () -> Unit): T & Any = requireNotNull(this, lazyMessage)
+
+/**
+ * If this is an [Error], throws it, otherwise returns [this] as an [Exception]
+ */
+public fun Throwable?.rethrowErrors(): Exception? = this?.let { it as? Exception? ?: throw it }
+
+/**
+ * If this is an [Error], throws it, otherwise returns [this] as an [Exception]
+ */
+@JvmName("rethrowErrorsNotNull")
+public fun Throwable.rethrowErrors(): Exception = this as? Exception? ?: throw this
diff --git a/common/src/commonMain/kotlin/pro/respawn/kmmutils/common/MathExt.kt b/common/src/commonMain/kotlin/pro/respawn/kmmutils/common/MathExt.kt
index b87cfc5..fb64dc4 100644
--- a/common/src/commonMain/kotlin/pro/respawn/kmmutils/common/MathExt.kt
+++ b/common/src/commonMain/kotlin/pro/respawn/kmmutils/common/MathExt.kt
@@ -93,6 +93,15 @@ public val Int.length: Int
         else -> log10(abs(this).toDouble()).toInt() + 1
     }
 
+/**
+ * @return The number of digits in this [Long]
+ */
+public val Long.length: Int
+    get() = when (this) {
+        0L -> 1
+        else -> log10(abs(this).toDouble()).toInt() + 1
+    }
+
 /**
  * @return 1 if this is `true`, and 0 otherwise.
  */
diff --git a/coroutines/src/commonMain/kotlin/pro/respawn/kmmutils/coroutines/RetryFlow.kt b/coroutines/src/commonMain/kotlin/pro/respawn/kmmutils/coroutines/RetryFlow.kt
new file mode 100644
index 0000000..083c76a
--- /dev/null
+++ b/coroutines/src/commonMain/kotlin/pro/respawn/kmmutils/coroutines/RetryFlow.kt
@@ -0,0 +1,44 @@
+package pro.respawn.kmmutils.coroutines
+
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.receiveAsFlow
+
+/**
+ * A [Flow] instance that can be retried by calling [retry].
+ * Whatever block or flow emission was before will be re-evaluated (re-created) again.
+ */
+public interface RetryFlow<T> : Flow<T> {
+
+    /**
+     * Retry the invocation of this flow. The flow that originally was used with this wrapper will be recreated
+     */
+    public fun retry()
+}
+
+/**
+ * Creates a new [RetryFlow] from [flow] builder
+ */
+public fun <T> retryFlow(flow: suspend () -> Flow<T>): RetryFlow<T> = RetryFlowImpl(flow)
+
+/**
+ * Creates a new [RetryFlow] from this [call] function, evaluated as a cold flow
+ */
+public inline fun <T> retry(crossinline call: suspend () -> T): RetryFlow<T> = RetryFlowImpl({ flow { emit(call()) } })
+
+@PublishedApi
+internal class RetryFlowImpl<T>(
+    producer: suspend () -> Flow<T>,
+    private val delegate: Channel<Unit> = Channel(Channel.CONFLATED),
+) : RetryFlow<T>, Flow<T> by delegate.receiveAsFlow().flatMapLatest(transform = { producer() }) {
+
+    init {
+        retry()
+    }
+
+    override fun retry() {
+        delegate.trySend(Unit)
+    }
+}
diff --git a/datetime/src/commonMain/kotlin/pro/respawn/kmmutils/datetime/Time.kt b/datetime/src/commonMain/kotlin/pro/respawn/kmmutils/datetime/Time.kt
deleted file mode 100644
index b2b7722..0000000
--- a/datetime/src/commonMain/kotlin/pro/respawn/kmmutils/datetime/Time.kt
+++ /dev/null
@@ -1,127 +0,0 @@
-@file:Suppress("unused", "MemberVisibilityCanBePrivate", "NewApi", "MagicNumber")
-
-package pro.respawn.kmmutils.datetime
-
-internal const val DeprecationMessage = """
-All functionality of the Time class was ported to kotlinx.datetime.LocalTime as extension functions and properties.
-You can simply replace this with LocalTime and expect similar functionality to be present.
-"""
-
-/**
- * A class that represents time, of day as well as a asDuration.
- * [hour] hour in 24h format
- * [minute] minute
- * [second] second
- * [Time.toString] method returns a string representation for 24-hour format. If you want 12-hour
- * time, use [asString].
- * @throws IllegalArgumentException if the specified values are invalid. Validation happens at
- * object creation time
- */
-@Deprecated(DeprecationMessage, ReplaceWith("LocalTime", "kotlinx.datetime.LocalTime"))
-public data class Time @Throws(IllegalArgumentException::class) constructor(
-    val hour: Int,
-    val minute: Int,
-    val second: Int = 0,
-) : Comparable<Time> {
-
-    init {
-        require(hour in 0..<24 || minute in 0..<60 || second in 0..<60) {
-            "Invalid time value: $hour:$minute:$second"
-        }
-    }
-
-    override fun toString(): String = asString()
-
-    /** Same as toString but gives you a choice on whether to use 12H scheme.
-     * [toString] uses asString(false).
-     *
-     * @param addSecondsIfZero If the seconds value is equal to 0, should include them in the representation? e.g.:
-     * @param use12h whether to represent time in 12-hour format (AM/PM letters not added). Mind that deserializing
-     * the resulting string back to Time won't result in a valid value, if you have this parameter true
-     * true => "17:00:00", false => "17:00".
-     *
-     * @return a string representation of this time
-     * **/
-    public fun asString(use12h: Boolean = false, addSecondsIfZero: Boolean = false): String = buildString {
-        append("${asTimeNumber(if (use12h) hourAs12H else hour)}:${asTimeNumber(minute)}")
-        if (addSecondsIfZero || second != 0) append(":${asTimeNumber(second)}")
-        if (use12h) append(" ${if (isPM) "PM" else "AM"}")
-    }
-
-    /**
-     * Create a new time with the result of adding [Time] to [other]
-     */
-    public operator fun plus(other: Time): Time = add(other.hour, other.minute, other.second)
-
-    /**
-     * Subtract [other] from [Time]
-     */
-    public operator fun minus(other: Time): Time = add(-other.hour, -other.minute, -other.second)
-
-    override operator fun compareTo(other: Time): Int = totalSeconds.compareTo(other.totalSeconds)
-
-    /**
-     * Get either the hour or minute or second value of this time.
-     * Values more than 2 will throw an [IndexOutOfBoundsException]
-     */
-    public operator fun get(index: Int): Int = when (index) {
-        0 -> hour
-        1 -> minute
-        2 -> second
-        else -> throw IndexOutOfBoundsException("Only 0, 1 and 2 are valid values")
-    }
-
-    @Deprecated(DeprecationMessage, ReplaceWith("LocalTime", "kotlinx.datetime.LocalTime"))
-    public companion object {
-
-        /** example: 12:45:00, 4:30, 7:00 AM, 24 or 12h format, word separator is " ".
-         * On a value that is not a valid time, will throw.
-         * **/
-        @Throws(IllegalArgumentException::class)
-        public fun parse(s: String): Time {
-            try {
-                require(s.isNotBlank()) { "Empty time string" }
-
-                val words = s.split(" ")
-                require(words.size in 1..2) { "Not a time" }
-
-                val parts = words.first().split(':', '.', '-', ' ', ',', '_', ignoreCase = true)
-                require(parts.size in 2..3) { "Invalid delimiter count" }
-
-                val hours = parts[0].toInt() + if (words.size == 2 && words[1] == "PM") 12 else 0
-
-                val minutes = parts[1].toInt()
-
-                val seconds = if (parts.size == 3) parts[2].toInt() else 0
-
-                return Time(hours, minutes, seconds)
-            } catch (expected: Exception) {
-                throw IllegalArgumentException("Couldn't parse time", expected)
-            }
-        }
-
-        /**
-         * 23:59:59
-         */
-        public val MAX: Time = Time(23, 59, 59)
-
-        /**
-         * 00:00:00
-         */
-        public val MIN: Time = Time(0, 0)
-
-        /** Normalize a set of values for hours, minutes, or seconds, to a valid time value.
-         *
-         * @returns values of hours, minutes and seconds adjusted if necessary to fit into their respective
-         * ranges. Any excess is added to the value of the next order. The values can also wrap
-         * around if the resulting time is bigger than [Time.MAX]
-         * Example: normalize(25,70,100) -> (2,11,40)
-         */
-        internal fun normalize(hours: Int = 0, minutes: Int = 0, seconds: Int = 0): Triple<Int, Int, Int> {
-            val normalizedHours = hours + (minutes + seconds / 60) / 60
-            val normalizedMinutes = (minutes + seconds / 60) % 60
-            val normalizedSeconds = seconds % 60
-            return Triple(normalizedHours % 24, normalizedMinutes, normalizedSeconds)
-        }
-    }
-}
diff --git a/datetime/src/commonMain/kotlin/pro/respawn/kmmutils/datetime/TimeExt.kt b/datetime/src/commonMain/kotlin/pro/respawn/kmmutils/datetime/TimeExt.kt
deleted file mode 100644
index e8d2bdd..0000000
--- a/datetime/src/commonMain/kotlin/pro/respawn/kmmutils/datetime/TimeExt.kt
+++ /dev/null
@@ -1,233 +0,0 @@
-@file:Suppress(
-    "unused", "MemberVisibilityCanBePrivate", "NewApi", "MagicNumber", "TooManyFunctions",
-    "DeprecatedCallableAddReplaceWith", "DEPRECATION"
-)
-
-package pro.respawn.kmmutils.datetime
-
-import kotlinx.datetime.LocalDate
-import kotlinx.datetime.LocalDateTime
-import kotlinx.datetime.LocalTime
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.atTime
-import kotlin.jvm.JvmName
-import kotlin.math.abs
-import kotlin.math.absoluteValue
-import kotlin.time.Duration
-import kotlin.time.Duration.Companion.seconds
-
-// ---- converters
-
-/**
- * Convert [this] to [Time]
- */
-@Deprecated(DeprecationMessage)
-public fun LocalTime.toTime(): Time = Time(hour, minute, second)
-
-/**
- * Make a new [LocalTime] using this Time and a 0 nanosecond value
- */
-@Deprecated(DeprecationMessage)
-public fun Time.toLocalTime(): LocalTime = LocalTime(hour, minute, second, 0)
-
-/**
- * Create a [LocalDateTime] with the specified [time]
- */
-public fun LocalDate.atTime(time: Time): LocalDateTime = atTime(time.hour, time.minute, time.second)
-
-/**
- * Create a new [LocalDateTime] using given [date]
- */
-public fun Time.atDate(date: LocalDate): LocalDateTime = LocalDateTime(date, toLocalTime())
-
-/**
- * Returns an integer that represents this time, like a string, but without the ":"
- * Examples:
- * - 17:12:45 -> 171245
- * - 00:00:00 -> 0
- * - 05:00:00 -> 50000
- */
-public fun Time.toInt(): Int = hour * 10000 + minute * 100 + second
-
-// ---- operations
-
-/**
- * Calculate distance to the [other] between [Time.MIN] and [Time.MAX]
- */
-public infix fun Time.distanceTo(other: Time): Time = Time.ofSeconds(
-    (other.totalSeconds - totalSeconds).absoluteValue
-)
-
-/**
- * Create a new [LocalDateTime] with the given [time] and [nanos]
- * Preserves [nanos] of previous time
- */
-public fun LocalDateTime.withTime(time: Time, nanos: Int = nanosecond): LocalDateTime =
-    LocalDateTime(year, month, dayOfMonth, time.hour, time.minute, time.second, nanos)
-
-/**
- * Returns this object as [kotlin.time.Duration]
- */
-public val Time.asDuration: Duration get() = totalSeconds.seconds
-
-/**
- * @return the amount of seconds from this object's value [to]
- * The amount is always positive
- */
-public infix fun Time.distanceInSeconds(to: Time): Int =
-    abs(to.hour - hour) * 60 * 60 + abs(to.minute - minute) * 60 + abs(to.second - second)
-
-/**
- * Whether the hours cross the PM threshold (hour >= 12)
- */
-public val Time.isPM: Boolean get() = hour >= 12
-
-/** * Get the amount of minutes since midnight.
- */
-public val Time.totalMinutes: Double
-    get() = hour * 60 + minute + second.toDouble() / 60
-
-/**
- * Get the amount of seconds since midnight. Convenient for storing [Time] as an [Int] value
- */
-public val Time.totalSeconds: Int
-    get() = hour * 3600 + minute * 60 + second
-
-/**
- * Get hour in am/pm format (just the number)
- */
-public val Time.hourAs12H: Int
-    get() = if (hour % 12 == 0) hour else hour % 12
-
-/**
- * Add specified number of [hours], [minutes], or [seconds] to this time.
- * If the argument is not specified, 0 will be added.
- * **If the resulting value is bigger than 23:59:59,
- * the value will be wrapped (e.g. to 00:00:00)**
- * @return A new resulting Time object.
- */
-public fun Time.add(hours: Int = 0, minutes: Int = 0, seconds: Int = 0): Time {
-    val (normalizedHours, normalizedMinutes, normalizedSeconds) = Time.normalize(hours, minutes, seconds)
-
-    val hDelta =
-        (normalizedHours + hour + (minute + normalizedMinutes) / 60 + (second + normalizedSeconds) / 3600) % 24
-    val mDelta = (minute + normalizedMinutes + (second + normalizedSeconds) / 60) % 60
-    val sDelta = (second + normalizedSeconds) % 60
-
-    val h = (if (hDelta >= 0) hDelta else hDelta + 24) % 24
-    val m = if (mDelta >= 0) mDelta else mDelta + 60
-    val s = if (sDelta >= 0) sDelta else sDelta + 60
-    return Time(h, m, s)
-}
-
-/**
- * Represents this numeric value as if it is a number on the clock
- * Examples:
- * - 0 -> "00"
- * - 1 -> "01"
- * - 15 -> "15"
- */
-public fun Time.Companion.asTimeNumber(value: Int): String = if (value < 10) "0$value" else value.toString()
-
-// ---- builders
-
-/**
- * Create a new [Time] from [localTime]
- */
-public operator fun Time.Companion.invoke(localTime: LocalTime): Time = localTime.toTime()
-
-/**
- * Create a new [Time] from [duration].
- * If the [duration] is larger than 24 hours, it will wrap around
- */
-public operator fun Time.Companion.invoke(duration: Duration): Time =
-    ofSeconds(duration.inWholeSeconds.toInt())
-
-/**
- * Parse a new time object using the int representation of it.
- * @see Time.toInt
- */
-public fun Time.Companion.ofInt(hms: Int): Time = Time(hms / 10000, hms / 100 % 100, hms % 100)
-
-/**
- * Create a time from milliseconds since midnight.
- * **[millis] is NOT a timestamp**
- */
-public fun Time.Companion.ofMillis(millis: Long): Time {
-    val totalSeconds = millis / 1000
-    val totalMinutes = totalSeconds / 60
-    val totalHours = totalMinutes / 60
-    return Time(totalHours.toInt() % 24, (totalMinutes % 60).toInt(), (totalSeconds % 60).toInt())
-}
-
-/**
- * Get current time value using specified seconds **since midnight**
- * [seconds] is NOT a timestamp
- * @see totalSeconds
- */
-public fun Time.Companion.ofSeconds(seconds: Int): Time = ofMillis(seconds * 1000L)
-
-/**
- * Create a new time using specified [hours], [minutes], or [seconds]
- * If you specify a value bigger than the initial, the remainder will spill into the next
- * value. If you specify a value bigger than [Time.MAX], it will wrap around.
- * Examples:
- * - Time.with(seconds=70) -> 00:01:10
- * - Time.with(hours=25, minutes=60) -> 02:00:00
- */
-public fun Time.Companion.with(
-    hours: Int = 0,
-    minutes: Int = 0,
-    seconds: Int = 0
-): Time = MIN.add(hours, minutes, seconds)
-
-/**
- * Creates a new time set to current local time using specified [zone].
- */
-public fun Time.Companion.now(zone: TimeZone): Time = LocalTime.now(zone).toTime()
-
-// ---- Parsing
-
-/**
- * Parse [s] as time serialized using [Time.toString] and return null if it fails.
- * @see [Time.Companion.parse]
- */
-public fun Time.Companion.parseOrNull(s: String): Time? = s.runCatching { parse(this) }.getOrNull()
-
-/**
- * Returns true if [time] is a valid time string
- */
-public fun Time.Companion.isValid(time: String): Boolean = parseOrNull(time) != null
-
-/**
- * Returns true if this is a valid time string
- */
-public val String?.isValidTime: Boolean get() = this?.let { Time.isValid(it) } ?: false
-
-/**
- * Try to parse [this] as [Time] or return null if it fails
- */
-public fun String?.toTimeOrNull(): Time? = this?.let { Time.parseOrNull(this) }
-
-// ---- collection
-
-/**
- * Compute total asDuration of all items in the collection
- */
-public fun Iterable<Time?>.totalDuration(): Time = Time.ofSeconds(sumOf { it?.totalSeconds ?: 0 })
-
-/**
- * Compute total asDuration of all items in the sequence
- */
-@JvmName("totalDurationSequence")
-public fun Sequence<Time?>.totalDuration(): Time = Time.ofSeconds(sumOf { it?.totalSeconds ?: 0 })
-
-/**
- * Convert this duration to [Time]. If this duration is larger than 24 hours, clock will wrap around.
- */
-public val Duration.asTime: Time get() = Time.ofSeconds(inWholeSeconds.toInt())
-
-/**
- * If [this] is [Time.MIN] return null, [this] otherwise
- */
-public fun Time?.takeIfNotZero(): Time? = takeIf { it != Time.MIN }
diff --git a/datetime/src/jvmMain/kotlin/pro/respawn/kmmutils/datetime/DateTimeExtJvm.kt b/datetime/src/jvmMain/kotlin/pro/respawn/kmmutils/datetime/DateTimeExtJvm.kt
index 5bd2494..cd51397 100644
--- a/datetime/src/jvmMain/kotlin/pro/respawn/kmmutils/datetime/DateTimeExtJvm.kt
+++ b/datetime/src/jvmMain/kotlin/pro/respawn/kmmutils/datetime/DateTimeExtJvm.kt
@@ -188,7 +188,7 @@ public val ZonedDateTime.lengthOfMonth: Int get() = month.length(Year.isLeap(yea
  * Sets [this]'s time to [time]. Returns a new [ZonedDateTime]
  */
 @Deprecated("Time class is deprecated")
-public fun ZonedDateTime.withTime(time: Time): ZonedDateTime =
+public fun ZonedDateTime.withTime(time: kotlinx.datetime.LocalTime): ZonedDateTime =
     ZonedDateTime.of(year, monthValue, dayOfMonth, time.hour, time.minute, time.second, nano, zone)
 
 /**
@@ -207,3 +207,10 @@ public fun Iterable<DayOfWeek>.sortedByLocale(locale: Locale = Locale.getDefault
         all.add(0, first)
     return all
 }
+
+/**
+ * Creates a new [ZonedDateTime] using [this] Instant and a given [zoneId]
+ */
+public fun Instant.toZDT(
+    zoneId: ZoneId,
+): ZonedDateTime = ZonedDateTime.ofInstant(this, zoneId)
diff --git a/datetime/src/jvmMain/kotlin/pro/respawn/kmmutils/datetime/TimeExtJvm.kt b/datetime/src/jvmMain/kotlin/pro/respawn/kmmutils/datetime/TimeExtJvm.kt
deleted file mode 100644
index 09ae59d..0000000
--- a/datetime/src/jvmMain/kotlin/pro/respawn/kmmutils/datetime/TimeExtJvm.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package pro.respawn.kmmutils.datetime
-
-import java.time.Instant
-import java.time.LocalTime
-import java.time.ZoneId
-import java.time.ZonedDateTime
-
-/**
- * Returns a new [Time] with values of [this]
- */
-public fun LocalTime.toTime(): Time = Time(hour, minute, second)
-
-/**
- * Returns a new [LocalTime] with values of [this]
- */
-@JvmName("toJavaLocalTime")
-public fun Time.toJavaLocaltime(): LocalTime = LocalTime.of(hour, minute, second)
-
-/**
- * Creates a new [Time] using values of [this] zoned date time.
- */
-public val ZonedDateTime.time: Time get() = Time.fromZDT(this)
-
-/**
- * Creates a new [ZonedDateTime] using [this] Instant and a given [zoneId]
- */
-public fun Instant.toZDT(
-    zoneId: ZoneId,
-): ZonedDateTime = ZonedDateTime.ofInstant(this, zoneId)
-
-/**
- * Gets a time from this [zdt]. Uses [ZoneId.systemDefault] by default.
- * @see now
- */
-public fun Time.Companion.fromZDT(zdt: ZonedDateTime): Time = Time(zdt.hour, zdt.minute, zdt.second)
-
-/**
- * Creates a new [Time] using [instant] and a given [zone]
- */
-public operator fun Time.Companion.invoke(instant: Instant, zone: ZoneId): Time = fromZDT(instant.toZDT(zone))
-
-/**
- * Get current local time.
- * @return A new Time using current timezone and timestamp.
- * @see fromZDT
- */
-public fun Time.Companion.now(zoneId: ZoneId): Time = Time.fromZDT(ZonedDateTime.now(zoneId))
diff --git a/gradle.properties b/gradle.properties
index 61f84c4..cd3e798 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,3 +19,4 @@ android.nonFinalResIds=true
 kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 kotlin.native.ignoreIncorrectDependencies=true
 kotlinx.atomicfu.enableJvmIrTransformation=true
+nl.littlerobots.vcu.resolver=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c4bd1fb..be7add9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,21 +1,21 @@
 [versions]
 composeDetektPlugin = "1.3.0"
-coroutines = "1.7.3"
-datetime = "0.5.0"
-dependencyAnalysisPlugin = "1.28.0"
-detekt = "1.23.4"
-detektFormattingPlugin = "1.23.4"
-dokka = "1.9.10"
-gradleAndroid = "8.3.0-alpha18"
-gradleDoctorPlugin = "0.9.1"
+coroutines = "1.8.1-Beta"
+datetime = "0.6.0-RC.2"
+dependencyAnalysisPlugin = "1.31.0"
+detekt = "1.23.6"
+detektFormattingPlugin = "1.23.6"
+dokka = "1.9.20"
+gradleAndroid = "8.4.0-rc02"
+gradleDoctorPlugin = "0.9.2"
 junit = "4.13.2"
-kotest = "5.8.0"
-kotest-plugin = "5.8.0"
-kotlin = "1.9.22"
-kotlinx-atomicfu = "0.23.1"
-turbine = "1.0.0"
-versionCatalogUpdatePlugin = "0.8.2"
-versionsPlugin = "0.50.0"
+kotest = "5.8.1"
+kotest-plugin = "5.8.1"
+# @pin
+kotlin = "1.9.23"
+kotlinx-atomicfu = "0.23.2"
+turbine = "1.1.0"
+versionCatalogUpdatePlugin = "0.8.4"
 
 [libraries]
 android-gradle = { module = "com.android.tools.build:gradle", version.ref = "gradleAndroid" }
@@ -24,7 +24,6 @@ detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting",
 detekt-gradle = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
 detekt-libraries = { module = "io.gitlab.arturbosch.detekt:detekt-rules-libraries", version.ref = "detekt" }
 dokka-android = { module = "org.jetbrains.dokka:android-documentation-plugin", version.ref = "dokka" }
-gradle-versions = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "versionsPlugin" }
 junit = { module = "junit:junit", version.ref = "junit" }
 kotest-assertions = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
 kotest-framework = { module = "io.kotest:kotest-framework-engine", version.ref = "kotest" }
@@ -38,7 +37,6 @@ kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutine
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime" }
 turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
-version-gradle = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "versionsPlugin" }
 
 [bundles]
 unittest = [
@@ -50,11 +48,10 @@ unittest = [
 ]
 
 [plugins]
-atomicfu = { id = "kotlinx-atomicfu", version.ref = "kotlinx-atomicfu" }
+atomicfu = "kotlinx-atomicfu:0.23.2"
 dependencyAnalysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysisPlugin" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 gradleDoctor = { id = "com.osacky.doctor", version.ref = "gradleDoctorPlugin" }
 kotest = { id = "io.kotest.multiplatform", version.ref = "kotest-plugin" }
 version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "versionCatalogUpdatePlugin" }
-versions = { id = "com.github.ben-manes.versions", version.ref = "versionsPlugin" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7f93135..d64cd49 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e09..b82aa23 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 0adc8e1..1aa94a4 100755
--- a/gradlew
+++ b/gradlew
@@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/ValidationError.kt b/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/ValidationError.kt
index 0e8d7ff..d326a6f 100644
--- a/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/ValidationError.kt
+++ b/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/ValidationError.kt
@@ -40,6 +40,15 @@ public sealed interface ValidationError {
         public val range: IntRange,
     ) : ValidationError
 
+    /**
+     * Length of the input was not exactly [length]
+     * @see pro.respawn.kmmutils.inputforms.default.Rules.LengthExact
+     */
+    public data class LengthIsNotExactly(
+        override val value: String,
+        public val length: Int,
+    ) : ValidationError
+
     /**
      * Input was shorter than [minLength]
      * @see pro.respawn.kmmutils.inputforms.default.Rules.LongerThan
@@ -208,5 +217,12 @@ public sealed interface ValidationError {
         override val value: String,
     ) : ValidationError
 
+    /**
+     * Input value has no uppercase letters
+     * @see
+     */
+    @JvmInline
+    public value class NoUppercaseLetters(override val value: String) : ValidationError
+
     public companion object
 }
diff --git a/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/default/Forms.kt b/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/default/Forms.kt
index 5c01393..6a000a6 100644
--- a/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/default/Forms.kt
+++ b/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/default/Forms.kt
@@ -84,4 +84,32 @@ public data object Forms {
         Rules.NoLetters,
         Rules.Matches(pattern),
     )
+
+    /**
+     * Arbitrary code with a length of [length] digits.
+     */
+    public fun NumericCode(
+        length: Int,
+        strategy: ValidationStrategy = FailFast,
+    ): Form = Form(
+        strategy,
+        Rules.NonEmpty,
+        Rules.DigitsOnly,
+        Rules.LengthExact(length),
+    )
+
+    /**
+     * Web-based url, starting with either http, https, www and containing a domain part and an optional path and query
+     * parameters
+     */
+    public fun WebUrl(
+        strategy: ValidationStrategy = FailFast,
+        pattern: Regex = Patterns.UrlPattern,
+    ): Form = Form(
+        strategy,
+        Rules.NonEmpty,
+        Rules.NoWhitespace,
+        Rules.SingleLine,
+        Rules.Matches(pattern),
+    )
 }
diff --git a/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/default/Patterns.kt b/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/default/Patterns.kt
index 9fd7290..af607e0 100644
--- a/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/default/Patterns.kt
+++ b/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/default/Patterns.kt
@@ -50,4 +50,11 @@ public data object Patterns {
     public val Password: Regex by lazy {
         """^(?=.*\p{Upper})(?=.*\p{Lower})(?=.*\d)[\p{Upper}\p{Lower}\d\p{Punct}]{8,}$""".toRegex()
     }
+
+    /**
+     * A web url starting with either http, https, www and then containing a domain-specific part and optionally a path
+     */
+    public val UrlPattern: Regex = Regex(
+        """(http(s)?://.)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&/=]*)"""
+    )
 }
diff --git a/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/default/Rules.kt b/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/default/Rules.kt
index 1e887fe..d9c1162 100644
--- a/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/default/Rules.kt
+++ b/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/default/Rules.kt
@@ -4,6 +4,7 @@ import pro.respawn.kmmutils.common.isAscii
 import pro.respawn.kmmutils.common.isValid
 import pro.respawn.kmmutils.common.spans
 import pro.respawn.kmmutils.inputforms.Rule
+import pro.respawn.kmmutils.inputforms.ValidationError
 import pro.respawn.kmmutils.inputforms.ValidationError.ContainsDigits
 import pro.respawn.kmmutils.inputforms.ValidationError.ContainsLetters
 import pro.respawn.kmmutils.inputforms.ValidationError.DoesNotContain
@@ -15,6 +16,7 @@ import pro.respawn.kmmutils.inputforms.ValidationError.HasNoDigits
 import pro.respawn.kmmutils.inputforms.ValidationError.HasNoLetters
 import pro.respawn.kmmutils.inputforms.ValidationError.HasWhitespace
 import pro.respawn.kmmutils.inputforms.ValidationError.IsNotEqual
+import pro.respawn.kmmutils.inputforms.ValidationError.LengthIsNotExactly
 import pro.respawn.kmmutils.inputforms.ValidationError.NotAlphaNumeric
 import pro.respawn.kmmutils.inputforms.ValidationError.NotAscii
 import pro.respawn.kmmutils.inputforms.ValidationError.NotDigitsOnly
@@ -41,7 +43,7 @@ public data object Rules {
      */
     public val NonEmpty: Rule = Rule {
         {
-            it.isValid
+            it.isValid()
         } checks { Empty(it) }
     }
 
@@ -251,4 +253,22 @@ public data object Rules {
             it.none { it == '\n' || it == '\r' }
         } checks { NotSingleline(it) }
     }
+
+    /**
+     * Input must contain at least one uppercase unicode letter
+     */
+    public val HasUppercaseLetter: Rule = Rule {
+        {
+            it.any { it.isLetter() && it.isUpperCase() }
+        } checks { ValidationError.NoUppercaseLetters(it) }
+    }
+
+    /**
+     * Length must be exactly [length] characters
+     */
+    public fun LengthExact(length: Int): Rule = Rule {
+        {
+            it.length == length
+        } checks { LengthIsNotExactly(it, length) }
+    }
 }
diff --git a/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/dsl/InputDsl.kt b/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/dsl/InputDsl.kt
index 33627e5..da9c3cc 100644
--- a/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/dsl/InputDsl.kt
+++ b/inputforms/src/commonMain/kotlin/pro/respawn/kmmutils/inputforms/dsl/InputDsl.kt
@@ -104,7 +104,7 @@ public val Input.isValidOrEmpty: Boolean get() = this is Input.Valid || this is
 /**
  * Whether the actual string of this [Input] is blank
  */
-public val Input.isEmptyValue: Boolean get() = !value.isValid
+public val Input.isEmptyValue: Boolean get() = !value.isValid()
 
 /**
  * Returns null if this [Input] is not valid, otherwise returns [Input.value]